From 2236df60033fe82f6e065997775ffa2ec405cd85 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 09 十一月 2024 14:28:41 +0800
Subject: [PATCH] #并板入库
---
src/main/java/com/zy/asrs/controller/MobileController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7589117..3112348 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -269,7 +269,19 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+ if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", combParam.getBarcode())
+ .eq("io_type", 104)
+ .eq("wrk_sts", 14));
+ if (Cools.isEmpty(wrkMast)) {
+ mobileService.comb(combParam, getUserId());
+ }else {
+ mobileService.mergeComb(combParam, getUserId());
+ }
+
return R.ok("缁勬墭鎴愬姛");
}
--
Gitblit v1.9.1