From 0dba85880e21d1a42fd2667590b5168c54bdc7e9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 14 八月 2024 10:40:46 +0800
Subject: [PATCH] 成品入库和界面显示
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d46803f..f931c8d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -986,6 +986,17 @@
}
@Override
+ public void updateBarcode() {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
+ for (int i = 0; i < locMasts.size(); i ++) {
+ LocMast locMast = locMasts.get(i);
+ locMast.setBarcode("a"+i);
+ locMastService.updateById(locMast);
+ }
+ System.out.println("鏇存柊瀹屼簡" + locMasts.size());
+ }
+
+ @Override
@Transactional
public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
@@ -1051,39 +1062,43 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(wrkMast.getWrkNo());
obj.getRolls().forEach(roll -> {
-// Mat mat = matService.selectByMatnr(roll.getSpecs());
-// if (mat == null) {
-// mat = new Mat();
-// mat.setTagId(6L);
-// mat.setMatnr(roll.getSpecs());
-// mat.setMaktx(roll.getSpecs());
-// mat.setSpecs(roll.getSpecs());
-// mat.setStatus(1);
-// mat.setCreateTime(now);
-// mat.setUpdateTime(now);
-// if (!matService.insert(mat)) {
-// throw new CoolException("鐗╂枡瀵煎叆澶辫触锛�");
-// }
-// }
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸
wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸
- wrkDetl.setBatch(roll.getBoxNo()); // 绠卞彿
+ wrkDetl.setUnit(roll.getBoxNo()); // 绠卞彿
wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿
wrkDetl.setBrand(obj.getPackageGroupNo()); // 鍖呰缁勫彿
- wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鍚�
+ wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ wrkDetl.setBarcode(param.getBarcode());
wrkDetl.setOrigin(obj.getBoxPos()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
+ wrkDetl.setColor(obj.getBoxType()); // 鏈ㄧ绫诲瀷
+ wrkDetl.setManu(obj.getRollType()); // 绠¤姱绫诲瀷
+ wrkDetl.setSku(obj.getWideInWidth()); // 瀹炴祴瀹藉箙
+ wrkDetl.setItemNum(obj.getThickness()); // 鐢熺當鍘氬害
+ wrkDetl.setManuDate(obj.getFqTime()); // 鍒嗗垏涓嬫枡鏃堕棿
wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲�
wrkDetl.setVolume(roll.getGrossWeight()); // 姣涢噸
- wrkDetl.setPrice(roll.getLength());
- wrkDetl.setSpecs(String.valueOf(roll.getSplices()));
+ wrkDetl.setLength(roll.getLength()); // 闀垮害
+ wrkDetl.setSpecs(String.valueOf(roll.getSplices())); // 鎺ュご
wrkDetl.setAnfme(1.0);
+// wrkDetl.setThreeCode(null); // 閫氳繃mes鎴杄xcel瀵煎叆妫�娴嬫槸鍚﹀悎鏍� 0涓嶅悎鏍硷紝1 鍚堟牸
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
+
+ // 鐗╂枡琛ㄥ浠戒竴浠�
+ Mat mat = new Mat();
+ mat.sync(wrkDetl);
+ mat.setTagId(6L);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ if (!matService.insert(mat)) {
+ throw new CoolException("澶囦唤鐗╂枡琛ㄥけ璐�");
+ }
+
});
}
}
@@ -1116,6 +1131,9 @@
}
wrkMast.setWrkSts(2L);
+ if(wrkMast.getIoType() == 10){
+ wrkMast.setBarcode(param.getBarcode());
+ }
wrkMastService.updateById(wrkMast);
return "璇锋眰鎴愬姛";
@@ -1300,6 +1318,7 @@
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setFullPlt("N"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
--
Gitblit v1.9.1