From a05d359214bafb59005aecef2b7ab39e3951a8d1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 08 十二月 2025 10:26:29 +0800
Subject: [PATCH] 添康添加职员标签，上架单优化
---
WebTM/WebTM.csproj.user | 4
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 48 +++++++++
WebTM/views/WMS扫码模块/找货上架单/Kf_MaterialUpperBill_PDA.html | 10 +
WebTM/Vlog/webapi20251204.txt | 35 +++++++
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/grf/职员标签.grf | 151 ++++++++++++++++++++++++++++++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement.html | 2
8 files changed, 246 insertions(+), 8 deletions(-)
diff --git a/WebTM/Vlog/webapi20251204.txt b/WebTM/Vlog/webapi20251204.txt
new file mode 100644
index 0000000..deb8090
--- /dev/null
+++ b/WebTM/Vlog/webapi20251204.txt
@@ -0,0 +1,35 @@
+2025/12/4 9:49:39 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222439)
+
+2025/12/4 9:49:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 9:49:42 ReportDataSet:1
+
+2025/12/4 11:01:51 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 11:01:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:01:51 ReportDataSet:1
+
+2025/12/4 11:30:23 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 11:30:23 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:30:23 ReportDataSet:1
+
+2025/12/4 11:30:34 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(102119)
+
+2025/12/4 11:30:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:30:34 ReportDataSet:1
+
+2025/12/4 14:59:33 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 14:59:33 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 14:59:33 ReportDataSet:1
+
+2025/12/4 15:00:26 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 15:00:26 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 15:00:26 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 89909e4..59d7e88 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,8 +2,8 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ProjectFiles</ProjectView>
+ <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 490664f..7483605 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
index af29893..ad57105 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
@@ -103,7 +103,7 @@
</div>
<div class="layui-col-xs9">
<div class="layui-col-xs10">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();" readonly>
</div>
<!--<div class="layui-col-xs2" style="float: right;">
<button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
@@ -342,7 +342,7 @@
table.render(LowerListOption);
//鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
- var pFocus = $("#HSourceBillNo");
+ var pFocus = $("#HBarCode");
pFocus.select();
pFocus.focus(); //鑾峰彇鍏夋爣
}
@@ -929,7 +929,11 @@
success: function (result) {
if (result.count == 1) {
playSound_OK();
-
+ if (sBarCode.startsWith("GXLX")) {
+ $("#HMainSourceBillNo").val(sBarCode);
+ $("#HSourceBillNo").val(sBarCode);
+ }
+
if (HSourceFlag != true) {
HSourceFlag = true;
}
diff --git "a/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf" "b/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..df40817
--- /dev/null
+++ "b/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf"
@@ -0,0 +1,151 @@
+锘縊bject Report
+ Version='6.8.2.2'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9.7
+ Height=6
+ LeftMargin=0.1
+ TopMargin=0
+ RightMargin=0.1
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鑱屽憳鍚嶇О'
+ End
+ Item
+ Name='鑱屽憳浠ｇ爜'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='鏍囩瀹藉害'
+ Width=9.7
+ FixedWidth=T
+ End
+ End
+Object ColumnContent
+ Height=5.3975
+ Items ColumnContentCell
+ Item
+ Column='鏍囩瀹藉害'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.396875
+ Top=0.211667
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=2
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=3.99521
+ FixedWidth=T
+ End
+ Item[2]
+ Width=4.6
+ FixedWidth=T
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=2.5
+ End
+ Item[2]
+ Height=2.5
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='[#鑱屽憳浠ｇ爜#]'
+ End
+ Item[1,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=0.211667
+ Top=0.211667
+ Width=4.18042
+ Height=4.78896
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鏉＄爜缂栧彿#]'
+ End
+ End
+ RowSpan=2
+ End
+ Item[2,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='[#鑱屽憳鍚嶇О#]'
+ End
+ End
+End
+End
+End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='鏍囩瀹藉害'
+ TextAlign=MiddleCenter
+ PaddingLeft=0
+ PaddingRight=0
+ PaddingTop=0
+ PaddingBottom=0
+ End
+ End
+End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0.211667
+ RepeatOnPage=T
+ End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+End
+End
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 ebbbdd1..ad4dfe7 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"
@@ -2764,8 +2764,56 @@
//setTableByHMater(obj, data);
}
})
+ //宸ヤ綔涓績涓嬫媺鎼滅储妗�
+ tableSelect.render({
+ elem: 'td[data-field="宸ヤ綔涓績浠ｇ爜"] .layui-table-edit',
+ searchKey: '宸ヤ綔涓績浠ｇ爜,宸ヤ綔涓績鍚嶇О',
+ sWhere: " ",//table鎼滅储sWhere鏉′欢
+ ajaxSelect: function (sWhere) {
+ var data = '';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_WorkCenter/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+ }
+ });
+ return data;
+ },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+ table: {
+ cols: [[
+ { type: 'radio', fixed: 'left' },
+ { field: 'HItemID', title: 'HItemID', hide: true },
+ { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' },
+ { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' },
+ ]],
+ page: true,
+ limit: 5,
+ //limits: [5]
+ },
+ done: function (elem, data) {
+ $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+ obj.update({
+ "宸ヤ綔涓績": data.data[0]["宸ヤ綔涓績鍚嶇О"]
+ , "HCenterID": data.data[0]["HItemID"]
+ , "宸ヤ綔涓績浠ｇ爜": data.data[0]["宸ヤ綔涓績浠ｇ爜"]
+ })
+
+ table.render(option);
+
+ //setTableByHMater(obj, data);
+ }
+ })
+
}
//缂栬緫 椤甸潰璧嬪��
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
index 0e599f5..0f2108a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
@@ -91,7 +91,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;" autocomplete="off">
<input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
<input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
</div>
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index a4bff63..42aa032 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -207,7 +207,7 @@
<tr>
<th>鎿嶄綔鍛�</th>
<td class="bz_td">
- <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
+ <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" onclick="this.select()">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin_CZY" style="line-height: 30px;">纭畾</button>
</td>
<td class="bz_td">
--
Gitblit v1.9.1