From f08dd93e49e8461f362c8f45f17fe10e0fbdebec Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 12 一月 2026 18:54:58 +0800
Subject: [PATCH] #新增和得码入库流程，渝程进仓后续下发货主转换
---
src/main/webapp/static/js/orderPakin/order.js | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index fd49699..8109431 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -43,7 +43,9 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'itemName', align: 'center', title: 'ERPID', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
@@ -94,6 +96,8 @@
showWrkTrace(data.id);
} else if (layEvent === 'del') {
doDel(data.id);
+ }else if(layEvent === 'transfer'){
+ doModifyTransfer(data.id, data.orderNo, 66);
} else if (layEvent === 'complete') {
doModify(data.id, data.orderNo, 4);
} else if (layEvent === 'look') {
@@ -122,11 +126,14 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: 'sku', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 160},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富'},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿'},
// {field: 'batch', title: '鎵瑰彿'}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false},
+ {field: 'standby1', align: 'center',title: '瀹㈡埛PO', hide: false},
+ {field: 'standby2', align: 'center',title: 'UPC', hide: false},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -236,10 +243,10 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: 'sku', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 200}
- ,{field: 'supp', align: 'center',title: 'po', hide: false}
- ,{field: 'sku', align: 'center',title: 'upc', hide: false},
+ ,{field: 'standby1', align: 'center',title: 'po', hide: false}
+ ,{field: 'standby2', align: 'center',title: 'upc', hide: false},
// {field: 'batch', title: '鎵瑰彿', edit: true},
// {field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
@@ -479,6 +486,44 @@
});
}
+ // 淇敼璁㈠崟鐘舵��
+ function doModifyTransfer(orderId, orderNo, settle) {
+ layer.confirm('纭畾瑕佽揣涓昏浆鎹㈠悧锛�', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ layer.load(2);
+ console.log(orderId);
+ console.log(settle);
+ $.ajax({
+ url: baseUrl+"/order/pakin/order/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ id: orderId,
+ orderNo: orderNo,
+ settle: settle
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
// 浠诲姟杩芥函
function showWrkTrace(orderId) {
let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
--
Gitblit v1.9.1