From 4c8ece9325b6976e4d07e0985edc12522d8ec48a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 15 十二月 2022 08:42:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 97 +++++++++++++++++++++++-------------------------
1 files changed, 46 insertions(+), 51 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 499fda5..f76f630 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
@@ -76,12 +76,11 @@
if (!matService.insert(mat)) {
throw new CoolException(good.getBarCode() + "鍟嗗搧鍚屾澶辫触");
- } else {
- int state = 1;
- if (!erpService.updateStateForGoods(good.getBarCode(), state)) {
- throw new CoolException(good.getBarCode() + "鍟嗗搧淇敼State涓�"+state+"澶辫触");
- }
}
+ }
+ int state = 1;
+ if (!erpService.updateStateForGoods(good.getBarCode(), state)) {
+ throw new CoolException(good.getBarCode() + "鍟嗗搧淇敼State涓�"+state+"澶辫触");
}
}
}
@@ -145,59 +144,55 @@
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())) {
+ // 绻冲韩鍠�
+ if (docType.getPakin() == 1) {
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() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
-// 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() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
-// }
-// }
+ orderDetl.setBatch(detail.getBarcode());
+ orderDetl.setAnfme(mat.getWeight());
+
+ 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 {
+ 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() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
// erp 鍚屾
int state = 1;
--
Gitblit v1.9.1