From 6c3f8b83a4d5a5c7d7044532fbb8fbf3dde6c497 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 12 一月 2026 18:20:12 +0800
Subject: [PATCH] 入库流程功能优化
---
src/main/webapp/views/orderPakin/order.html | 4 +-
src/main/webapp/static/js/orderPakout/order.js | 5 +-
src/main/webapp/views/locAroundBind/locAroundBind.html | 20 +++++----
src/main/webapp/views/mat/mat.html | 24 +++++++++---
src/main/webapp/static/js/order/order.js | 3 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 21 ++++++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 4 +-
7 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 3308d17..caa2446 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -25,6 +25,7 @@
import javax.annotation.Resource;
import java.util.*;
+
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
* Created by vincent on 2020/6/28
@@ -961,7 +962,7 @@
@Override
@Transactional
public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
- Double curOutQty, Integer ioType, Long userId, Date now) {
+ Double curOutQty, Integer ioType, Long userId, Date now) {
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locDetl.getLocNo());
// 鑾峰彇璺緞
@@ -1123,12 +1124,30 @@
// throw new CoolException("AGV浠诲姟瀹屾垚澶辫触!!");
// }
+
List<WaitPakin> waitPakins = waitPakinService
.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
throw new CoolException("鏁版嵁閿欒,缁勬嫋妗ｅ凡涓嶅瓨鍦�!!");
}
+ //淇敼鍗曟嵁鎵ц鏁伴噺
+ waitPakins.forEach(waitPakin -> {
+ OrderDetlPakin detlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
+ .eq("matnr", waitPakin.getMatnr())
+ .eq("barcode", waitPakin.getZpallet())
+ .eq("order_no", waitPakin.getOrderNo()));
+ if (Objects.isNull(detlPakin)) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ detlPakin.setWorkQty(waitPakin.getAnfme());
+
+ if (!orderDetlPakinService.updateById(detlPakin)) {
+ throw new CoolException("鍗曟嵁鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ });
+
+
generateCrnInTask(waitPakins, param.getStation(), param.getLocType1(), userId);
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6320e65..d74b5e7 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -241,8 +241,11 @@
{ type: 'numbers', title: '#' },
{ field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
{ field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200 },
+ {field: 'barcode', title: 'SN', edit: true },
{ field: 'batch', title: '鎵瑰彿', edit: true },
{ field: 'specs', title: '瑙勬牸' },
+ {field: 'brand', title: '鍝佺墝' },
+ { field: 'unit', title: '鍗曚綅' },
{ field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110 },
{ field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100 },
// {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 0e6826c..4ae3e23 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -125,11 +125,13 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
+ {field: 'brand', title: '鍝佺墝'},
+ {field: 'specs', title: '瑙勬牸'},
{field: 'standby1', title: '鏈哄彴'},
+ {field: 'unit', title: '鍗曚綅'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- // {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
// return util.toDateString(d.createTime);
@@ -137,7 +139,6 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index bbc9ad4..d0e9883 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -21,12 +21,12 @@
cols: [[
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 95}
- ,{field: 'wrkCode', align: 'center',title: '涓嬪彂宸ヤ綔鍙�',sort: true, width: 120}
+ ,{field: 'wrkCode', align: 'center',title: '涓嬪彂宸ヤ綔鍙�',sort: true, width: 120, hide: true}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 170}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width: 120}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width: 140}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�', width: 95}
- ,{field: 'taskType$', align: 'center',title: '浠诲姟绫诲瀷', width: 95}
+ // ,{field: 'taskType$', align: 'center',title: '浠诲姟绫诲瀷', width: 95}
,{field: 'barcode', align: 'center',title: '鏉＄爜', width: 120}
,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�', width: 95}
,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯', width: 95}
diff --git a/src/main/webapp/views/locAroundBind/locAroundBind.html b/src/main/webapp/views/locAroundBind/locAroundBind.html
index 1cab9bb..4fb8c38 100644
--- a/src/main/webapp/views/locAroundBind/locAroundBind.html
+++ b/src/main/webapp/views/locAroundBind/locAroundBind.html
@@ -71,12 +71,12 @@
<input class="layui-input" name="devNo" placeholder="璇疯緭鍏ユ満鍙板彿" lay-vertype="tips" lay-verify="required">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">搴撲綅ID: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="blocId" placeholder="璇疯緭鍏ュ簱浣岻D" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">搴撲綅ID: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="blocId" placeholder="璇疯緭鍏ュ簱浣岻D" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">搴撲綅鐮�: </label>
<div class="layui-input-block">
@@ -105,9 +105,11 @@
<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
<div class="layui-form layui-form-pane">
<div class="layui-form-item">
- <label class="路layui-form-label">鏈哄彴鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="devNo" autocomplete="off" class="layui-input">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈哄彴鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="devNo" autocomplete="off" class="layui-input">
+ </div>
</div>
</div>
<!-- 鎺� -->
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 61711c4..fd76498 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -228,6 +228,18 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">褰掗浂闃�鍊�</label>
+ <div class="layui-input-block">
+ <input id="safeQty" name="safeQty" placeholder="璇疯緭鍏ラ榾鍊�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">姣忓叕鏂ら暱搴�</label>
+ <div class="layui-input-block">
+ <input id="volume" name="volume" placeholder="璇疯緭鍏�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
<input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
@@ -245,12 +257,12 @@
<input name="manLength" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
- <div class="layui-input-block">
- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鍗曠浣撶Н</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<hr class="layui-bg-gray">
diff --git a/src/main/webapp/views/orderPakin/order.html b/src/main/webapp/views/orderPakin/order.html
index 5b15330..22e7828 100644
--- a/src/main/webapp/views/orderPakin/order.html
+++ b/src/main/webapp/views/orderPakin/order.html
@@ -79,8 +79,8 @@
<button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞
- </button>
+<!-- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞-->
+<!-- </button>-->
</div>
</div>
</div>
--
Gitblit v1.9.1