From 9148737ad5137dd90a1061327aef121f8b3a66db Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 26 十月 2024 15:32:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index dc8c870..1fae66c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -58,6 +58,10 @@
private WrkDetlLogService wrkDetlLogService;
@Autowired
private RgvOneSignService rgvOneSignService;
+ @Autowired
+ private OrderGiftService orderGiftService;
+ @Autowired
+ private OrderDetlGiftService orderDetlGiftService;
// 鍟嗗搧涓婃灦
@@ -212,33 +216,28 @@
}
@RequestMapping("/wrkDetl/search/batch/auth")
- @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
- public R wrkDetlSearchByBatch(@RequestBody String batch){
- 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.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.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("鏈煡鍒版暟鎹�");
+// @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
+ public R wrkDetlSearchByBatch(@RequestBody OrderGiftParam param){
+ try{
+ List<OrderDetlGift> orderDetlGifts = orderDetlGiftService.selectList(new EntityWrapper<OrderDetlGift>()
+ .eq("matnr", param.getSpecs())
+ .eq("batch", param.getBoxNo())
+ .eq("model", param.getRollNo())
+ .eq("price", param.getLength())
+ .eq("weight", param.getNetWeight())
+ .eq("volume", param.getGrossWeight())
+ .eq("specs", param.getSplices()));
+ if (orderDetlGifts.isEmpty()){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add(JSONObject.toJSONString(param));
}
- wrkDetl = new WrkDetl();
- wrkDetl.sync(wrkDetlLog);
- wrkDetl.setBatch(wrkDetlLog.getBatch());
- wrkDetl.setBarcode(wrkDetlLog.getBarcode());
- wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
+ if (orderDetlGifts.size()>1){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屽瓨鍦ㄥ鏉℃槑缁�").add(JSONObject.toJSONString(orderDetlGifts));
+ }
+ } catch (Exception e){
+ return R.error("鏌ヨ淇℃伅寮傚父锛屾湭鍖归厤鍒版槑缁�").add(JSONObject.toJSONString(param));
}
- if (Cools.isEmpty(wrkDetl)){
- return R.error("鏈煡鍒版暟鎹�");
- }
- return R.ok().add(wrkDetl);
+
+ return R.ok();
}
@RequestMapping("/order/search/batch/auth")
--
Gitblit v1.9.1