From 8d4dcb5760f6c7149039f236bf009a5e1ce18505 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 24 十二月 2024 16:25:31 +0800
Subject: [PATCH] # 小车任务档code转为matnr
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index aa336ff..10eec9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -96,6 +96,8 @@
private MatnrCodeService matnrCodeService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private MatService matService;
@Value("${wms.url}")
private String wmsUrl;
@@ -2775,8 +2777,8 @@
short sta1 = 0;
short souSta2 = 0;
short sta2 = 0;
- Integer matnr = 0;
- Integer matnr2 = 0;
+ String matnr = "0";
+ String matnr2 = "0";
String batch = "";
String batch2 = "";
short type = 0;
@@ -3612,7 +3614,7 @@
WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
if (Cools.isEmpty(waitPakin)) {
try {
- CreateComb(barcode, staProtocol.getMatnr(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch(),inSta);
+ CreateComb(barcode, staProtocol.getMatnr().toString(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch(),inSta);
}catch (IOException e) {
throw new CoolException(e);
}
@@ -3683,7 +3685,7 @@
}
- public void CreateComb(String barcode,Integer code,Integer wrkNo,String batch,DevpSlave.Sta inSta) throws IOException {
+ public void CreateComb(String barcode,String code,Integer wrkNo,String batch,DevpSlave.Sta inSta) throws IOException {
Double anfme = 0d;
Double weight = 0d;
String memo = "";
@@ -3692,7 +3694,7 @@
if (Cools.isEmpty(wrkMastSta)){
wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no2", wrkNo));
if (Cools.isEmpty(wrkMastSta)){
- if (code >0 && !Cools.isEmpty(batch)){
+ if (!Cools.isEmpty(batch)){
anfme = 1d;
}else {
throw new CoolException("鏈壘鍒板搴旂殑浠诲姟淇℃伅");
@@ -3711,15 +3713,17 @@
weight = wrkMastSta.getWeight();
memo = wrkMastSta.getMemo();
}
- MatnrCode matnrCode = matnrCodeService.selectByCode(code);
- if (Cools.isEmpty(matnrCode)){
+ ////
+// MatnrCode matnrCode = matnrCodeService.selectByCode(code);
+ Mat mat = matService.selectByCode(code);
+ if (Cools.isEmpty(mat)){
throw new CoolException("鏈壘鍒板搴旂殑鐗╂枡淇℃伅");
}
CombParam combParam = new CombParam();
ArrayList<CombParam.CombMat> combMats = new ArrayList<>();
CombParam.CombMat combMat = new CombParam.CombMat();
combParam.setBarcode(barcode);
- combMat.setMatnr(matnrCode.getMatnr());
+ combMat.setMatnr(mat.getMatnr());
combMat.setBatch(batch);
combMat.setAnfme(anfme);
combMat.setWeight(weight);
--
Gitblit v1.9.1