From 06ea3e5721995a4a4e1ae0db93d7f7dac1bfa162 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:20:05 +0800
Subject: [PATCH] 1.成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中 2.库存查询界面以及出库提取界面新增是否贴标搜索筛选功能
---
src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java b/src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java
index a997828..c74936a 100644
--- a/src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java
+++ b/src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java
@@ -62,6 +62,10 @@
@RequestMapping(value = "/basProcessProcedures/add/auth")
@ManagerAuth
public R add(BasProcessProcedures basProcessProcedures) {
+ BasProcessProcedures boxType = basProcessProceduresService.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", basProcessProcedures.getBoxType()));
+ if (!Cools.isEmpty(boxType)){
+ return R.error("鏍囪瘑鍙烽噸澶�,璇锋鏌�!!!");
+ }
basProcessProceduresService.insert(basProcessProcedures);
return R.ok();
}
@@ -72,6 +76,11 @@
if (Cools.isEmpty(basProcessProcedures) || null==basProcessProcedures.getId()){
return R.error();
}
+ BasProcessProcedures boxType = basProcessProceduresService.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", basProcessProcedures.getBoxType()));
+ BasProcessProcedures basProcessProcedures1 = basProcessProceduresService.selectById(basProcessProcedures.getId());
+ if (!Cools.isEmpty(boxType) && !basProcessProcedures1.equals(boxType)){
+ return R.error("鏍囪瘑鍙烽噸澶�,璇锋鏌�!!!");
+ }
basProcessProceduresService.updateById(basProcessProcedures);
return R.ok();
}
--
Gitblit v1.9.1