From dbae31a7a7cd59048ada9b51fe8faff545324c59 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 三月 2024 16:02:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 02f7233..c7ad697 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -145,9 +145,22 @@
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
}
+ if (!Cools.isEmpty(locMast.getContainerCode())){
+ locMast.setBarcode(locMast.getContainerCode());
+ }
+
+ if (locMast.getEmptyContainer$().equals("N") ){
+ if (locMast.getContainerCode().isEmpty() || locMast.getContainerTypeCode().isEmpty()){
+ return R.error("瀹瑰櫒缂栫爜鎴栧鍣ㄧ被鍨嬫湁璇�");
+ }
+ }
+ if (locMast.getLocSts().equals("K")){
+ locMast.setBarcode(null);
+ }
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
+ locMastService.toWmsLocStatus(locMast);
return R.ok();
}
@@ -173,7 +186,7 @@
Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
- locMast.setLocSts("O");
+ locMast.setLocSts("K");
locMast.setRow1(r); // 鎺�
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
--
Gitblit v1.9.1