From d559780d63e92b9cbbdf82b819cbc8bc9053da80 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 三月 2021 08:18:59 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 f883afc..5c2099e 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
@@ -102,26 +102,26 @@
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(first.getId());
second = new Tag(
- null, // 缂栧彿
+ null, // 缂栧彿
data.getYjfl(), // 鍚嶇О
first.getId(), // 鐖剁骇
first.getName(), // 鐖剁骇鍚嶇О
nodeUtils.path.toString(), // 鍏宠仈璺緞
nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 2, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
if (tagMapper.insert(second) == 0) {
throw new CoolException("鎻掑叆鍒嗙被澶辫触");
}
@@ -291,6 +291,9 @@
if (!Cools.isEmpty(list)) {
boolean complete = true;
for (GetOrderResult data : list) {
+ if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", data.getNumber()).ne("bType_id", data.getBTypeID())) > 0) {
+ throw new CoolException("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙凤細" + data.getNumber());
+ }
CustOrder custOrder = new CustOrder(
data.getNumber(), // 閿�鍞崟鍙�
data.getBillDate(), // 鍗曟嵁鏃ユ湡[闈炵┖]
--
Gitblit v1.9.1