From 83425ecab7ea13a6f5cbe877b1313f3e7a42b8b1 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 15 八月 2024 14:13:18 +0800
Subject: [PATCH] 成品入库修改
---
src/main/java/com/zy/asrs/entity/param/FxprkParam.java | 27 +++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 9 +++
src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 74 ++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 15 +++-
5 files changed, 121 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ce79924..3d4d741 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -41,6 +41,15 @@
return R.ok(openService.gwmsGenerateInventory(param));
}
+ @PostMapping("/fxprk")
+ @AppAuth(memo = "鍙嶄慨鍝佸叆搴�")
+ public synchronized R fxprk(@RequestHeader(required = false) String appkey,
+ @RequestBody List<FxprkParam> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.fxprk(param));
+ }
+
@PostMapping("/zxrk")
@AppAuth(memo = "GWCS鍒拌揪鍫嗗灈鏈哄叆搴撶珯鐐硅姹俍WCS鎵ц")
public synchronized R crnExecute(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/entity/param/FxprkParam.java b/src/main/java/com/zy/asrs/entity/param/FxprkParam.java
new file mode 100644
index 0000000..8ac1b22
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/FxprkParam.java
@@ -0,0 +1,27 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/**
+ * @author pang.jiabao
+ * @description 鍙嶄慨鍝佸叆搴�
+ * @createDate 2024/8/15 13:29
+ */
+@Data
+public class FxprkParam {
+
+ /**
+ * 鍖呰缁勫彿
+ */
+ private String packageGroupNo;
+
+ /**
+ * 鏈ㄧ浣嶇疆
+ */
+ private String boxPos;
+
+ /**
+ * 绔欑偣
+ */
+ private Integer palletizingNo;
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java b/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
index 2997e54..e44f050 100644
--- a/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
+++ b/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
@@ -21,7 +21,6 @@
private String rollType; // 绠¤姱绫诲瀷
private String wideInWidth; // 瀹炴祴瀹藉箙锛堝垎鍒囨垚鍝佷笅鏂欙級
private String thickness; // 鐢熺當鍘氬害锛堝垎鍒囨垚鍝佷笅鏂欙級
- private String fqTime; // 鍒嗗垏涓嬫枡鏃堕棿
private List<Rolls> rolls; // 鍗烽泦鍚�
}
@Data
@@ -33,5 +32,6 @@
private Integer splices; //鎺ュご 涓�
private Double netWeight; // 鍑�閲�
private Double grossWeight; // 姣涢噸
+ private String fqTime; // 鍒嗗垏涓嬫枡鏃堕棿
}
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 416c52b..36abae7 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -16,6 +16,16 @@
R gwmsGenerateInventory(GwmsGenerateInventoryDto param);
/**
+ * 浜у搧鍚堟牸鏍￠獙
+ */
+ void prodCheck(List<ProdCheckParam> param);
+
+ /**
+ * 鍙嶄慨鍝佸叆搴�
+ */
+ String fxprk(List<FxprkParam> param);
+
+ /**
*GWMS鍒拌揪鐩爣绔欑偣璇锋眰ZWCS鎵ц鍏ュ簱
*/
String crnExecute(CrnExecuteParam param);
@@ -99,8 +109,5 @@
void updateBarcode();
- /**
- * 浜у搧鍚堟牸鏍￠獙
- */
- void prodCheck(List<ProdCheckParam> param);
+
}
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 e8c0951..813209f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1025,6 +1025,78 @@
@Override
@Transactional
+ public String fxprk(List<FxprkParam> param) {
+//
+// // 鏍规嵁鍖呰缁勫彿鑾峰彇鍒版湪绠卞嵎淇℃伅
+// List<Mat> list = matService.selectList(new EntityWrapper<Mat>().eq("brand", param.getPackageGroupNo()));
+// if (list.isEmpty()) {
+// throw new CoolException("娌℃湁鏌ヨ鍒拌鍖呰缁勫彿淇℃伅锛�" + param.getPackageGroupNo());
+// }
+//
+// LocTypeDto locTypeDto = new LocTypeDto();
+// locTypeDto.setLocType1((short) 1);
+// StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto, 0);
+//
+// // 杩斿洖GWCS鐩爣淇℃伅
+// pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo());
+//
+// int workNo = dto.getWorkNo();
+// Date now = new Date();
+// // 鐢熸垚宸ヤ綔妗�
+// WrkMast wrkMast = new WrkMast();
+// wrkMast.setWrkNo(workNo);
+// wrkMast.setIoTime(new Date());
+// wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
+// wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+// wrkMast.setIoPri(13D); // 浼樺厛绾�
+// wrkMast.setCrnNo(dto.getCrnNo());
+// wrkMast.setSourceStaNo(param.getPalletizingNo());
+// wrkMast.setStaNo(dto.getStaNo());
+// wrkMast.setLocNo(dto.getLocNo());
+// wrkMast.setBarcode(list.get(0).getBarcode()); // 鎵樼洏鐮�
+// wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+// wrkMast.setPicking("N"); // 鎷ｆ枡
+// wrkMast.setExitMk("N"); // 閫�鍑�
+// wrkMast.setEmptyMk("N"); // 绌烘澘
+// wrkMast.setLinkMis("Y");
+// wrkMast.setCtnType(1); // 瀹瑰櫒绫诲瀷
+// // 鎿嶄綔浜哄憳鏁版嵁
+// wrkMast.setAppeTime(now);
+// wrkMast.setModiTime(now);
+// boolean res = wrkMastService.insert(wrkMast);
+// if (!res) {
+// throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+// }
+//
+// for (Mat obj : list) {
+// WrkDetl wrkDetl = new WrkDetl();
+// wrkDetl.setWrkNo(wrkMast.getWrkNo());
+// wrkDetl.setAnfme(1.0);
+// wrkDetl.sync(obj);
+// wrkDetl.setIoTime(now);
+// wrkDetl.setAppeTime(now);
+// wrkDetl.setModiTime(now);
+// if (!wrkDetlService.insert(wrkDetl)) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+// }
+// }
+//
+// // 鏇存柊鐩爣搴撲綅鐘舵��
+// LocMast locMast = locMastService.selectById(dto.getLocNo());
+// if (locMast.getLocSts().equals("O")) {
+// locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+// locMast.setModiTime(now);
+// if (!locMastService.updateById(locMast)) {
+// throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+// }
+// } else {
+// throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+// }
+ return "鍏ュ簱鎴愬姛";
+ }
+
+ @Override
+ @Transactional
public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
if (Cools.isEmpty(param)) {
@@ -1102,7 +1174,7 @@
wrkDetl.setManu(obj.getRollType()); // 绠¤姱绫诲瀷
wrkDetl.setSku(obj.getWideInWidth()); // 瀹炴祴瀹藉箙
wrkDetl.setItemNum(obj.getThickness()); // 鐢熺當鍘氬害
- wrkDetl.setManuDate(obj.getFqTime()); // 鍒嗗垏涓嬫枡鏃堕棿
+ wrkDetl.setManuDate(roll.getFqTime()); // 鍒嗗垏涓嬫枡鏃堕棿
wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲�
wrkDetl.setVolume(roll.getGrossWeight()); // 姣涢噸
wrkDetl.setLength(roll.getLength()); // 闀垮害
--
Gitblit v1.9.1