From 65d4a072e6a382b9583cae85d5c6e59685c2c1c5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 13 十二月 2022 16:39:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 81 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
index dc5b068..499fda5 100644
--- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
+++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -56,12 +56,12 @@
Date now = new Date();
if (!Cools.isEmpty(goods)) {
for (Goods good : goods) {
- Mat mat = matService.selectByMatnr(good.getBarCode());
+ Mat mat = matService.selectByMatnr(good.getMaterialNO());
if (mat == null) {
mat = new Mat();
mat.setTagId(top.getId());
- mat.setMatnr(good.getBarCode());
- mat.setMaktx(good.getMaterialNO());
+ mat.setMatnr(good.getMaterialNO());
+// mat.setMaktx(good.getBarCode());
mat.setSpecs(good.getProdSpec());
mat.setModel(good.getBatch());
mat.setWeight(good.getNWT());
@@ -128,7 +128,7 @@
voucher.getLoc(), // 涓氬姟鍛�
voucher.getTotalCount(), // 缁撶畻澶╂暟 ********************
null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
+ voucher.getExpectedWeight(), // 閭垂
null, // 浠樻鏃堕棿
null, // 鍙戣揣鏃堕棿
null, // 鐗╂祦鍚嶇О
@@ -144,33 +144,64 @@
if (!orderService.insert(order)) {
throw new CoolException(order.getOrderNo() + "鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- for (VoucherDetail detail : dto.getDetails()) {
- Mat mat = matService.selectByMatnr(detail.getBarcode());
- if (mat == null) {
- throw new CoolException(detail.getBarcode() + "鍗曟嵁鍙蜂笉瀛樺湪");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
-// orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(1.0D);
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- 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(order.getOrderNo() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
+ if (mat == null) {
+ throw new CoolException(voucher.getMaterialNO() + "鐗╂枡鍙蜂笉瀛樺湪");
}
+
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ StringBuilder sb = new StringBuilder();
+ if (!Cools.isEmpty(dto.getDetails())) {
+ for (VoucherDetail detail : dto.getDetails()) {
+ sb.append(detail.getBarcode()).append(",");
+ }
+ orderDetl.setBatch(sb.toString());
+ }
+ orderDetl.setAnfme(voucher.getExpectedWeight());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ 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(order.getOrderNo() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+// else {
+// for (VoucherDetail detail : dto.getDetails()) {
+//
+// Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
+// if (mat == null) {
+// throw new CoolException(voucher.getMaterialNO() + "鐗╂枡鍙蜂笉瀛樺湪");
+// }
+//
+// OrderDetl orderDetl = new OrderDetl();
+// orderDetl.sync(mat);
+//// orderDetl.setBatch(detlDto.getBatch());
+// orderDetl.setAnfme(1.0D);
+// orderDetl.setOrderId(order.getId());
+// orderDetl.setOrderNo(order.getOrderNo());
+// 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(order.getOrderNo() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// }
+// }
// erp 鍚屾
int state = 1;
- if (!erpService.updateStateForVoucher(voucher.getVoucherID(), 1)) {
+ if (!erpService.updateStateForVoucher(voucher.getVoucherID(), state)) {
throw new CoolException(voucher.getVoucherID() + "璁㈠崟淇敼State涓�"+state+"澶辫触");
} else {
erpService.updateTimeForVoucherDetail(voucher.getVoucherID());
--
Gitblit v1.9.1