From 728e14723ba5a26f95cf099cac3a0d1853aea34b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 11 六月 2025 10:46:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 6df629b..81aeabf 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -169,7 +169,7 @@
if (Cools.isEmpty(orderNo)){
orderNo=null;
}
- List<Order> orders = orderService.selectorderNoL(orderNo);
+ List<Order> orders = orderService.selectorderNoLT(orderNo);
if (Cools.isEmpty(orders)){
return R.ok();
}
@@ -245,9 +245,9 @@
return R.error("鏌ヨ淇℃伅寮傚父锛屽瓨鍦ㄥ鏉℃槑缁�").add("瀛樺湪澶氭潯鏄庣粏");
}
OrderDetlGift orderDetlGift = orderDetlGifts.get(0);
- orderDetlGift.setSource(1);
- orderDetlGift.setDeadTime(orderDetlGift.getSource$());
- orderDetlGiftService.updateById(orderDetlGift);
+// orderDetlGift.setSource(1);
+// orderDetlGift.setDeadTime(orderDetlGift.getSource$());
+// orderDetlGiftService.updateById(orderDetlGift);
return R.ok("纭鎴愬姛").add(orderDetlGift);
} catch (Exception e){
return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add("鏈尮閰嶅埌鏄庣粏");
@@ -277,6 +277,46 @@
.eq("weight", weight)
.eq("volume", volume)
.eq("specs", splicesS));
+ if (orderDetlGifts.isEmpty()){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add("鏈尮閰嶅埌鏄庣粏");
+ }
+ if (orderDetlGifts.size()>1){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屽瓨鍦ㄥ鏉℃槑缁�").add("瀛樺湪澶氭潯鏄庣粏");
+ }
+ OrderDetlGift orderDetlGift = orderDetlGifts.get(0);
+ orderDetlGift.setSource(1);
+ orderDetlGiftService.updateById(orderDetlGift);
+ orderDetlGift.setDeadTime(orderDetlGift.getSource$());
+ return R.ok("纭鎴愬姛").add(orderDetlGift);
+ } catch (Exception e){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add("鏈尮閰嶅埌鏄庣粏");
+ }
+ }
+
+ @RequestMapping("/order/search/batch/new/auth")
+ @ManagerAuth(memo = "鍑哄簱纭")
+ public R orderSearchByBatchNew(@RequestBody OrderGiftParam param){
+ try{
+// String length = param.getLength();
+// String lengthS = length.split(" ")[0];
+// Double price = Double.valueOf(lengthS);
+// String grossWeight = param.getGrossWeight();
+// String grossWeightS = grossWeight.split(" ")[0];
+// Double volume = Double.valueOf(grossWeightS);
+ String netWeight = param.getNetWeight();
+ String netWeightS = netWeight.split(" ")[0];
+ Double weight = Double.valueOf(netWeightS);
+// String splices = param.getSplices();
+// String splicesS = splices.split(" ")[0];
+ List<OrderDetlGift> orderDetlGifts = orderDetlGiftService.selectList(new EntityWrapper<OrderDetlGift>()
+ .eq("order_no", param.getOrderNo())
+// .eq("matnr", param.getSpecs())
+ .eq("batch", param.getBoxNo())
+// .eq("model", param.getRollNo())
+// .eq("price", price)
+ .eq("weight", weight));
+// .eq("volume", volume)
+// .eq("specs", splicesS));
if (orderDetlGifts.isEmpty()){
return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add("鏈尮閰嶅埌鏄庣粏");
}
@@ -403,8 +443,8 @@
@PostMapping("/balcony/complete/car/auth/v1")
// @AppAuth(memo = "涓帶锛�2妤�212鍙墭鐩�")
public synchronized R balconyCompleteCar() {
- mobileService.trussComb2Car(212);
- return R.ok();
+// mobileService.trussComb2Car(212);
+ return R.error("宸茬鐢�").add("宸茬鐢�");
}
/**
--
Gitblit v1.9.1