From f42ab50e23d905a963218ee05fdf40b7028dfbd0 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 11 十月 2024 20:18:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 28 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..dc8c870 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,15 @@
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
}
+ String[] batch1 = batch.split("绠卞彿锛�");
+ String[] batch2 = batch1[1].split("瑙勬牸锛�");
+ batch = batch2[0].replaceAll(" ", "");
// List<Order> orders = orderService.selectorderNoL(batch);
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+ WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(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.selectWrkDetlLogByOrderNoNotNull(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("鏈煡鍒版暟鎹�");
}
@@ -233,31 +244,53 @@
@RequestMapping("/order/search/batch/auth")
@ManagerAuth(memo = "鍑哄簱纭")
public R orderSearchByBatch(@RequestBody String batch){
- if (Cools.isEmpty(batch)){
- return R.error("鍙傛暟涓虹┖");
- }
- String orderNo = "";
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
- if (Cools.isEmpty(wrkDetl)) {
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
- if (Cools.isEmpty(wrkDetlLog)) {
- return R.error("鏈煡鍒版暟鎹�");
+ try{
+ if (Cools.isEmpty(batch)){
+ return R.error("鍙傛暟涓虹┖");
}
- orderNo=wrkDetlLog.getOrderNo();
- }else {
- orderNo=wrkDetl.getOrderNo();
- }
+// String[] batch1 = batch.split("绠卞彿锛�");
+// String[] batch2 = batch1[1].split("瑙勬牸锛�");
+// batch = batch2[0];
+ String orderNo = "";
+// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+ WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
+ if (Cools.isEmpty(wrkDetl)) {
+// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
+ if (Cools.isEmpty(wrkDetlLog)) {
+ return R.error("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖");
+ }
+ if (wrkDetlLog.getDeadTime().equals("宸茬‘璁�")) {
+ return R.error("褰撳墠浠诲姟宸茬‘璁わ紝璇烽噸缃紒");
+ }
+ wrkDetlLog.setSource(1);
+ wrkDetlLogService.update(wrkDetlLog,new EntityWrapper<WrkDetlLog>().eq("batch",wrkDetlLog.getBatch()).eq("wrk_no",wrkDetlLog.getWrkNo()));
+ orderNo=wrkDetlLog.getOrderNo();
+ }else {
+ if (wrkDetl.getDeadTime().equals("宸茬‘璁�")) {
+ return R.error("褰撳墠浠诲姟宸茬‘璁わ紝璇烽噸缃紒");
+ }
+ wrkDetl.setSource(1);
+ wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()).eq("wrk_no",wrkDetl.getWrkNo()));
+ orderNo=wrkDetl.getOrderNo();
+ }
// List<Order> orders = orderService.selectorderNoL(batch);
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
- if (Cools.isEmpty(orderDetl)){
- return R.error("鏈煡鍒版暟鎹�");
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
+ if (Cools.isEmpty(orderDetl)){
+ return R.error("鏈煡鍒版暟鎹�:璁㈠崟鏄庣粏涓虹┖"+orderNo);
+ }
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ return R.error("浠诲姟鏈畬鎴�");
+ }
+ if (!Cools.isEmpty(orderDetl.getSource()) && orderDetl.getSource()==1){
+ return R.error("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
+ }
+ orderDetl.setSource(1);
+ orderDetlService.updateById(orderDetl);
+ return R.ok();
+ } catch (Exception e){
+ return R.error().add(e.getMessage());
}
- if (!orderDetl.getQty$().equals("宸插畬鎴�")){
- return R.error("浠诲姟鏈畬鎴�");
- }
- orderDetl.setSource(1);
- orderDetlService.updateById(orderDetl);
- return R.ok();
}
// @RequestMapping("/truss/auth")
@@ -285,12 +318,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