From 792de9fdb245b9b29ec6f2193d64886232f6d6c5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 09 一月 2025 12:17:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 ++--
src/main/java/com/zy/common/model/LocDetlDto.java | 17 ++++++++++++++++-
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 4 ++++
src/main/java/com/zy/common/web/WcsController.java | 6 +++---
4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index 01f7fe2..faa0931 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -52,6 +52,7 @@
// 鏈ㄧ涓摐绠旀暟閲�
private Double count;
+ private Double pio = 13D;
public void setAnfme(Double anfme){
this.anfme=anfme;
@@ -83,6 +84,7 @@
this.outSite = param.getDevNo();
ArrayList<LocDetl> locDetlArrayList = new ArrayList<>();
+ Double pioS = 100D;
for (com.zy.asrs.entity.LocDetl locDetlSou : locDetlList){
LocDetl locDetl = new LocDetl();
locDetl.setMatnr(param.getMatnr());
@@ -94,7 +96,9 @@
locDetl.setZpallet(locDetlSou.getZpallet());
locDetl.setWeight(locDetlSou.getWeight());
locDetl.setSpecs(locDetlSou.getSpecs());
+ locDetl.setPio(pioS);
locDetlArrayList.add(locDetl);
+ pioS--;
}
this.locDetls = locDetlArrayList;
};
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 d5e82eb..7db3935 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -172,7 +172,7 @@
}
if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
- if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
+ if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo() , paramLocDetl.getPio()));
}
}
@@ -553,7 +553,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setIoPri(dto.getLocDetlDtos().get(0).getPio()); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
diff --git a/src/main/java/com/zy/common/model/LocDetlDto.java b/src/main/java/com/zy/common/model/LocDetlDto.java
index 78a41c3..2387e39 100644
--- a/src/main/java/com/zy/common/model/LocDetlDto.java
+++ b/src/main/java/com/zy/common/model/LocDetlDto.java
@@ -13,9 +13,16 @@
private Double count;
+ private Double pio = 13D;
+
public LocDetlDto() {
}
-
+ public LocDetlDto(LocDetl locDetl, Double count ,String orderNo ,Double pio) {
+ this.locDetl = locDetl;
+ this.count = count;
+ this.orderNo = orderNo;
+ this.pio = pio;
+ }
public LocDetlDto(LocDetl locDetl, Double count ,String orderNo) {
this.locDetl = locDetl;
this.count = count;
@@ -45,4 +52,12 @@
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
+
+ public Double getPio() {
+ return pio;
+ }
+
+ public void setPio(Double pio) {
+ this.pio = pio;
+ }
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 78c3d36..1f0aaf8 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -202,15 +202,15 @@
Date now = new Date();
// 鐢熸垚鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr("111111");
+ Mat mat = matService.selectByMatnr(basDevp.getDecDesc());
if (Cools.isEmpty(mat)) {
- throw new CoolException("111111鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ throw new CoolException(basDevp.getDecDesc()+"鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setBatch(DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
// waitPakin.setWeight(basDevp.getGrossWt());
- waitPakin.setWeight(450.0);
+ waitPakin.setWeight(basDevp.getGrossWt());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(1.0); // 鏁伴噺
--
Gitblit v1.9.1