From ff724aea871b8373dce71857024ca62f93bf709f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 八月 2024 14:42:52 +0800
Subject: [PATCH] 打带获取木箱类型
---
src/main/java/com/zy/asrs/entity/param/DdParam.java | 22 ++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 11 ++++++++++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 18 +++++++++++++++++-
src/main/java/com/zy/asrs/service/OpenService.java | 5 +++++
4 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e6dd534..f7d94d8 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -60,7 +60,7 @@
}
@PostMapping("/tb")
- @AppAuth(memo = "涓�妤艰创鏍�")
+ @AppAuth(memo = "涓�妤艰创鏍囪皟鐢�")
public synchronized R tb(@RequestHeader(required = false) String appkey,
@RequestBody TbParam param,
HttpServletRequest request) {
@@ -68,6 +68,15 @@
return openService.tb(param);
}
+ @PostMapping("/dd")
+ @AppAuth(memo = "涓�妤兼墦甯﹁皟鐢�")
+ public synchronized R dd(@RequestHeader(required = false) String appkey,
+ @RequestBody TbParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.dd(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/DdParam.java b/src/main/java/com/zy/asrs/entity/param/DdParam.java
new file mode 100644
index 0000000..072a023
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/DdParam.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/**
+ * @author pang.jiabao
+ * @description 鎵撳甫杩斿洖鏁版嵁
+ * @createDate 2024/8/19 11:34
+ */
+@Data
+public class DdParam {
+
+ /**
+ * 鏈ㄧ浣嶇疆
+ */
+ private String boxPos;
+
+ /**
+ * 鏈ㄧ绫诲瀷
+ */
+ private String boxType;
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 722e541..f8d26a7 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -36,6 +36,11 @@
R tb(TbParam param);
/**
+ * 涓�妤兼墦甯﹁皟鐢�
+ */
+ R dd(TbParam param);
+
+ /**
*GWMS鍒拌揪鐩爣绔欑偣璇锋眰ZWCS鎵ц鍏ュ簱
*/
String crnExecute(CrnExecuteParam 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 ac070a3..0d76faa 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1084,6 +1084,7 @@
for (Mat obj : list) {
WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(obj);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setAnfme(1.0);
// 閲嶆柊瀹氫綅鏈ㄧ浣嶇疆
@@ -1098,7 +1099,6 @@
break;
}
}
- wrkDetl.sync(obj);
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
@@ -1184,6 +1184,22 @@
}
@Override
+ public R dd(TbParam param) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
+ if (wrkDetls.isEmpty()) {
+ return R.parse("鏃犵墿鏂欐槑缁嗕俊鎭�");
+ }
+ List<DdParam> collect = wrkDetls.stream().map(wrkDetl -> {
+ DdParam ddParam = new DdParam();
+ ddParam.setBoxPos(wrkDetl.getOrigin());
+ ddParam.setBoxType(wrkDetl.getColor());
+ return ddParam;
+ }).distinct().collect(Collectors.toList());
+
+ return R.ok(collect);
+ }
+
+ @Override
@Transactional
public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
--
Gitblit v1.9.1