From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接
---
src/main/webapp/static/js/orderPakout/out.js | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index ee74a9d..70ba831 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -32,7 +32,8 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'standby1$', align: 'center',title: '鍑哄簱浠撳簱'}
+ ,{field: 'cstmrName$', align: 'center',title: '瀹㈡埛', width: 160}
+ ,{field: 'standby1$', align: 'center',title: '鍑哄簱浠撳簱', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '鎵规'}
@@ -90,9 +91,32 @@
return false;
});
+ form.on('submit(defaultOutSta)', function (data) {
+ let val = $("#defaultOutStaSelect").val();
+ $.ajax({
+ url: baseUrl + "/user/updateDefaultOutSta",
+ headers: {'token': localStorage.getItem('token')},
+ contentType: 'application/json;charset=UTF-8',
+ data: JSON.stringify({
+ defaultOutSta: val
+ }),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1})
+ $("#defaultOutSta").html(val)
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ return false;
+ });
+
/* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
table.on('toolbar(orderDetlTable)', function (obj) {
-
var checkStatus = table.checkStatus(obj.config.id).data;
if (obj.event === 'pakoutPreview') { // 娣诲姞
if (checkStatus.length === 0) {
@@ -112,8 +136,41 @@
return d.id;
});
doDelSensor({ids: ids});
+ } else if (obj.event === 'restartSync') {
+ restartSyncOrder(checkStatus.map(function (d) {
+ return d.id;
+ }))
}
});
+
+ function restartSyncOrder(ids) {
+ layer.confirm('纭畾瑕侀噸鏂板悓姝ヨ璁㈠崟鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/restartSyncOrder",
+ headers: {'token': localStorage.getItem('token')},
+ contentType: 'application/json;charset=UTF-8',
+ data: JSON.stringify(ids),
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ $(".layui-laypage-btn")[0].click();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+
+ });
+ }
/* 琛ㄦ牸2宸ュ叿鏉＄偣鍑讳簨浠� */
table.on('tool(orderDetlTable)', function (obj) {
@@ -133,7 +190,10 @@
url: baseUrl + "/out/pakout/preview/auth",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
- data: JSON.stringify(ids),
+ data: JSON.stringify({
+ ids: ids,
+ cstateid: $("#defaultCstateid").val()
+ }),
method: 'POST',
success: function (res) {
layer.close(loadIndex);
@@ -164,6 +224,8 @@
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'batch', title: '鎵规', align: 'center'},
+ {field: 'initialWeight', title: '鍘熸墭鐩樿緟鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'initialAnfme', title: '鍘熸墭鐩樻暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'anfme', title: '涓绘暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'weight', title: '杈呮暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'unit', align: 'center',title: '鍗曚綅'},
@@ -355,6 +417,21 @@
});
+$.ajax({
+ url: baseUrl + "/user/getDefaultOutSta",
+ headers: {'token': localStorage.getItem('token')},
+ contentType: 'application/json;charset=UTF-8',
+ data: {},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ $("#defaultOutSta").html(res.data)
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }
+ }
+})
+
function tableReload(child) {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
--
Gitblit v1.9.1