From 1b576a30a84b8b57f5b7d7a22424f9fc08d08516 Mon Sep 17 00:00:00 2001
From: xjj <xjj@123>
Date: 星期二, 27 二月 2024 13:03:56 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java | 3 +++
zy-asrs-wms/src/main/webapp/static/js/pakStore/pakStore.js | 4 +++-
zy-asrs-wms/src/main/webapp/views/pakStore/pakStore.html | 4 ++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 1 +
4 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java
index be5f9e0..3ba847a 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java
@@ -23,6 +23,9 @@
//搴撲綅鎼滅储鑼冨洿
private LocRangeDto locRangeDto;
+ // 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:楂樺簱浣嶏級
+ private Short locType1;
+
@Data
public static class MatCodeStore {
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 1bc63de..ee20d56 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -67,6 +67,7 @@
}
Date now = new Date();
LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1(param.getLocType1());
locTypeDto.setLocRangeDto(param.getLocRangeDto());
List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
String batch = param.getList().get(0).getBatch();
diff --git a/zy-asrs-wms/src/main/webapp/static/js/pakStore/pakStore.js b/zy-asrs-wms/src/main/webapp/static/js/pakStore/pakStore.js
index dd0f6cb..d978c91 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/pakStore/pakStore.js
@@ -84,12 +84,14 @@
layer.msg("璇烽�夋嫨鍏ュ簱绔�", {icon: 2});
return;
}
+ let locType1 = $('input[name=locType1]:checked').val();
$.ajax({
url: baseUrl+"/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
devpNo: Number(devpNo),
- list: matCodeData
+ list: matCodeData,
+ locType1: locType1
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/pakStore.html b/zy-asrs-wms/src/main/webapp/views/pakStore/pakStore.html
index 820bbee..d030c0f 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/pakStore.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/pakStore.html
@@ -102,6 +102,10 @@
<select id="putSiteSelect" lay-verify="required">
<option value="">璇烽�夋嫨绔欑偣</option>
</select>
+ <span style="margin-left: 10px;">
+ <input type="radio" name="locType1" value="1" title="浣庡簱浣�" checked />
+ <input type="radio" name="locType1" value="2" title="楂樺簱浣�" />
+ </span>
<!-- 2.鍚姩鍑哄簱 -->
<button class="layui-btn layui-btn-normal layui-btn-lg" id="btn-comb" lay-event="comb" style="">鍚姩鍏ュ簱</button>
</div>
--
Gitblit v1.9.1