From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 5197b90..d78a656 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -10,6 +10,7 @@
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,7 +36,7 @@
throw new CoolException(BaseRes.PARAM);
}
int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("barcode", param.getBarcode()).eq("status", "N"));
+ eq("zpallet", param.getBarcode()).eq("io_status", "N"));
if (count > 0) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
@@ -44,19 +45,17 @@
if (Cools.isEmpty(matCode)) {
throw new CoolException("鐗╂枡鏁版嵁閿欒");
}
- WaitPakin waitPakin = new WaitPakin(
- param.getBarcode(), // 鎵樼洏鐮�
- matCode.getMatNo(), // 鐗╂枡缂栫爜
- matCode.getMatName(), // 鐗╂枡鎻忚堪
- combMat.getCount(), // 鏁伴噺
- matCode.getStr1(), // 鍗曚綅
- "N", // 鐘舵��
- null, // 澶囨敞
- new Date(), // 淇敼鏃堕棿
- userId, // 淇敼浜哄憳
- new Date(), // 娣诲姞鏃堕棿
- userId // 鍒涘缓鑰�
- );
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAnfme(combMat.getCount()); // 鏁伴噺
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(new Date());
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(new Date());
+ VersionUtils.setWaitPakIn(waitPakin, matCode);
+
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
--
Gitblit v1.9.1