From 67cb49032b0efff478b2432713d62c305e4e53ce Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 17:42:34 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/OrderDetlMapper.xml | 8 +
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 199 ++++++++++++++++++++--------
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 2
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 4
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 2
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 21 ++
src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 123 ++++++++--------
9 files changed, 235 insertions(+), 128 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b683199..c45aa28 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,13 +1,17 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.param.CheckParam;
+import com.zy.asrs.entity.param.MatSyncParam;
+import com.zy.asrs.entity.param.OrderProdSyncParam;
+import com.zy.asrs.entity.param.OrderSyncParam;
+import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -33,16 +37,17 @@
}};
-
@Autowired
private OpenService openService;
+
+ @Autowired
+ private DocTypeService docTypeService;
/**
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey,
- HttpServletRequest request) {
+ public R queryStock(@RequestHeader(required = false) String appkey, HttpServletRequest request) {
auth(appkey, null, request);
return R.ok().add(openService.queryStock());
}
@@ -52,9 +57,7 @@
*/
@PostMapping("/mat/v1")
@AppAuth(memo = "鐗╂枡鍚屾鎺ュ彛")
- public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -64,8 +67,6 @@
return R.ok("鏇存柊鎴愬姛");
}
-
-
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -85,19 +86,26 @@
@PostMapping("/order/pak/default/v1")
@AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
- public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
- @RequestBody(required = true) OrderSyncParam param,
- HttpServletRequest request){
- log.info("鐢熸垚閫�璐цˉ璐у崟鎹�,{}",JSON.toJSONString(param));
+ public synchronized R orderAccept(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) {
+ log.info("鐢熸垚閫�璐цˉ璐у崟鎹�,{}", JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
-
- String docName = param.get鎿嶄綔鍗曟嵁();
- boolean pakin = param.getPakin() == 1 ? true : false;
-
- openService.syncOrder(param,pakin,docName);
+ DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getChildren().get(0).getIQuantity());
+ if (!Cools.isEmpty(type)) {
+ if (type.getPakin() == 1) {
+ openService.syncOrder(param, true, type.getDocName());
+ } else {
+ openService.syncOrder(param, false, type.getDocName());
+ }
+ } else {
+ return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷");
+ }
+// String docName = param.get鎿嶄綔鍗曟嵁();
+// boolean pakin = param.getPakin() == 1 ? true : false;
+//
+// openService.syncOrder(param, pakin, docName);
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -105,20 +113,26 @@
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
- public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
- @RequestBody(required = true) OrderSyncParam param,
- HttpServletRequest request){
- log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}",JSON.toJSONString(param));
+ public synchronized R orderPakin(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) {
+ log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
- boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+// String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
+// boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- openService.syncOrder(param,pakin,docName);
-
+ DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getChildren().get(0).getIQuantity());
+ if (!Cools.isEmpty(type)) {
+ if (type.getPakin() == 1) {
+ openService.syncOrder(param, true, type.getDocName());
+ } else {
+ openService.syncOrder(param, false, type.getDocName());
+ }
+ } else {
+ return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷");
+ }
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
@@ -128,9 +142,7 @@
*/
@PostMapping("/check/default/v1")
@AppAuth(memo = "搴撳瓨鐩樼偣")
- public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
- @RequestBody(required = true) CheckParam param,
- HttpServletRequest request){
+ public synchronized R checkLoc(@RequestHeader(required = false) String appkey, @RequestBody(required = true) CheckParam param, HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -147,29 +159,51 @@
@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
//@RequestBody(required = false) HashMap<String,Object> param,
- @RequestBody(required = false) OrderProdSyncParam param,
- HttpServletRequest request){
- log.info("鍚屾宸ュ崟鍗曟嵁,{}",JSON.toJSONString(param));
+ @RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request) {
+ log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if(!Cools.eq("鐢熶骇",param.getCVouchtype())){
- String docName = param.getIQuantity() > 0 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟";
- boolean pakin = param.getIQuantity() > 0 ? true : false;
- mappingPakInOrderParam(param,pakin,docName);
- if(!Cools.isEmpty(param.getChildren())){
- String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
- boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- mappingPakOutOrderParam(param,pakin1,docName1);
+ DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getIQuantity());
+ if (!Cools.isEmpty(type)) {
+ if (type.getDocName().equals("MO")) {
+ mappingPakInOrderParam(param, true, type.getDocName());
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
+ } else if (type.getDocName().equals("OM")) {
+ mappingPakInOrderParam(param, true, type.getDocName());
+ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
+ } else {
+ if (type.getPakin() == 1) {
+ mappingPakInOrderParam(param, true, type.getDocName());
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingPakOutOrderParam(param, false, type.getDocName());
+ }
+ } else {
+ mappingPakOutOrderParam(param, false, type.getDocName());
+ }
}
-
- }else if(!Cools.isEmpty(param.getChildren())) {
- String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟";
- boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- mappingPakOutOrderParam(param,pakin1,docName1);
+ } else {
+ return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷");
}
+
+// if (!Cools.eq("鐢熶骇", param.getCVouchtype())) {
+// String docName = param.getIQuantity() > 0 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟";
+// boolean pakin = param.getIQuantity() > 0 ? true : false;
+// mappingPakInOrderParam(param, pakin, docName);
+//
+// if (!Cools.isEmpty(param.getChildren())) {
+// String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
+// boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+// mappingPakOutOrderParam(param, pakin1, docName1);
+// }
+//
+// } else if (!Cools.isEmpty(param.getChildren())) {
+// String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟";
+// boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+// mappingPakOutOrderParam(param, pakin1, docName1);
+// }
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -177,10 +211,8 @@
@PostMapping("/order/delete/default/v1")
@AppAuth(memo = "鍗曟嵁鍒犻櫎瀹℃牳")
- public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
- HttpServletRequest request){
- log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}",JSON.toJSONString(param));
+ public synchronized R orderDelete(@RequestHeader(required = false) String appkey, @RequestBody(required = false) Map<String, Object> param, HttpServletRequest request) {
+ log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}", JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -188,15 +220,15 @@
boolean success = openService.orderDelete(param.get("id").toString());
- if(success){
+ if (success) {
return R.ok("鍗曟嵁鍒犻櫎鎴愬姛");
- }else {
+ } else {
return R.error("鍗曟嵁姝ｅ湪鎵ц锛屽垹闄ゅけ璐�");
}
}
- private void mappingPakInOrderParam(OrderProdSyncParam param,boolean pakin,String docName){
+ private void mappingPakInOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
//鐢熸垚鍗曟嵁涓讳綋
OrderSyncParam orderSyncParam = new OrderSyncParam();
orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
@@ -222,12 +254,12 @@
// String docName = param.getIQuantity() > 0 ? "閾跺骇浜у搧鐢熶骇鍏ュ簱鍗�" : "鍏ュ簱閫�鍥炲崟";
// boolean pakin = param.getIQuantity() > 0 ? true : false;
- openService.syncOrder(orderSyncParam,pakin,docName);
+ openService.syncOrder(orderSyncParam, pakin, docName);
//return orderSyncParam;
}
- private void mappingPakOutOrderParam(OrderProdSyncParam param,boolean pakin,String docName){
+ private void mappingPakOutOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
OrderSyncParam orderSyncParam = new OrderSyncParam();
List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
@@ -241,7 +273,7 @@
//鐢熸垚鍗曟嵁鏄庣粏
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
- for(OrderProdSyncParam.ChildInfo childInfo : child){
+ for (OrderProdSyncParam.ChildInfo childInfo : child) {
OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
orderDetl.setcInvCode(childInfo.getCInvCode());
orderDetl.setiQuantity(childInfo.getIQuantity());
@@ -254,9 +286,62 @@
}
orderSyncParam.setChildren(orderDetls);
- openService.syncOrder(orderSyncParam,false,docName);
+ openService.syncOrder(orderSyncParam, false, docName);
//return orderSyncParam;
}
+
+ private DocType getType(String type, Double iQuantity) {
+ DocType docType = new DocType();
+ switch (type) {
+ case "Purchase":
+ docType.setDocName("閾跺骇閲囪喘鍏ュ簱鍗�");
+ docType.setPakin(1);
+ break;
+ case "MO":
+ docType.setDocName("閾跺骇鐢熶骇璁㈠崟");
+ docType.setPakin(0);
+ break;
+ case "OM":
+ docType.setDocName("閾跺骇濮斿鐢熶骇璁㈠崟");
+ docType.setPakin(0);
+ break;
+ case "閲囪喘鍏ュ簱鍗曢��璐�":
+ docType.setDocName("閾跺骇閲囪喘鍏ュ簱鍗曢��璐у崟");
+ docType.setPakin(0);
+ break;
+ case "濮斿鍏ュ簱鍗曢��璐�":
+ docType.setDocName("閾跺骇濮斿鍏ュ簱鍗曢��璐у崟");
+ docType.setPakin(1);
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱閫�鏂�":
+ docType.setDocName("閾跺骇鐢熶骇鏉愭枡鍑哄簱閫�鏂欏崟");
+ docType.setPakin(1);
+ break;
+ case "濮斿鏉愭枡鍑哄簱閫�鏂�":
+ docType.setDocName("閾跺骇濮斿鏉愭枡鍑哄簱閫�鏂欏崟");
+ docType.setPakin(1);
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
+ docType.setDocName("閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡鍗�");
+ docType.setPakin(0);
+ break;
+ case "濮斿鏉愭枡鍑哄簱琛ユ枡":
+ docType.setDocName("閾跺骇濮斿鏉愭枡鍑哄簱琛ユ枡鍗�");
+ docType.setPakin(0);
+ break;
+ case "鍏朵粬鍏ュ簱鍗�":
+ docType.setDocName("閾跺骇鍏朵粬鍏ュ簱鍗�");
+ docType.setPakin(1);
+ break;
+ case "鍏朵粬鍑哄簱鍗�":
+ docType.setDocName("閾跺骇鍏朵粬鍑哄簱鍗�");
+ docType.setPakin(0);
+ break;
+ default:
+ docType = docTypeService.selectOrAdd(type, iQuantity > 0);
+ }
+ return docType;
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
index 6ca1c6a..1248bc5 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -129,7 +129,7 @@
if (this == object) return true;
if (object == null || getClass() != object.getClass()) return false;
OrderDetl orderDetl = (OrderDetl) object;
- return Objects.equals(cInvCode, orderDetl.cInvCode) && Objects.equals(bFree1, orderDetl.bFree1) && Objects.equals(cDefine22, orderDetl.cDefine22);
+ return Objects.equals(cInvCode, orderDetl.cInvCode) && Objects.equals(batch, orderDetl.batch) && Objects.equals(bFree1, orderDetl.bFree1) && Objects.equals(cDefine22, orderDetl.cDefine22);
}
@Override
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index f605a1b..345b7ef 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -23,7 +23,7 @@
*/
OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("csocode")String csocode, @Param("isocode")String isocode);
- OrderDetl selectItemByOrderNo2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("threeCode") String threeCode);
+ OrderDetl selectItemByOrderNo2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("threeCode") String threeCode);
OrderDetl selectItemNoneOfBatch(@Param("orderNo")String orderNo, @Param("matnr")String matnr);
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 02ee354..54bc8ad 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -18,7 +18,7 @@
OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode);
- OrderDetl selectItem(String orderNo, String matnr, String threeCode);
+ OrderDetl selectItem(String orderNo, String matnr, String batch,String threeCode);
OrderDetl selectItemNoneOfBatch(String orderNo, String matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 2118fb9..b92d180 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -595,7 +595,7 @@
agvWaitPakinList.forEach(wp -> {
createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
// 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(), wp.getThreeCode());
+ OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(),wp.getBatch(), wp.getThreeCode());
// FlowLog flowLog = new FlowLog();
// flowLog.setFid(String.valueOf(flowId));
// flowLog.setSpare2(wrkMast.getWrkNo().toString());
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 6703a70..87839b2 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -122,7 +122,7 @@
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getCsocode(),dto.getIsoseq(),null);
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getCsocode(), dto.getIsoseq(), null);
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -136,7 +136,7 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
- if (!Cools.isEmpty(detlDto.getCFree1())){
+ if (!Cools.isEmpty(detlDto.getCFree1())) {
orderDetl.setSpecs(detlDto.getCFree1());
}
orderDetl.setBatch(detlDto.getBatch());
@@ -201,7 +201,7 @@
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
if (DetlDto.has(dbList, dto)) {
- DetlDto detlDto = DetlDto.find(dbList, dto.getMatnr(), dto.getBatch(),dto.getCsocode(),dto.getIsoseq(),null);
+ DetlDto detlDto = DetlDto.find(dbList, dto.getMatnr(), dto.getBatch(), dto.getCsocode(), dto.getIsoseq(), null);
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -339,7 +339,7 @@
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getCsocode(),dto.getIsoseq(),null);
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getCsocode(), dto.getIsoseq(), null);
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -414,7 +414,7 @@
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
if (DetlDto.has(dbList, dto)) {
- DetlDto detlDto = DetlDto.find(dbList, dto.getMatnr(), dto.getBatch(),dto.getCsocode(),dto.getIsoseq(),null);
+ DetlDto detlDto = DetlDto.find(dbList, dto.getMatnr(), dto.getBatch(), dto.getCsocode(), dto.getIsoseq(), null);
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -611,10 +611,11 @@
}
}
}
+
@Override
@Transactional
public Mat syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getCInvCode()) ) {
+ if (Cools.isEmpty(param.getCInvCode())) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
@@ -623,7 +624,7 @@
if (Cools.isEmpty(mat)) {
mat = new Mat();
mat.setTagId(tag.getId());
- syncMat(mat,param);
+ syncMat(mat, param);
if (matService.insert(mat)) {
callApiLogSave(mat, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
} else {
@@ -633,7 +634,7 @@
} else {
mat.setTagId(tag.getId());
- syncMat(mat,param);
+ syncMat(mat, param);
System.out.println(mat.getMaktx().length());
if (matService.updateById(mat)) {
callApiLogSave(mat, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
@@ -645,13 +646,13 @@
return mat;
}
- private void syncMat(Mat mat, MatSyncParam param){
+ private void syncMat(Mat mat, MatSyncParam param) {
Date date = new Date();
mat.setMatnr(param.getCInvCode());//鐗╂枡缂栫爜
mat.setMaktx(param.getCInvName());//鐗╂枡鍚嶇О
mat.setSpecs(param.getCInvStd());//瑙勬牸
mat.setUnit(param.getCComUnitName());
- mat.setBeBatch(Cools.eq("true",param.getBInvBatch()) ? 1 : 0);
+ mat.setBeBatch(Cools.eq("true", param.getBInvBatch()) ? 1 : 0);
mat.setStatus(param.getStates());
mat.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
@@ -672,12 +673,12 @@
@Override
@Transactional
public void combMes(CombParam param) {
- Long userId=9999l;
+ Long userId = 9999l;
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
callApiLogSaveMES(null, null, BaseRes.PARAM, false);
throw new CoolException(BaseRes.PARAM);
}
- if(param.getBarcode().length()!=8){
+ if (param.getBarcode().length() != 8) {
callApiLogSaveMES(param, null, param.getBarcode() + "锛氭潯鐮侀暱搴︿笉鏄�8浣�", false);
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
@@ -688,25 +689,25 @@
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
if (countLoc > 0) {
callApiLogSaveMES(param, null, param.getBarcode() + "锛氬簱瀛樻潯鐮佹暟鎹凡瀛樺湪", false);
throw new CoolException("搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
- }else if (countWrk > 0){
+ } else if (countWrk > 0) {
callApiLogSaveMES(param, null, param.getBarcode() + "锛氬伐浣滄槑缁嗘。宸插瓨鍦ㄦ鏁版嵁", false);
throw new CoolException("宸ヤ綔鏄庣粏妗ｅ凡瀛樺湪姝ゆ暟鎹�===>>" + param.getBarcode());
}
Date now = new Date();
- try{
+ try {
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
detlDto.setContainerCode(elem.getContainerCode());
if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
+ DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getCsocode(), detlDto.getIsoseq(), detlDto.getContainerCode());
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
} else {
@@ -717,7 +718,7 @@
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
- callApiLogSaveMES(param, null,mat.getMatnr()+"鍟嗗搧妗ｆ涓嶅瓨鍦�", false);
+ callApiLogSaveMES(param, null, mat.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�", false);
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
WaitPakin waitPakin = new WaitPakin();
@@ -732,25 +733,26 @@
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
if (!waitPakinService.insert(waitPakin)) {
- callApiLogSaveMES(param, null,mat.getMatnr()+"淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�", false);
+ callApiLogSaveMES(param, null, mat.getMatnr() + "淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�", false);
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
- }catch (Exception e){
- callApiLogSaveMES(null, null,""+e, false);
+ } catch (Exception e) {
+ callApiLogSaveMES(null, null, "" + e, false);
}
- callApiLogSaveMES(param, param.getCombMats().get(0),"缁勬墭鎴愬姛", true);
+ callApiLogSaveMES(param, param.getCombMats().get(0), "缁勬墭鎴愬姛", true);
}
- public void callApiLogSaveMES(CombParam combParam,CombParam.CombMat combMat, String response, Boolean bool) {
- if (Cools.isEmpty(combParam)){
+
+ public void callApiLogSaveMES(CombParam combParam, CombParam.CombMat combMat, String response, Boolean bool) {
+ if (Cools.isEmpty(combParam)) {
apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
"",
response, bool);
- }else if (Cools.isEmpty(combMat)){
+ } else if (Cools.isEmpty(combMat)) {
apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
"鎵樼洏鐮侊細" + combParam.getBarcode(),
response, bool);
- }else {
+ } else {
apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
"鎵樼洏鐮侊細" + combParam.getBarcode() + "銆佺墿鏂欑紪鍙凤細" + combMat.getMatnr() + "銆佹暟閲忥細" + combMat.getAnfme(),
response, bool);
@@ -765,7 +767,7 @@
public List<ViewWorkInBean> inlogERP() {
List<ViewWorkInBean> viewWorkInERP = reportQueryMapper.getViewWorkInERP();
ArrayList<ViewWorkInBean> viewWorkInBeans = new ArrayList<>();
- for (ViewWorkInBean viewWorkInBean:viewWorkInERP){
+ for (ViewWorkInBean viewWorkInBean : viewWorkInERP) {
viewWorkInBean.sype();
viewWorkInBeans.add(viewWorkInBean);
}
@@ -780,7 +782,7 @@
public List<ViewWorkInBean> outlogERP() {
List<ViewWorkInBean> viewWorkInERP = reportQueryMapper.getViewWorkOutERP();
ArrayList<ViewWorkInBean> viewWorkInBeans = new ArrayList<>();
- for (ViewWorkInBean viewWorkInBean:viewWorkInERP){
+ for (ViewWorkInBean viewWorkInBean : viewWorkInERP) {
viewWorkInBean.sype();
viewWorkInBeans.add(viewWorkInBean);
}
@@ -792,7 +794,7 @@
Date now = new Date();
Mat mat = matService.selectByMatnr(param.getCinvcode());
boolean update = true;
- if(Cools.isEmpty(matService.selectByMatnr(param.getCinvcode()))){
+ if (Cools.isEmpty(matService.selectByMatnr(param.getCinvcode()))) {
//鐗╂枡鍙�
mat = new Mat();
mat.setMatnr(param.getCinvcode());
@@ -837,8 +839,8 @@
mat.setUpdateTime(now);
- if(update){
- if (matService.updateById(mat)){
+ if (update) {
+ if (matService.updateById(mat)) {
callApiLogSave(param, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
param.setUpdate(true);
} else {
@@ -846,7 +848,7 @@
param.setError(true);
param.setMemo("娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛�");
}
- }else {
+ } else {
if (matService.insert(mat)) {
callApiLogSave(param, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
param.setInsert(true);
@@ -858,23 +860,22 @@
}
-
return true;
}
@Transactional
public boolean syncOrder(OrderSyncParam param, boolean pakin, String docName) {
- if(Cools.isEmpty(param) || Cools.isEmpty(param.getChildren())){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getChildren())) {
callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁澶辫触锛屽崟鎹弬鏁颁负绌烘垨鑰呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅", false);
throw new CoolException("鍗曟嵁鍙傛暟涓虹┖鎴栬�呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅");
}
Order orderOld = null;
- if(!Cools.isEmpty(orderService.selectByNo(param.getCPOID()))){
+ if (!Cools.isEmpty(orderService.selectByNo(param.getCPOID()))) {
orderOld = orderService.selectByNo(param.getCPOID());
- if(orderOld.getSettle() > 1){
+ if (orderOld.getSettle() > 1) {
throw new CoolException("璇ュ崟鎹凡鍦ㄤ綔涓氫腑锛屾棤娉曟洿鏀瑰崟鎹俊鎭�");
}
@@ -894,22 +895,22 @@
//throw new CoolException("璇ュ崟鎹凡瀛樺湪锛屾棤娉曠敓鎴愬崟鎹俊鎭�");
}
List<OrderSyncParam.OrderDetl> collect = param.getChildren().stream().distinct().collect(Collectors.toList());
- if (collect.size()!= param.getChildren().size()){
+ if (collect.size() != param.getChildren().size()) {
callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁澶辫触锛屽崟鎹槑缁嗛噸澶嶏紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅", false);
throw new CoolException("鎺ュ彈鍗曟嵁澶辫触锛屽崟鎹槑缁嗛噸澶嶏紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅");
}
Date now = new Date();
- Order order = orderMapping(param,now,pakin,docName);
+ Order order = orderMapping(param, now, pakin, docName);
orderService.insert(order);
param.getChildren().forEach(od -> {
- OrderDetl orderDetl = orderDetlMapping(order,od,now);
+ OrderDetl orderDetl = orderDetlMapping(order, od, now);
orderDetlService.insert(orderDetl);
});
- if(!Cools.isEmpty(orderOld)){
+ if (!Cools.isEmpty(orderOld)) {
//鍒犻櫎鍘熸湁鍗曟嵁淇℃伅
- orderService.delete(new EntityWrapper<Order>().eq("id",orderOld.getId()));
- orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id",orderOld.getId()));
+ orderService.delete(new EntityWrapper<Order>().eq("id", orderOld.getId()));
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderOld.getId()));
}
callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁鎴愬姛", true);
@@ -920,16 +921,16 @@
@Transactional
public boolean orderDelete(String orderNo) {
Order order = orderService.selectByNo(orderNo);
- if(Cools.isEmpty(order)){
+ if (Cools.isEmpty(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紝鏃犳硶鍒犻櫎鍗曟嵁");
}
- if(order.getSettle() != 1){
+ if (order.getSettle() != 1) {
return false;
}
orderService.deleteById(order);
- orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id",order.getId()));
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
return true;
}
@@ -941,30 +942,30 @@
//鍒ゆ柇搴撲綅鏄惁瀛樺湪
AgvLocMast agvLocMast = agvLocMastService.selectById(params.getLocNo());
- if(Cools.isEmpty(agvLocMast)){
+ if (Cools.isEmpty(agvLocMast)) {
throw new CoolException("搴撲綅鍙蜂笉瀛樺湪");
}
- if(!Cools.eq("O",agvLocMast.getLocSts()) && !Cools.eq("F",agvLocMast.getLocSts())){
+ if (!Cools.eq("O", agvLocMast.getLocSts()) && !Cools.eq("F", agvLocMast.getLocSts())) {
throw new CoolException("褰撳墠搴撲綅姝ｅ湪浣滀笟涓紝鏃犳硶鐩樼偣璋冩暣");
}
- if(Cools.isEmpty(params.getLocDetls())){
+ if (Cools.isEmpty(params.getLocDetls())) {
agvLocMast.setLocSts("O");
- }else {
+ } else {
agvLocMast.setLocSts("F");
}
agvLocMastService.updateById(agvLocMast);
//鍒犻櫎鏃у簱瀛�
- agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",params.getLocNo()));
+ agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", params.getLocNo()));
//鏂板鐩樼偣搴撳瓨
- for (DetlDto detlDto : params.getLocDetls()){
+ for (DetlDto detlDto : params.getLocDetls()) {
AgvLocDetl agvLocDetl = new AgvLocDetl();
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- BeanUtils.copyProperties(mat,agvLocDetl);
+ BeanUtils.copyProperties(mat, agvLocDetl);
agvLocDetl.setLocNo(params.getLocNo());
agvLocDetl.setSuppCode(params.getContainerCode());
agvLocDetl.setAnfme(detlDto.getAnfme());
@@ -977,7 +978,7 @@
return true;
}
- private Order orderMapping(OrderSyncParam param, Date now, boolean pakin, String docName){
+ private Order orderMapping(OrderSyncParam param, Date now, boolean pakin, String docName) {
Order order = new Order();
//uuid
order.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
@@ -1008,10 +1009,10 @@
return order;
}
- private OrderDetl orderDetlMapping(Order order, OrderSyncParam.OrderDetl odParam, Date now){
+ private OrderDetl orderDetlMapping(Order order, OrderSyncParam.OrderDetl odParam, Date now) {
Mat mat = matService.selectByMatnr(odParam.getCInvCode());
- if(Cools.isEmpty(mat)){
+ if (Cools.isEmpty(mat)) {
throw new CoolException("瀛樿揣缂栫爜锛�" + odParam.getCInvCode() + "涓嶅瓨鍦紝璇峰厛鍚屾瀛樿揣妗ｆ");
}
@@ -1035,7 +1036,7 @@
//閿�鍞鍗曞彿
od.setThreeCode(odParam.getCDefine22());
//鑷敱椤�
- od.setBatch(odParam.getBFree1());
+ od.setBatch(Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch() + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
//IDs
od.setSku(odParam.getId());
@@ -1052,10 +1053,10 @@
return od;
}
- private String toString(Object o){
- if(StringUtils.isEmpty(o)){
+ private String toString(Object o) {
+ if (StringUtils.isEmpty(o)) {
return null;
- }else{
+ } else {
return o.toString();
}
}
@@ -1074,9 +1075,9 @@
public static void main(String[] args) {
Object s = null;
- if(StringUtils.isEmpty(s)){
+ if (StringUtils.isEmpty(s)) {
System.out.println("null");
- }else {
+ } else {
System.out.println(s.toString());
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index b0e109e..704149f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -48,8 +48,8 @@
}
@Override
- public OrderDetl selectItem(String orderNo, String matnr, String threeCode) {
- return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, threeCode);
+ public OrderDetl selectItem(String orderNo, String matnr,String batch, String threeCode) {
+ return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, batch, threeCode);
}
@Override
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 2248302..77337d6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -92,7 +92,7 @@
@Transactional
public void timelyStart(Order order) {
- List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�"));
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�","鍏朵粬鍏ュ簱鍗�","鍏朵粬鍑哄簱鍗�"));
DocType docType = docTypeService.selectById(order.getDocType());
if (docNames.contains(docType.getDocName())) {
@@ -146,10 +146,22 @@
childInfo.setIrowno(orderDetl.getItemNum());
childInfo.setCInvCode(orderDetl.getMatnr());
childInfo.setIQuantity(orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()) + "");
- childInfo.setCBatch(orderDetl.getBatch());
+ String batch = orderDetl.getBatch();
+ if (Cools.isEmpty(batch)) {
+ childInfo.setCBatch("");
+ childInfo.setBFree1("");
+ } else {
+ String[] s = batch.split("__");
+ if (s.length > 1) {
+ childInfo.setCBatch(s[0]);
+ childInfo.setBFree1(s[1]);
+ } else {
+ childInfo.setCBatch(s[0]);
+ childInfo.setBFree1("");
+ }
+ }
childInfo.setINum(orderDetl.getLength() + "");
childInfo.setIinvexchrate("");
- childInfo.setBFree1(orderDetl.getDeadTime());
childInfo.setIPOsID(orderDetl.getSku());
childInfo.setCOrderCode(orderDetl.getOrderNo());
childInfo.setIvouchrowno(orderDetl.getItemNum());
@@ -159,6 +171,7 @@
}
}
+
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
String response = "";
@@ -181,7 +194,7 @@
success = true;
return code;
} catch (Exception e) {
- log.error(e.getMessage());
+ log.error("鎶ラ敊淇℃伅:{},{}", e.getMessage(), JSON.toJSONString(requestParam));
throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
} finally {
apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 7b50892..47ec31a 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -101,6 +101,14 @@
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
<if test="threeCode!=null and threeCode!='' ">
and three_code = #{threeCode}
</if>
--
Gitblit v1.9.1