From db1b6e4059213c4aeb8927415d1c74d2505ade4f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 08 六月 2023 07:25:25 +0800
Subject: [PATCH] 1
---
WebTM/views/home/console.html | 10 ++++++++--
WebTM/views/仓存管理/条码出入库记录表/Kf_ICStockBillSubList.html | 22 ++++++++++++++++++++--
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2 +-
WebTM/views/车间管理/工序流转卡/Gy_ProcessBatchReport.html | 2 +-
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 12 ++++++------
WebTM/WebTM.csproj | 1 -
6 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e876cd1..87a93e7 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1257,7 +1257,6 @@
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_Check_New.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_StockOutRequestBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_StockOutRequestBillList.html" />
- <Content Include="views\楠屾敹鍏ュ簱\Kf_OtherInBill_Fast.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ICStockBillSub_WMS_List.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index dccecd8..d9b4d36 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -35,7 +35,7 @@
<i class="layui-icon layui-icon-mike"></i>
<cite>娲惧伐鍗曞垪琛�</cite>
</a>
- </li>
+ </li>
<li class="layui-col-xs3">
<a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
<i class="layui-icon layui-icon-theme"></i>
@@ -59,7 +59,13 @@
<i class="layui-icon layui-icon-addition"></i>
<cite>鏉＄爜鍒楄〃</cite>
</a>
- </li>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_SplitBarCode.html">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>鏉＄爜鎷嗙爜</cite>
+ </a>
+ </li>
</ul>
<ul class="layui-row layui-col-space10">
<li class="layui-col-xs3">
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225\350\241\250/Kf_ICStockBillSubList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225\350\241\250/Kf_ICStockBillSubList.html"
index b0f48bf..14ff1ed 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225\350\241\250/Kf_ICStockBillSubList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225\350\241\250/Kf_ICStockBillSubList.html"
@@ -206,14 +206,32 @@
switch (data[i].name) {
//int
case '鏁伴噺':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width:90 };
+ break;
+ case '鏉＄爜':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 210 };
+ break;
+ case '鏃ユ湡':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 160 };
+ break;
+ case '鍗曟嵁鍙�':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 135 };
+ break;
+ case '鐗╂枡浠ｇ爜':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 180 };
+ break;
+ case '鐗╂枡鍚嶇О':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 150 };
+ break;
+ case '瑙勬牸鍨嬪彿':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 180 };
break;
//Decimal
//case 'Decimal':
// cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
// break;
default:
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true,width:120 };
}
}
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 4cec55b..17c3c10 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1900,7 +1900,7 @@
, "渚涘簲鍟嗕唬鐮�": d.data[i].渚涘簲鍟嗕唬鐮�, "渚涘簲鍟�": d.data[i].渚涘簲鍟�, "HSupFlag": d.data[i].濮斿鏍囪 == 0 ? false : true, "HTimeUnit": d.data[i].鏃堕棿鍗曚綅, "HUnitTime": d.data[i].杩愯鏃堕棿
, "HWorkQty": d.data[i].鍔犲伐鏁伴噺, "HPassRate": d.data[i].鑹巼, "HOverRate": d.data[i].瓒呴姣斾緥, "HReadyTime": d.data[i].鍑嗗鏃堕棿, "HQueueTime": d.data[i].鎺掗槦鏃堕棿
, "HMoveTime": d.data[i].杞Щ鏃堕棿, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].娴佽浆宸ュ簭 == 0 ? false : true, "HSubStdEmpQty": d.data[i].鏍囧噯浜烘暟, "HSubCanUseSourceQty": d.data[i].鍙搷浣滆澶囨暟
- , "HFixPrice": d.data[i].鐝骇瀹氶, "HProcPrice": d.data[i].鍔犲伐鍗曚环, "HBadPrice": d.data[i].涓嶅悎鏍煎崟浠�, "HWasterPrice": d.data[i].鎶ュ簾鍗曚环, "HStdFlag": d.data[i].鏍囧噯瀹氶
+ , "HFixPrice": d.data[i].鐝骇瀹氶, "HProcPrice": d.data[i].鍔犲伐鍗曚环 == null ? 0 : d.data[i].鍔犲伐鍗曚环, "HBadPrice": d.data[i].涓嶅悎鏍煎崟浠�, "HWasterPrice": d.data[i].鎶ュ簾鍗曚环, "HStdFlag": d.data[i].鏍囧噯瀹氶
, "HBeginDayQty": d.data[i].寮�宸ヤ綑閲忓ぉ鏁�, "HBeginFixQty": d.data[i].寮�宸ヤ綑閲忓浐鏁�, "HFixWorkDays": d.data[i].涓婇亾鍥哄畾澶╂暟, "HTrunWorkDays": d.data[i].涓婇亾寰幆鍛ㄦ湡, "HReadyTimes": d.data[i].鏈亾鍑嗗鏃堕棿
, "HICMOReadyTimes": d.data[i].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[i].鑷姩绉昏浆, "HTechnologyParameter": d.data[i].宸ヨ壓鍙傛暟, "HPicNum": d.data[i].鍥剧焊缂栧彿, "HProcCheckNote": d.data[i].鏈伐搴忕‘璁よ褰�
, "HProcWorkNum": d.data[i].绋嬪簭鍙�, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 92e45f7..75e968c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -718,12 +718,12 @@
sWhere += " and " + ColName+ " "+ com;
}
- //if (HBeginDate) {
- // sWhere += " and CONVERT(varchar(100),姹囨姤鏃ユ湡, 23) >= '" + HBeginDate + "'";
- //}
- //if (HEndDate) {
- // sWhere += " and CONVERT(varchar(100),姹囨姤鏃ユ湡, 23) <= '" + HEndDate + "'";
- //}
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),姹囨姤鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),姹囨姤鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
if (HWorkBillNo) {
sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Gy_ProcessBatchReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Gy_ProcessBatchReport.html"
index 56b2dfc..3064d4c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Gy_ProcessBatchReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Gy_ProcessBatchReport.html"
@@ -482,7 +482,6 @@
, { field: 'lngBillSubKey', title: '娴佽浆鍗″瓙ID', hide: true }
, { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
, { field: 'HWorkCenterName', title: '宸ヤ綔涓績鍚嶇О' }
- , { field: 'HProcExchBillNo', title: '娲惧伐鍗曞彿', width: 150 }
, { field: 'HSourceBillType', title: '鍗曟嵁绫诲瀷', hide: true }
, { field: 'HProcNo', title: '娴佹按鍙�', width: 80 }
, { field: 'HICMOQty', title: '浠诲姟鍗曟暟閲�', hide: true }
@@ -498,6 +497,7 @@
, { field: 'HEmpID', title: '鎿嶄綔鍛業D', hide: true }
, { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', event: "HEmpNumber" }
, { field: 'HEmpName', title: '鎿嶄綔鍛樺悕绉�' }
+ , { field: 'HProcExchBillNo', title: '娲惧伐鍗曞彿', width: 150 }
, { field: 'HPlanQty', title: '娴佽浆鍗℃暟閲�', width: 100 }
, { field: 'HInterID', title: '宸ュ簭姹囨姤ID', hide: true }
, { field: 'HBillNo', title: '宸ュ簭姹囨姤鍗曞彿', width: 195 }
--
Gitblit v1.9.1