From ea311bea6773822a7672411a6967277379aefa68 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 18:25:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 336 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 241 insertions(+), 95 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 cbb903c..f92f070 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* Created by vincent on 2022/4/9
@@ -134,6 +133,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);
@@ -144,6 +144,84 @@
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
@@ -269,6 +347,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 +356,82 @@
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("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟鏄庣粏妗ｅけ璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
}
@@ -448,51 +603,57 @@
}
@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.getCInvCCode());
+ 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);
+ 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) {
+
+ private void syncMat(Mat mat, MatSyncParam param){
+ Date date = new Date();
+ mat.setMatnr(param.getCInvCCode());//鐗╂枡缂栫爜
+ mat.setMaktx(param.getCInvName());//鐗╂枡鍚嶇О
+ mat.setSpecs(param.getCInvStd());//瑙勬牸
+ mat.setUnit(param.getCComUnitName());
+ mat.setBeBatch(param.getBInvBatch());
+ mat.setStatus(param.getStates());
+
+ 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",
- "鐗╂枡缂栫爜锛�" + matParam.getMatnr() + "銆佺墿鏂欏悕绉帮細" + matParam.getMaktx() + "銆佽鏍硷細" + matParam.getSpecs() + "銆佸娉細" + matParam.getMemo(),
+ "鐗╂枡缂栫爜锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getMaktx() + "銆佽鏍硷細" + mat.getSpecs() + "銆佸娉細" + mat.getMemo(),
response, bool);
}
@@ -691,22 +852,25 @@
}
@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()))){
+ if(!Cools.isEmpty(orderService.selectByNo(param.getCPOID()))){
+ 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);
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);
});
+
+ callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁鎴愬姛", true);
return true;
}
@@ -728,43 +892,21 @@
return true;
}
- private Order orderMapping(Map<String, Object> param, Date now){
+ 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.setMemo(param.getCMemo());
//鍒跺崟浜�
- //order.setShipCode(param.get("cMaker").toString());
- order.setShipCode(toString(param.get("cMaker")));
+ order.setShipCode(param.getCPersonCode());
order.setCreateTime(now);
order.setUpdateTime(now);
@@ -776,37 +918,36 @@
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.setAnfme(odParam.getIQuantity());
//閿�鍞鍗曞彿
- //od.setColor(odParam.get("csocode").toString());
- od.setColor(toString(odParam.get("csocode")));
- //閿�鍞鍗曡鍙�
- //od.setOrigin(odParam.get("isoseq").toString());
- od.setOrigin(toString(odParam.get("isoseq")));
+ od.setThreeCode(odParam.getCsocode());
+ //鑷敱椤�
+ od.setDeadTime(odParam.getBFree1());
+ //IDs
+ od.setSku(odParam.getID());
od.setStatus(1);
od.setQty(0.0D);
@@ -833,6 +974,11 @@
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)){
--
Gitblit v1.9.1