From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 aa619aa..d4ab78d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -36,19 +36,19 @@
throw new CoolException(BaseRes.PARAM);
}
int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("status", "N"));
+ eq("zpallet", param.getBarcode()).eq("io_status", "N"));
if (count > 0) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
for (CombParam.CombMat combMat : param.getCombMats()) {
MatCode matCode = matCodeService.selectById(combMat.getMatNo());
if (Cools.isEmpty(matCode)) {
- throw new CoolException("鐗╂枡鏁版嵁閿欒");
+ throw new CoolException("浜у搧鏁版嵁閿欒");
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setStatus("N"); // 鐘舵��
- waitPakin.setAnfme(combMat.getCount()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setQty(combMat.getCount()); // 鏁伴噺
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(new Date());
--
Gitblit v1.9.1