From 85bf46de8403f0a1e814d1133be11406285b4af2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 六月 2025 14:24:15 +0800
Subject: [PATCH] 测试,xiug bug
---
src/main/java/com/zy/asrs/controller/MobileController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8cc990a..ca18214 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.utils.Synchro;
@@ -68,6 +69,9 @@
@Resource
private StaDescService staDescService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -209,10 +213,10 @@
Synchro.Copy(orderDetl, combMat);
combMat.setMatnr(orderDetl.getMatnr());
combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
+ combMat.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty()));
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
- combMat.setEnableQty(orderDetl.getAnfme() - orderDetl.getWorkQty());
+ combMat.setEnableQty(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty()));
combMats.add(combMat);
}
combParam.setCombMats(combMats);
@@ -240,9 +244,15 @@
Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
MatParam matParam = new MatParam();
Synchro.Copy(mat, matParam);
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>().eq("order_no", nccJcQilibcBarcodeflowWms.getZkdh()).eq("matnr", mat.getMatnr()).eq("batch", nccJcQilibcBarcodeflowWms.getVbatchcode()));
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒版鍗曞彿");
+ }
+ matParam.setStandby1(orderDetlPakin.getStandby1());
matParam.setOrderNo(nccJcQilibcBarcodeflowWms.getZkdh());
matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue());
+ matParam.setWeight(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
return R.ok().add(matParam);
}
--
Gitblit v1.9.1