From e589ffc0b6009b3c69bb356a9ed102773cfb8474 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 02 十一月 2024 10:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/entity/param/TagParam.java | 11 +++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 15 +++++++++++++++
src/main/webapp/static/js/order/order.js | 1 +
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 ++++++-
src/main/java/com/zy/asrs/service/OpenService.java | 2 ++
6 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index adbbe73..ab6bfab 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -82,7 +82,7 @@
// return R.ok();
// }
String sta = (String) map.get("sta"); // 鏆傚瓨浣�
- String inSta = (String) map.get("inSta"); // 鍏ュ簱绔欑偣
+ String inSta = String.valueOf(map.get("inSta")); // 鍏ュ簱绔欑偣
return mobileService.inLocCallAgv(sta, inSta);
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0fdc587..232f521 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -39,6 +39,21 @@
private WrkMastService wrkMastService;
+ @PostMapping("/tagSync/v1")
+ @AppAuth(memo = "鐗╂枡鍒嗙被鍚屾")
+ public synchronized R tagSync(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) List<TagParam> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.syncTag(param);
+ return R.ok();
+
+ }
+
+
@PostMapping("/wrkMast/finish/v1")
@AppAuth(memo = "鍥涘悜杞︿换鍔″畬鎴�")
public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/entity/param/TagParam.java b/src/main/java/com/zy/asrs/entity/param/TagParam.java
new file mode 100644
index 0000000..ab87118
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TagParam.java
@@ -0,0 +1,11 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TagParam {
+ private String parentTagName;
+ private String tagName;
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 2b59fdf..3a53ab7 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -47,4 +47,6 @@
boolean agvHaiKang(String wrkNo);
List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param);
+
+ void syncTag(List<TagParam> 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 ddf7eb9..f042c12 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -585,7 +585,7 @@
if (!Cools.isEmpty(order)) {
locDetlByTimeDTO.setDate(order.getOrderTime());
locDetlByTimeDTO.setWarehouse(order.getItemName());
- locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+ locDetlByTimeDTO.setOrderType(order.getDocType$());
}
locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
@@ -633,4 +633,9 @@
return true;
}
+ @Override
+ @Transactional
+ public void syncTag(List<TagParam> param) {
+
+ }
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 8a807c3..7b6cbb3 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -48,6 +48,7 @@
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'shipName', align: 'center',title: '鍒跺崟浜�'},
+ {field: 'itemName', align: 'center',title: '浠撳簱'},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
--
Gitblit v1.9.1