From 88430dbe00e46a856b918cef9372a3132aac5712 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 27 十一月 2025 15:16:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
HTML/views/HouseWithinSetting/LogWorkShop.html | 98 +++++++++++++------------------------------------
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 8 ++--
2 files changed, 30 insertions(+), 76 deletions(-)
diff --git a/HTML/views/HouseWithinSetting/LogWorkShop.html b/HTML/views/HouseWithinSetting/LogWorkShop.html
index 1f5abd7..83c7b3c 100644
--- a/HTML/views/HouseWithinSetting/LogWorkShop.html
+++ b/HTML/views/HouseWithinSetting/LogWorkShop.html
@@ -120,9 +120,9 @@
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/public.js"></script>
+ <script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/public.js"></script>
<script src="../../js/jquery.cookie.js"></script>
<script>
var uid = $.cookie('userId');
@@ -141,6 +141,7 @@
var h1 = GetTableHeight();
// var h1 = GetTkableTopHeight();
// console.log(h1)
+ var tableIns;
laydate.render({
elem: '#StartTime',
@@ -150,31 +151,6 @@
elem: '#EndTime',
format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
});
- //鑾峰彇褰撳墠鏃堕棿
- function getNowTime() {
- var date = new Date();
- //骞� getFullYear()锛氬洓浣嶆暟瀛楄繑鍥炲勾浠�
- var year = date.getFullYear(); //getFullYear()浠ｆ浛getYear()
- //鏈� getMonth()锛�0 ~ 11
- var month = date.getMonth() + 1;
- //鏃� getDate()锛�(1 ~ 31)
- var day = date.getDate();
- //鏃� getHours()锛�(0 ~ 23)
- var hour = date.getHours();
- //鍒� getMinutes()锛� (0 ~ 59)
- var minute = date.getMinutes();
- //绉� getSeconds()锛�(0 ~ 59)
- var second = date.getSeconds();
-
- var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
- return time;
-
- //灏忎簬10鐨勬嫾鎺ヤ笂0瀛楃涓�
-
- };
- function addZero(s) {
- return s < 10 ? ('0' + s) : s;
- };
var $ = layui.$;
refreshTable("", "", "", "", "", "");
@@ -213,22 +189,6 @@
} else {
colsJson = TotalColsArr
}
- infoOptions = {
- elem: '#LAY-app-content-list',
- height: h1,
- id: 'LAY-app-content-list',
- page: true,
- limit: pageCnt,
- limits: pageLimits,
- even: true,
- cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function () {
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list', 'BllCheck/GetLogWorkShopList', TotalColsSysArr);
- },
- cols: colsJson
- };
-
var param = {
SkuNo: SkuNo, //鐗╂枡鍙�
SkuName: SkuName, //鐗╂枡鍚嶇О
@@ -237,25 +197,29 @@
BoxNo:BoxNo,//绠辩爜
Type: Type, //绫诲瀷
};
- sendData(IP + "/BllCheck/GetLogWorkShopList", param, 'post', function (res) {
- console.log(res)
- if (res.code == 0) { //鎴愬姛
- var list = res.data;
- $.extend(infoOptions, {
- data: list
- });
- infoOptions.page = {
- curr: 1
- }
- tableIns = table.render(infoOptions);
- }
- else { //涓嶆垚鍔�
- layer.msg('鑾峰彇杞﹂棿鍑哄叆搴撴棩蹇楀垪琛ㄤ俊鎭け璐ワ紒', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
+ table.render({
+ elem: '#LAY-app-content-list',
+ url: IP + "/BllCheck/GetLogWorkShopList",
+ method: 'post',
+ height: h1,//'full-'+hei1
+ id: 'LAY-app-content-list',
+ where: param,
+ contentType: 'application/json',
+ // toolbar: '#toolbarDemo',
+ defaultToolbar: [], //'filter','print', 'exports'
+ headers: { ToKen: $.cookie('token') },
+ page: true,
+ even: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ done: function (res) {
+ //鑷畾涔夊垪瀹�
+ SetTableColW('LAY-app-content-list', 'BllCheck/GetLogWorkShopList', TotalColsSysArr);
+ },
+ cols: colsJson
});
+
});
//#endregion
}
@@ -282,17 +246,7 @@
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBindList&ColsSysArr=' + TotalColsSysArr,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
- });
- },
- customCols2: function () {
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr=' + DetailColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=BllCheck/GetLogWorkShopList&ColsSysArr=' + TotalColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 80533df..1bb1eb6 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1653,10 +1653,10 @@
boxNo, "鍑哄簱", $"鍦≒DA涓婂绠卞彿涓猴細{boxNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
}
- catch (AppFriendlyException e)
- {
- Db.RollbackTran();
- }
+ //catch (AppFriendlyException e)
+ //{
+ // Db.RollbackTran();
+ //}
catch (Exception e)
{
Db.RollbackTran();
--
Gitblit v1.8.0