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 | 4 ++--
1 files changed, 2 insertions(+), 2 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..d78a656 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -36,7 +36,7 @@
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("鏉＄爜鏁版嵁宸插瓨鍦�");
}
@@ -47,7 +47,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setStatus("N"); // 鐘舵��
+ waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAnfme(combMat.getCount()); // 鏁伴噺
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAppeUser(userId);
--
Gitblit v1.9.1