From c9257b4d5fd42e7c7b9cf63529b0aba107c5ca87 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 11 七月 2024 13:03:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 86195a4..d022157 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -56,6 +56,8 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
// 鍟嗗搧涓婃灦
@@ -74,10 +76,14 @@
}
@RequestMapping("/search/sign/auth/v2")
-// @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
+ @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
public R orderSearchByBarcodeV2(@RequestParam boolean sign){
- Integer signRu = 1;
- return R.ok(signRu);
+ RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+ if (sign){
+ rgvOneSign.setRgvOneSign(1-rgvOneSign.getRgvOneSign());
+ rgvOneSignService.updateById(rgvOneSign);
+ }
+ return R.ok(rgvOneSign.getRgvOneSign());
}
@@ -211,10 +217,13 @@
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
}
+ String[] batch1 = batch.split("绠卞彿锛�");
+ String[] batch2 = batch1[1].split("瑙勬牸锛�");
+ batch = batch2[0];
// List<Order> orders = orderService.selectorderNoL(batch);
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetl)){
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetlLog)){
return R.error("鏈煡鍒版暟鎹�");
}
@@ -237,9 +246,9 @@
return R.error("鍙傛暟涓虹┖");
}
String orderNo = "";
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetl)) {
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetlLog)) {
return R.error("鏈煡鍒版暟鎹�");
}
@@ -254,6 +263,9 @@
}
if (!orderDetl.getQty$().equals("宸插畬鎴�")){
return R.error("浠诲姟鏈畬鎴�");
+ }
+ if (orderDetl.getSource()==1){
+ return R.error("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
}
orderDetl.setSource(1);
orderDetlService.updateById(orderDetl);
@@ -285,12 +297,22 @@
* 涓帶锛�2妤�212鍙墭鐩�
*/
@PostMapping("/balcony/complete/car/auth/v1")
- @AppAuth(memo = "涓帶锛�2妤�212鍙墭鐩�")
+// @AppAuth(memo = "涓帶锛�2妤�212鍙墭鐩�")
public synchronized R balconyCompleteCar() {
mobileService.trussComb2Car(212);
return R.ok();
}
+ /**
+ * 涓帶锛氳幏鍙栫鍨嬬紪鍙�
+ */
+ @PostMapping("/box/type/complete/auth/v1")
+// @AppAuth(memo = "涓帶锛氳幏鍙栫鍨嬬紪鍙�")
+ public synchronized R boxTypeCompleteCar() {
+ List<Map<String, Object>> maps = mobileService.boxTypeComb();
+ return R.ok().add(maps);
+ }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
--
Gitblit v1.9.1