From eb894e3c1dde980cb6cbaf559782bedb801db2ca Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 25 四月 2025 10:44:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10 +++++-----
src/main/java/com/zy/asrs/controller/MobileController.java | 40 ++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/entity/param/OrderGiftParam.java | 1 +
3 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 29fb8e8..81aeabf 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -293,6 +293,46 @@
}
}
+ @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("鏈尮閰嶅埌鏄庣粏");
+ }
+ 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("/wrkDetl/search/batch/auth")
// @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
// public R wrkDetlSearchByBatch(@RequestBody String batch){
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderGiftParam.java b/src/main/java/com/zy/asrs/entity/param/OrderGiftParam.java
index 8477537..5b48f82 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderGiftParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderGiftParam.java
@@ -5,6 +5,7 @@
@Data
public class OrderGiftParam {
+ private String orderNo;
private String rollNo;
private String boxNo;
private String specs;
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 05d3757..4407e44 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -352,12 +352,12 @@
int i=0;
for (StockOutParam.LocDetl locDetl : locDetls) {
i++;
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(locDetl.getMatnr() + "鐗╂枡缂栫爜妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
+// Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(locDetl.getMatnr() + "鐗╂枡缂栫爜妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+// }
OrderDetlGift orderDetl = new OrderDetlGift();
- orderDetl.sync(mat);
+// orderDetl.sync(mat);
orderDetl.setSuppCode(String.valueOf(i)); // 琛屽彿
orderDetl.setManu(locDetl.getLocNo()); //搴撲綅鍙�
orderDetl.setBatch(locDetl.getBatch()); //鏈ㄧ缂栫爜
--
Gitblit v1.9.1