From b6cec9be5a055f9c254e2158b6556acb9700bc90 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 10 四月 2025 08:17:43 +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..7b37390 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -62,7 +62,7 @@
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("STATUS",0)));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -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("O")){
+ locMast.setBarcode(null);
+ }
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
+ locMastService.toWmsLocStatus(locMast);
return R.ok();
}
--
Gitblit v1.9.1