From 9bf01a5f04e5e1821d48b42706fb492e1bf21d86 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:24 +0800
Subject: [PATCH] 销售订单-修改5
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 39 ++++++++++++-------
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java | 11 ++---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/StaffService.java | 3 +
mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/StaffMapper.java | 3 +
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java | 6 +++
mes-basic/src/main/resources/mapper/StaffMapper.xml | 4 ++
6 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/StaffMapper.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/StaffMapper.java
index bf53c06..d76877b 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/StaffMapper.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/StaffMapper.java
@@ -29,6 +29,7 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* 鍛樺伐
@@ -86,4 +87,6 @@
List<Staff> selectListAll();
Staff getStaffByUserId(Integer userId);
+
+ List<Map<String, Object>> chooseStaff();
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/StaffService.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/StaffService.java
index 5efff5d..771decc 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/StaffService.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/StaffService.java
@@ -26,6 +26,7 @@
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* 鍛樺伐
@@ -61,4 +62,6 @@
* @param list
*/
void importWorkstationExcel(List<StaffData> list);
+
+ List<Map<String,Object>> chooseStaff();
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
index 7779669..e27a26a 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
@@ -31,6 +31,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -137,4 +138,9 @@
baseMapper.insert(staff);
}
}
+
+ @Override
+ public List<Map<String, Object>> chooseStaff() {
+ return baseMapper.chooseStaff();
+ }
}
diff --git a/mes-basic/src/main/resources/mapper/StaffMapper.xml b/mes-basic/src/main/resources/mapper/StaffMapper.xml
index e7a7b0f..eefccf1 100644
--- a/mes-basic/src/main/resources/mapper/StaffMapper.xml
+++ b/mes-basic/src/main/resources/mapper/StaffMapper.xml
@@ -115,4 +115,8 @@
where
u.user_id = #{userId}
</select>
+ <select id="chooseStaff" resultType="java.util.Map">
+ select id,staff_no "staffNo", staff_name "staffName"
+ from basic_staff
+ </select>
</mapper>
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
index 356a15d..13f3797 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
@@ -20,6 +20,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaztt.mes.basic.service.StaffService;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
import com.chinaztt.mes.plan.dto.*;
import com.chinaztt.mes.plan.entity.CustomerOrder;
@@ -87,6 +88,8 @@
private final SysDictItemService sysDictItemService;
+ private final StaffService staffService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -97,8 +100,29 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@GetMapping("/page/{type}")
public R getCustomerOrderPage(Page page, CustomerOrderDTO planCustomerOrder, @PathVariable("type") String type) {
- log.info("鏉′欢=================銆�"+ JSONObject.toJSONString(planCustomerOrder));
return R.ok(customerOrderService.getCustomerOrderPage(page, QueryWrapperUtil.gen(planCustomerOrder), type));
+ }
+
+ /**
+ * 鍚屾otc璁㈠崟鏁版嵁
+ *
+ * @param selectTime 閫夋嫨鏃ユ湡锛屾煡璇㈣鏃ユ湡鍚庤嚦褰撳墠鏃堕棿鐨勬暟鎹�
+ * @param orderNo 璁㈠崟缂栧彿
+ * @return
+ */
+ @GetMapping("/otcCustomerOrderSync")
+ public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) {
+ return customerOrderService.otcCustomerOrderSync(selectTime, orderNo);
+ }
+
+ /**
+ *閫夋嫨缁戝畾浜哄憳
+ * @return
+ */
+ @ApiOperation(value = "閫夋嫨缁戝畾浜哄憳", notes = "閫夋嫨缁戝畾浜哄憳")
+ @GetMapping("/chooseStaff")
+ public R chooseStaff() {
+ return R.ok(staffService.chooseStaff());
}
/**
@@ -303,19 +327,6 @@
public R validatePackageCodeSnCustomerOrder(@RequestBody PackagingDTO packagingDTO) {
return R.ok(customerOrderService.validatePackageCodeSnCustomerOrder(packagingDTO));
}
-
- /**
- * 鍚屾otc璁㈠崟鏁版嵁
- *
- * @param selectTime 閫夋嫨鏃ユ湡锛屾煡璇㈣鏃ユ湡鍚庤嚦褰撳墠鏃堕棿鐨勬暟鎹�
- * @param orderNo 璁㈠崟缂栧彿
- * @return
- */
- @GetMapping("/otcCustomerOrderSync")
- public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) {
- return customerOrderService.otcCustomerOrderSync(selectTime, orderNo);
- }
-
/**
* 鏇存柊璁㈠崟琛岃鏄�
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
index 9f6bd8f..04fa92d 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
@@ -709,9 +709,6 @@
.contentType("application/json")
.header("Authorization", "Bearer " + token).form(map).execute().body();
JSONObject result = JSONObject.parseObject(str);
- log.info("涓昏〃闀垮害============================================>"+result.getJSONArray("data").size());
- //jsonArray.forEach();
- //return null;
//涓昏〃鍙傛暟琛�
List<OrderParam> orderParams = orderParamService.list();
if (result.getInteger("code") == 0) {
@@ -836,7 +833,7 @@
customerOrder = new CustomerOrder();
}
//濡傛灉杩欎釜鍗曞瓙鍦∣TC涓彇娑堢姸鎬� 閭ｅ氨鍒犻櫎
- if (otcOrderStatus.equals("宸插彇娑�")) {
+ if (otcOrderStatus.equals(OTC_MAIN_STATUS_CANCEL)) {
if (customerOrder.getId() != null) {
baseMapper.deleteById(customerOrder.getId());
}
@@ -924,7 +921,7 @@
} else {
customerOrder.setCoState(CustomerOrderStateStringValues.PARTUNCHECKED);
}
- if (org.apache.commons.lang3.StringUtils.equals("宸蹭笅杈�", otcMainStatus)) {
+ if (org.apache.commons.lang3.StringUtils.equals(OTC_MAIN_STATUS_TRANSMIT, otcMainStatus)) {
customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
customerOrder.setOtcPartSync(Boolean.TRUE);
}
@@ -933,8 +930,8 @@
customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
customerOrder.setOtcPartSync(Boolean.TRUE);
}
- //瀹℃牳鐘舵�佷负 01draft 鑽夌
- customerOrder.setIsAudit(AuditStateStringValues.DRAFT);
+ //瀹℃牳鐘舵�佷负 03accepted 閫氳繃
+ customerOrder.setIsAudit(AuditStateStringValues.ACCEPTED);
baseMapper.insert(customerOrder);
}
addCustomerPara(customerJSONObject, customerOrderJSONObject, customerOrder, orderParamList);
--
Gitblit v1.9.3