From 7df6ab7f0cede6c1a9aa51e496f910026a4bfce6 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 07 十二月 2021 09:43:09 +0800
Subject: [PATCH] 2021.12.7
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index d131876..d13c6de 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -17,6 +17,7 @@
import zy.cloud.wms.common.service.erp.entity.*;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.mapper.MatCodeMapper;
import zy.cloud.wms.manager.mapper.TagMapper;
import zy.cloud.wms.manager.service.*;
import zy.cloud.wms.manager.utils.HttpHandler;
@@ -40,6 +41,7 @@
public static final String GET_BASIS = "cM/basis/getBasis";
public static final String UPLOAD_BILL = "cM/basis/uploadBill";
public static final String UPLOAD_STOCK = "cM/basis/uploadStock";
+ public static final String GET_STOCK = "cM/ptype/GetStock";
public static final String OVER_BILL = "cM/basis/OverBill";
public static final String UPLOAD_CANCEL_RESULT = "cM/basis/cancelOrders";
@@ -67,6 +69,9 @@
private DocLogService docLogService;
@Autowired
private RequestLogService requestLogService;
+ @Autowired
+ private MatCodeMapper matCodeMapper;
+
/**
* 鍟嗗搧涓嬭浇
@@ -170,6 +175,7 @@
}
if (null == mat) {
+ // 骞充粨
mat = new Mat(
String.valueOf(data.getRec()), // 缂栧彿
null, // 鎵�灞炲尯鍩�
@@ -195,8 +201,12 @@
updateTime, // 淇敼鏃堕棿
null // 澶囨敞
);
+
matService.insert(mat);
+ // 绔嬪簱
+
} else {
+ // 骞充粨
mat.setUuid(String.valueOf(data.getRec()));
mat.setMatnr(data.getUserCode());
mat.setMaktx(data.getFullName());
@@ -205,6 +215,8 @@
mat.setBarcode(data.getBarcode());
mat.setUnit(data.getUnit3());
matService.updateById(mat);
+ // 绔嬪簱
+
}
log.info("====>> 鏇存柊鐗╂枡锛歿}", data.getUserCode());
}
@@ -341,7 +353,11 @@
updateTime, // 淇敼鏃堕棿
null // 澶囨敞
);
- matService.insert(mat);
+ if (matService.insert(mat)) {
+ MatCode matCode = mat.beMatCode();
+ matCodeMapper.insert(matCode);
+ }
+
} else {
mat.setUuid(String.valueOf(data.getRec()));
mat.setMatnr(data.getUserCode());
@@ -350,7 +366,10 @@
mat.setUpdateTime(updateTime);
mat.setBarcode(data.getBarcode());
mat.setUnit(data.getUnit3());
- matService.updateById(mat);
+ if (matService.updateById(mat)) {
+ MatCode matCode = mat.beMatCode();
+ matCodeMapper.updateById(matCode);
+ }
}
log.info("====>> 鏇存柊鐗╂枡锛歿}", data.getUserCode());
}
--
Gitblit v1.9.1