From ab14726215678ac69adfeafbd845ebc5b0776ea2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:56:41 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 549 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 390 insertions(+), 159 deletions(-)
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 9a03e7f..6044ed0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -16,7 +16,9 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +27,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/4/9
@@ -60,6 +62,10 @@
private WrkDetlService wrkDetlService;
@Autowired
private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private AgvLocMastService agvLocMastService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
@Override
@Transactional
@@ -71,8 +77,7 @@
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ order = new Order(String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
@@ -116,7 +121,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 {
@@ -130,10 +135,14 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
+ if (!Cools.isEmpty(detlDto.getCFree1())) {
+ orderDetl.setSpecs(detlDto.getCFree1());
+ }
orderDetl.setBatch(detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setSource(docType.getDocId().intValue());
orderDetl.setCreateBy(9527L);
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9527L);
@@ -144,6 +153,83 @@
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
+// 鐢熸垚璋冩嫧鍗�
+ if (docType.getDocId().intValue() == 32) {
+ order = new Order(String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ "DB" + param.getOrderNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ 33L, // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟澶辫触");
+ }
+ List<DetlDto> dbList = new ArrayList<>();
+ List<DetlDto> dbOrderDetails = param.getOrderDetails();
+ // 鍗曟嵁鏄庣粏妗�
+ 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);
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ } else {
+ dbList.add(dto);
+ }
+ }
+ for (DetlDto detlDto : dbList) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setSource(docType.getDocId().intValue());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟鏄庣粏妗ｅけ璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ }
+
}
@Override
@@ -206,8 +292,7 @@
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ order = new Order(String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
@@ -251,7 +336,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 {
@@ -269,6 +354,7 @@
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setSource(docType.getDocId().intValue());
orderDetl.setCreateBy(9527L);
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9527L);
@@ -277,6 +363,81 @@
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ if (docType.getDocId().intValue() == 32) {
+ order = new Order(String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ "DB" + param.getOrderNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ 33L, // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟澶辫触");
+ }
+ List<DetlDto> dbList = new ArrayList<>();
+ List<DetlDto> dbOrderDetails = param.getOrderDetails();
+ // 鍗曟嵁鏄庣粏妗�
+ 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);
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ } else {
+ dbList.add(dto);
+ }
+ }
+ for (DetlDto detlDto : dbList) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setSource(docType.getDocId().intValue());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟鏄庣粏妗ｅけ璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
}
@@ -344,8 +505,7 @@
throw new CoolException(param.getBarcode() + "閲嶅鎻愪氦");
}
Date now = new Date();
- pack = new Pack(
- param.getBarcode(), // 鏉＄爜[闈炵┖]
+ pack = new Pack(param.getBarcode(), // 鏉＄爜[闈炵┖]
analyse.getMatnr(), // 鐗╂枡鍙�
analyse.getBarcode(), // 搴忓垪鐮�
1L, // 璁㈠崟鐘舵��
@@ -372,8 +532,7 @@
Tag top = tagService.getTop();
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(top.getId());
- priTag = new Tag(
- null, // 缂栧彿
+ priTag = new Tag(null, // 缂栧彿
param.getGroupCode(), // 鍚嶇О
top.getId(), // 鐖剁骇
top.getName(), // 鐖剁骇鍚嶇О
@@ -402,8 +561,7 @@
if (secTag == null) {
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(priTag.getId());
- secTag = new Tag(
- null, // 缂栧彿
+ secTag = new Tag(null, // 缂栧彿
param.getGroupName(), // 鍚嶇О
priTag.getId(), // 鐖剁骇
priTag.getName(), // 鐖剁骇鍚嶇О
@@ -446,95 +604,101 @@
}
}
}
+
@Override
@Transactional
- public MatSyncParam syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMats()) || param.getMats().size() <=0 ) {
+ public Mat syncMat(MatSyncParam param) {
+ if (Cools.isEmpty(param.getCInvCode())) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
- MatSyncParam matSyncParam = new MatSyncParam();
- ArrayList<MatSyncParam.Mats> matParams = new ArrayList<>();
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
- for (MatSyncParam.Mats matParam : param.getMats()){
- Date date = new Date();
- Mat mat = matService.selectByMatnr(matParam.getMatnr());
- if (Cools.isEmpty(mat)) {
- Mat matNew = new Mat();
- matNew.setTagId(tag.getId());
- matNew.setMatnr(matParam.getMatnr());//鐗╂枡缂栫爜
- matNew.setMaktx(matParam.getMaktx());//鐗╂枡鍚嶇О
- matNew.setSpecs(matParam.getSpecs());//瑙勬牸
- matNew.setModel(matParam.getModel());//鍨嬪彿
- matNew.setColor(matParam.getColor());//棰滆壊
- matNew.setUnit(matParam.getUnit());//鍗曚綅
- matNew.setMemo(matParam.getMemo());//澶囨敞
- matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setCreateTime(date);
- matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setUpdateTime(date);
- if (matService.insert(matNew)) {
- callApiLogSave(matParam, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
- matParam.setType(true);
- } else {
- callApiLogSave(matParam, "/open/asrs/mat/v1", "娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
- matParam.setType(false);
- matParam.setMemo("娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛�");
- }
+
+ Mat mat = matService.selectByMatnr(param.getCInvCode());
+ if (Cools.isEmpty(mat)) {
+ mat = new Mat();
+ mat.setTagId(tag.getId());
+ syncMat(mat, param);
+ if (matService.insert(mat)) {
+ callApiLogSave(mat, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
} else {
- callApiLogSave(matParam, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佸晢鍝佸凡瀛樺湪锛侊紒锛�", false);
- matParam.setType(false);
- matParam.setMemo("鍟嗗搧宸插瓨鍦紒");
+ callApiLogSave(mat, "/open/asrs/mat/v1", "娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
+ mat.setMemo("娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛�");
}
- matParams.add(matParam);
+
+ } else {
+ mat.setTagId(tag.getId());
+ syncMat(mat, param);
+ System.out.println(mat.getMaktx().length());
+ if (matService.updateById(mat)) {
+ callApiLogSave(mat, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
+ } else {
+ callApiLogSave(mat, "/open/asrs/mat/v1", "娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
+ mat.setMemo("娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛�");
+ }
}
- matSyncParam.setMats(matParams);
- return matSyncParam;
+ return mat;
}
- public void callApiLogSave(MatSyncParam.Mats matParam, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1",
- "鐗╂枡缂栫爜锛�" + matParam.getMatnr() + "銆佺墿鏂欏悕绉帮細" + matParam.getMaktx() + "銆佽鏍硷細" + matParam.getSpecs() + "銆佸娉細" + matParam.getMemo(),
- response, bool);
+
+ 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.setStatus(param.getStates());
+
+ mat.setModel(param.getIGroupType());//0:鏃犳崲绠� 1锛氬浐瀹氭崲绠� 2锛氭诞鍔ㄦ崲绠� 涓嶆槸0鐨勯兘寰椾紶 榛樿涓�0
+ mat.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
+ mat.setCreateTime(date);
+ mat.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
+ mat.setUpdateTime(date);
+
+
+ }
+
+ public void callApiLogSave(Mat mat, String tableName, String response, Boolean bool) {
+ apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1", "鐗╂枡缂栫爜锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getMaktx() + "銆佽鏍硷細" + mat.getSpecs() + "銆佸娉細" + mat.getMemo(), response, bool);
}
@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());
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
callApiLogSaveMES(param, null, param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱", false);
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 {
@@ -545,7 +709,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();
@@ -560,28 +724,23 @@
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)){
- apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
- "",
- response, bool);
- }else if (Cools.isEmpty(combMat)){
- apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
- "鎵樼洏鐮侊細" + combParam.getBarcode(),
- response, bool);
- }else {
- apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1",
- "鎵樼洏鐮侊細" + combParam.getBarcode() + "銆佺墿鏂欑紪鍙凤細" + combMat.getMatnr() + "銆佹暟閲忥細" + combMat.getAnfme(),
- response, bool);
+
+ 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)) {
+ apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1", "鎵樼洏鐮侊細" + combParam.getBarcode(), response, bool);
+ } else {
+ apiLogService.save("MES涓嬪彂鍏ュ簱閫氱煡鍗�", "/open/asrs/comb/v1", "null", "10.10.10.1", "鎵樼洏鐮侊細" + combParam.getBarcode() + "銆佺墿鏂欑紪鍙凤細" + combMat.getMatnr() + "銆佹暟閲忥細" + combMat.getAnfme(), response, bool);
}
}
@@ -593,7 +752,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);
}
@@ -608,7 +767,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);
}
@@ -620,7 +779,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());
@@ -665,8 +824,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 {
@@ -674,7 +833,7 @@
param.setError(true);
param.setMemo("娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛�");
}
- }else {
+ } else {
if (matService.insert(mat)) {
callApiLogSave(param, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
param.setInsert(true);
@@ -686,27 +845,65 @@
}
-
return true;
}
@Transactional
- public boolean syncOrder(Map<String, Object> param) {
- if(Cools.isEmpty(param) || Cools.isEmpty(param.get("orderDetails"))){
+ public boolean syncOrder(OrderSyncParam param, boolean pakin, String docName) {
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getChildren())) {
+ callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁澶辫触锛屽崟鎹弬鏁颁负绌烘垨鑰呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅", false);
throw new CoolException("鍗曟嵁鍙傛暟涓虹┖鎴栬�呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅");
}
- if(!Cools.isEmpty(orderService.selectByNo(param.get("id").toString()))){
- throw new CoolException("璇ュ崟鎹凡瀛樺湪锛屾棤娉曠敓鎴愬崟鎹俊鎭�");
+ Order orderOld = null;
+
+ if (!Cools.isEmpty(orderService.selectByNo(param.getCPOID()))) {
+
+ orderOld = orderService.selectByNo(param.getCPOID());
+ if (orderOld.getSettle() > 1) {
+ throw new CoolException("璇ュ崟鎹凡鍦ㄤ綔涓氫腑锛屾棤娉曟洿鏀瑰崟鎹俊鎭�");
+ }
+
+// String orderNo = param.getCPOID();
+// if (orderNo.contains("-")){
+// int index = Integer.parseInt(orderNo.split("-")[1]) + 1;
+// orderNo = orderNo.split("-")[0] + "-" + index;
+// param.setcPOID(orderNo);
+// }else {
+// orderNo = orderNo + "-1";
+// param.setcPOID(orderNo);
+// }
+//
+// syncOrder(param,pakin,docName);
+
+ //callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁澶辫触锛岃鍗曟嵁宸插瓨鍦紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅", false);
+ //throw new CoolException("璇ュ崟鎹凡瀛樺湪锛屾棤娉曠敓鎴愬崟鎹俊鎭�");
+ }
+ List<OrderSyncParam.OrderDetl> collect = param.getChildren().stream().distinct().collect(Collectors.toList());
+ 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);
+ Order order = orderMapping(param, now, pakin, docName);
+ StringBuffer tel = new StringBuffer();
+ for (OrderSyncParam.OrderDetl child : param.getChildren()) {
+ tel.append(child.getCDefine22()).append(";");
+ }
+ order.setTel(tel.toString());
orderService.insert(order);
- List<Map<String, Object>> orderDetails = (List<Map<String, Object>>) param.get("orderDetails");
- orderDetails.forEach(odParam -> {
- OrderDetl od = orderDetlMapping(order,odParam,now);
- orderDetlService.insert(od);
+ param.getChildren().forEach(od -> {
+ OrderDetl orderDetl = orderDetlMapping(order, od, now);
+ orderDetlService.insert(orderDetl);
});
+
+ if (!Cools.isEmpty(orderOld)) {
+ //鍒犻櫎鍘熸湁鍗曟嵁淇℃伅
+ 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);
return true;
}
@@ -714,61 +911,89 @@
@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_no",orderNo));
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
return true;
}
- private Order orderMapping(Map<String, Object> param, Date now){
+ @Override
+ @Transactional
+ @Synchronized
+ public boolean checkAndAdjustLocDetl(CheckParam params) {
+
+ //鍒ゆ柇搴撲綅鏄惁瀛樺湪
+ AgvLocMast agvLocMast = agvLocMastService.selectById(params.getLocNo());
+ if (Cools.isEmpty(agvLocMast)) {
+ throw new CoolException("搴撲綅鍙蜂笉瀛樺湪");
+ }
+
+ if (!Cools.eq("O", agvLocMast.getLocSts()) && !Cools.eq("F", agvLocMast.getLocSts())) {
+ throw new CoolException("褰撳墠搴撲綅姝ｅ湪浣滀笟涓紝鏃犳硶鐩樼偣璋冩暣");
+ }
+
+ if (Cools.isEmpty(params.getLocDetls())) {
+ agvLocMast.setLocSts("O");
+ } else {
+ agvLocMast.setLocSts("F");
+ }
+
+ agvLocMastService.updateById(agvLocMast);
+
+ //鍒犻櫎鏃у簱瀛�
+ agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", params.getLocNo()));
+
+ //鏂板鐩樼偣搴撳瓨
+ for (DetlDto detlDto : params.getLocDetls()) {
+ AgvLocDetl agvLocDetl = new AgvLocDetl();
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ BeanUtils.copyProperties(mat, agvLocDetl);
+ agvLocDetl.setLocNo(params.getLocNo());
+ agvLocDetl.setSuppCode(params.getContainerCode());
+ agvLocDetl.setAnfme(detlDto.getAnfme());
+ agvLocDetl.setBatch(detlDto.getBatch());
+ agvLocDetl.setThreeCode(detlDto.getCsocode());
+ agvLocDetl.setDeadTime(detlDto.getIsoseq());
+ agvLocDetlService.insert(agvLocDetl);
+ }
+
+ return true;
+ }
+
+ private Order orderMapping(OrderSyncParam param, Date now, boolean pakin, String docName) {
Order order = new Order();
//uuid
order.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
- //鏍哥畻涓讳綋
- //order.setItemName(param.get("account").toString());
- order.setItemName(toString(param.get("account")));
//鍗曟嵁鍞竴琛ㄧず
- //order.setOrderNo(param.get("id").toString());
- order.setOrderNo(toString(param.get("id")));
- //涓氬姟绫诲瀷
- //order.setDefNumber(param.get("cBusType").toString());
- order.setDefNumber(toString(param.get("cBusType")));
+ order.setOrderNo(param.getCPOID());
//鍗曟嵁绫诲瀷
- DocType docType = docTypeService.selectOrAdd(param.get("cVouchType").toString(), Boolean.TRUE);
+ DocType docType = docTypeService.selectOrAdd(docName, pakin);
order.setDocType(docType.getDocId());
//鍗曟嵁鏃ユ湡
- //order.setOrderTime(param.get("dDate").toString());
- order.setOrderTime(toString(param.get("dDate")));
- //渚涘簲鍟�/瀹㈡埛缂栫爜
- //order.setCstmrName(param.get("ks").toString());
- order.setCstmrName(toString(param.get("ks")));
- //浠撳簱
- //order.setTel(param.get("cWhName").toString());
- order.setTel(toString(param.get("cWhName")));
- //鍑哄叆搴撶被鍒�
- //setOperMemb(param.get("cRdName").toString());
- order.setOperMemb(toString(param.get("cRdName")));
- //閮ㄩ棬
- //order.setSalesman(param.get("cDepCode").toString());
- order.setSalesman(toString(param.get("cDepCode")));
- //澶囨敞
- //order.setMemo(param.get("cMemo").toString());
- order.setMemo(toString(param.get("cMemo")));
+ order.setOrderTime(param.getDdate());
+
+ //渚涘簲鍟嗙紪鐮�
+ order.setSalesman(param.getCVenCode());
+
+ order.setMemo(param.getCMemo());
//鍒跺崟浜�
- //order.setShipCode(param.get("cMaker").toString());
- order.setShipCode(toString(param.get("cMaker")));
+ order.setShipCode(param.getCPersonCode());
+ order.setDefNumber(param.get鎿嶄綔绯荤粺鍙�());
+
+ order.setCreateBy(9999L);
order.setCreateTime(now);
+ order.setUpdateBy(9999L);
order.setUpdateTime(now);
-
+ order.setUpstreamcode(param.getUpstreamcode());
//璁㈠崟鐘舵��
order.setSettle(1L);
//鐘舵��
@@ -776,43 +1001,47 @@
return order;
}
- private OrderDetl orderDetlMapping(Order order, Map<String, Object> odParam, Date now){
+ private OrderDetl orderDetlMapping(Order order, OrderSyncParam.OrderDetl odParam, Date now) {
+
+ Mat mat = matService.selectByMatnr(odParam.getCInvCode());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException("瀛樿揣缂栫爜锛�" + odParam.getCInvCode() + "涓嶅瓨鍦紝璇峰厛鍚屾瀛樿揣妗ｆ");
+ }
+
OrderDetl od = new OrderDetl();
od.setOrderId(order.getId());
od.setOrderNo(order.getOrderNo());
- //琛屽敮涓�鏍囪瘑
- //od.setItemNum(odParam.get("autoId").toString());
- od.setItemNum(toString(odParam.get("autoId")));
+ //閲囪喘璁㈠崟琛屽彿
+ od.setItemNum(odParam.getIvouchrowno());
//瀛樿揣缂栫爜
- //od.setMatnr(odParam.get("cInvCode").toString());
- od.setMatnr(toString(odParam.get("cInvCode")));
+ od.setMatnr(mat.getMatnr());
//瀛樿揣鍚嶇О
- //od.setMaktx(odParam.get("cInvName").toString());
- od.setMaktx(toString(odParam.get("cInvName")));
+ od.setMaktx(mat.getMaktx());
//瑙勬牸鍨嬪彿
//od.setSpecs(odParam.get("cInvStd").toString());
- od.setSpecs(toString(odParam.get("cInvStd")));
+ od.setSpecs(mat.getSpecs());
//璁￠噺鍗曚綅
//od.setUnit(odParam.get("cComUnitName").toString());
- od.setUnit(toString(odParam.get("cComUnitName")));
+ od.setUnit(mat.getUnit());
//鏁伴噺
- od.setAnfme(Double.parseDouble(odParam.get("iQuantity").toString()));
- //od.setAnfme(toString(odParam.get("iQuantity")));
- //琛屽彿
- //od.setBrand(odParam.get("irowno").toString());
- //od.setBrand(toString(odParam.get("irowno")));
- od.setManu(toString(odParam.get("irowno")));
+ od.setAnfme(odParam.getIQuantity());
//閿�鍞鍗曞彿
- //od.setColor(odParam.get("csocode").toString());
- //od.setColor(toString(odParam.get("csocode")));
- od.setThreeCode(toString(odParam.get("csocode")));
- //閿�鍞鍗曡鍙�
- //od.setOrigin(odParam.get("isoseq").toString());
- //od.setOrigin(toString(odParam.get("isoseq")));
- od.setDeadTime(toString(odParam.get("isoseq")));
+ od.setThreeCode(odParam.getCDefine22());
+ //鑷敱椤�
+ if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
+ od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
+ }
+ od.setWeight(odParam.getINum());
+ od.setVolume(odParam.getIinvexchrate());
+ //IDs
+ od.setSku(odParam.getId());
+ od.setLength(odParam.getINum());
+
+ od.setSource(order.getDocType().intValue());
od.setStatus(1);
od.setQty(0.0D);
+ od.setReportQty(0.0D);
od.setCreateBy(9999L);
od.setCreateTime(now);
od.setUpdateBy(9999L);
@@ -821,26 +1050,28 @@
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();
}
}
public void callApiLogSave(MatInfoParam matParam, String tableName, String response, Boolean bool) {
- apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1",
- "鐗╂枡缂栫爜锛�" + matParam.getCinvcode() + "銆佺墿鏂欏悕绉帮細" + matParam.getCinvname() + "銆佽鏍硷細" + matParam.getCInvStd() + "銆佸娉細" + matParam.getMemo(),
- response, bool);
+ apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1", "鐗╂枡缂栫爜锛�" + matParam.getCinvcode() + "銆佺墿鏂欏悕绉帮細" + matParam.getCinvname() + "銆佽鏍硷細" + matParam.getCInvStd() + "銆佸娉細" + matParam.getMemo(), response, bool);
+ }
+
+ public void callApiLogSave(OrderSyncParam param, String tableName, String response, Boolean bool) {
+ apiLogService.save("ERP璁㈠崟鍚屾", tableName, "null", "10.10.10.1", param.toString(), response, bool);
}
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());
}
}
--
Gitblit v1.9.1