From a223e72443e926cfd956a5891301934514b0d76a Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期日, 17 一月 2021 23:54:14 +0800
Subject: [PATCH] 工序进站-扫条形码，流水号
---
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 8 +-
WebTM/views/工序汇报/MES_StationInBill_PDA.html | 158 +++++++++++++++++++---------------------------------
WebTM/layuiadmin/Scripts/webConfig.js | 8 +-
3 files changed, 67 insertions(+), 107 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index f53e97a..fcde455 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -13,10 +13,10 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>01/15/2021 12:52:07</publishTime>
+ <publishTime>01/17/2021 21:24:39</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>01/15/2021 12:52:07</publishTime>
+ <publishTime>01/17/2021 21:24:39</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>01/14/2021 10:06:23</publishTime>
@@ -580,7 +580,7 @@
<publishTime>01/14/2021 10:06:23</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>01/14/2021 10:06:23</publishTime>
+ <publishTime>01/17/2021 21:24:22</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1081,7 +1081,7 @@
<publishTime>01/14/2021 15:07:03</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
- <publishTime>01/15/2021 14:22:58</publishTime>
+ <publishTime>01/17/2021 23:20:25</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBill.html">
<publishTime>01/14/2021 15:28:59</publishTime>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 4b657c8..ce9310f 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,7 +1,7 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
- var WEBURL = "http://124.70.129.242/WebAPI/"; //闆呯惇璇�
- //var WEBURL = "http://localhost:8084/WebAPI/";
+ //var WEBURL = "http://124.70.129.242/WebAPI/"; //闆呯惇璇�
+ var WEBURL = "http://localhost:8084/WebAPI/";
//61.130.49.162:9090
//WEBURL = "";
return WEBURL
@@ -9,8 +9,8 @@
function GetWEBURL1() {
//var WEBURL = 'http://192.168.16.80:8011/'; //鍔炲叕瀹ゆ湇鍔″櫒
- var WEBURL = 'http://124.70.129.242/WebAPI/'; //闆呯惇璇�
- //var WEBURL = 'http://localhost:8084/WebAPI/';
+ //var WEBURL = 'http://124.70.129.242/WebAPI/'; //闆呯惇璇�
+ var WEBURL = 'http://localhost:8084/WebAPI/';
//61.130.49.162:9090
//WEBURL = "";
return WEBURL
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
index 95dda20..41174f0 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
@@ -57,19 +57,19 @@
<tr>
<th>鏉″舰鐮�</th>
<td class="t1_input">
- <input type="text" name="鏉″舰鐮�" class="layui-input" id="HFbarcode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="background-color:#efefef4d;border-radius: 50px;" readonly>
+ <input type="text" name="sBillBarCode" class="layui-input" id="sBillBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="border-radius: 50px;">
</td>
</tr>
<tr>
<th>娴佽浆鍗″彿</th>
<td class="t1_input">
- <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="娴佽浆鍗″彿" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="娴佽浆鍗″彿" class="layui-input" id="娴佽浆鍗″彿" placeholder="娴佽浆鍗″彿" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>娴佹按鍙�</th>
<td class="t1_input">
- <input type="text" name="娴佹按鍙�" class="layui-input" id="Serial_number" placeholder="璇疯緭鍏ユ祦姘村彿" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="sProcNo" class="layui-input" id="sProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
@@ -123,7 +123,8 @@
<tr>
<th>杩涚珯鍗曞彿</th>
<td class="t1_input">
- <input type="text" name="杩涚珯鍗曞彿" class="layui-input" id="杩涚珯鍗曞彿" placeholder="璇疯緭鍏ヨ繘绔欏崟鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ヨ繘绔欏崟鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" class="layui-input" id="HInterID">
</td>
</tr>
<tr>
@@ -208,37 +209,25 @@
, form = layui.form;
//鑾峰彇褰撳墠鏃堕棿澶勭悊
- var data = new Date();
- var year = data.getFullYear(); //鑾峰彇骞�
- var month = data.getMonth() + 1; //鑾峰彇鏈�
- var day = data.getDate(); //鑾峰彇鏃�
- var time = year + "/" + month + "/" + day;
- var date = new Date();
- //$("#HDateNow").val(time);//鍔犺浇褰撳墠鏃堕棿
- //alert($("#HDateNow").val());
$("#HDateNow").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#鍒涘缓浜�").val(sessionStorage["HUserName"]);
- //laydate.render({
- // elem: '#HDateNow' //鎸囧畾鍏冪礌
- // , value: new Date()
- // ,trigger: 'click',
- //});
//椤甸潰鍒濆鍖栬祴鍊�
//鑾峰彇鍗曟嵁鍙�
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
- data: { "HBillType": '3790' },
+ //data: { "HBillType": '3790' },
success: function (d) {
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo2").val(d.data[0].HBillNo);
+ $("#HBillNo").val(d.data.HBillNo);//杩涚珯鍗曞彿
+ $("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
}, error: function () {
layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
}
});
- $("#HFbarcode").focus();
- $("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#sBillBarCode").focus();
+ $("#sBillBarCode").css("box-shadow", "0 0 0 1px #00ff00");
$("#Serial_number").attr("readonly", "readonly");//娴佹按鍙峰彧璇�
$("#Serial_number").css("background-color", "#efefef4d");
$("#Entrants_number").attr("readonly", "readonly");//杩涚珯鏁伴噺鍙
@@ -246,109 +235,80 @@
//鎵潯褰㈢爜鏂规硶
- $('#HFbarcode').on('keydown', function (event) { //鎵潯褰㈢爜
- var HFbarcode = $('#HFbarcode').val();
+ $('#sBillBarCode').on('keydown', function (event) { //鎵潯褰㈢爜
+ var sBillBarCode = $('#sBillBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
if (event.keyCode == 13) {
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
- if (HFbarcode == "") {
+ if (sBillBarCode == "") {
layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
//
$.ajax({
- url: GetWEBURL() + "TEST",
+ url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
type: "GET",
data: {
- "sBillBarCode": HFbarcode
+ "sBillBarCode": sBillBarCode
},
success: function (result) {
- //var data = result.data;
- //if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- // "璁㈠崟璺熻釜鍙�": data[0].璁㈠崟璺熻釜鍙�
- // , "浜у搧浠ｇ爜": data[0].浜у搧浠ｇ爜
- // , "浜у搧鍚嶇О": data[0].浜у搧
- // , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
- // , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
- // , "鍒跺崟浜�": data[0].鍒跺崟浜�
- // , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
- // , "淇敼浜�": data[0].淇敼浜�
- // , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
- // , "瀹℃牳浜�": data[0].瀹℃牳浜�
- // , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
- // , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
- // , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
- // , "HBillNo": $("#HFbarcode").val()
- // });
- // $("#HFbarcode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- // $("#HFbarcode").css("background-color", "#efefef4d");
- // $("#HFbarcode").css("box-shadow", "none");
- // $("#Serial_number").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
- // $("#Serial_number").css("background-color", "white");
- // $("#Serial_number").focus();
- // $("#Serial_number").css("box-shadow", "0 0 0 1px #00ff00");
- //} else {
- // layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- //}
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "娴佽浆鍗″彿": $("#sBillBarCode").val()
+ , "宸ュ簭浠ｇ爜": data.宸ュ簭浠ｇ爜
+ , "宸ュ簭鍚嶇О": data.宸ュ簭
+ , "浜у搧浠ｇ爜": data.浜у搧浠ｇ爜
+ , "浜у搧鍚嶇О": data.浜у搧
+ , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
+ , "鐢熶骇璁㈠崟鏁伴噺": data.鐢熶骇鏁伴噺
+ });
+ //$("#sBillBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#sBillBarCode").css("background-color", "#efefef4d");
+ $("#sBillBarCode").css("box-shadow", "none");
+ $("#sProcNo").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
+ $("#sProcNo").css("background-color", "white");
+ $("#sProcNo").focus();
+ $("#sProcNo").css("box-shadow", "0 0 0 1px #00ff00");
+ } else {
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
}, error: function () {
layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
}
});
- // layer.msg($('#HFbarcode').val(), { icon: 1 });
}
});
//娴佹按鍙峰洖杞︽柟娉�
- $('#Serial_number').on('keydown', function (event) { //鎵潯褰㈢爜
- var sProcNo = $('#Serial_number').val();
- var sBillNo = $('#HBillNo').val();
+ $('#sProcNo').on('keydown', function (event) { //鎵潯褰㈢爜
+ var sProcNo = $('#sProcNo').val();
+ var sBillNo = $('#sBillBarCode').val();
if (event.keyCode == 13) {
if (sProcNo == "" || sBillNo == "") {
layer.alert("娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
$.ajax({
- url: GetWEBURL() + "/LEMS/TxtHProcNo_KeyDown",
+ url: GetWEBURL() + "/api/newBill/getProcDetail",
type: "GET",
data: {
- "sProcNo": sProcNo
- , "sBillNo": sBillNo
+ "sBillNo": sBillNo
+ , "sProcNo": sProcNo
},
success: function (result) {
- var data = result.data;
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "璁㈠崟璺熻釜鍙�": data[0].璁㈠崟璺熻釜鍙�
- , "浜у搧浠ｇ爜": data[0].浜у搧浠ｇ爜
- , "浜у搧鍚嶇О": data[0].浜у搧
- , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
- , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
- , "宸ヤ綔涓績": data[0].宸ヤ綔涓績
- , "宸ヤ綔涓績浠ｇ爜": data[0].宸ヤ綔涓績浠ｇ爜
- , "鐢熶骇鐝粍": data[0].鐝粍
- , "鐢熶骇鐝粍浠ｇ爜": data[0].鐝粍浠ｇ爜
- , "鐢熶骇璧勬簮": data[0].鐢熶骇璧勬簮
- , "鐢熶骇璧勬簮浠ｇ爜": data[0].鐢熶骇璧勬簮浠ｇ爜
- , "鍒跺崟浜�": data[0].鍒跺崟浜�
- , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
- , "淇敼浜�": data[0].淇敼浜�
- , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
- , "瀹℃牳浜�": data[0].瀹℃牳浜�
- , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
- , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
- , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
- , "HBillNo": $("#HFbarcode").val()
+ "宸ュ簭浠ｇ爜": data.宸ュ簭浠ｇ爜
+ , "宸ュ簭鍚嶇О": data.宸ュ簭
+ , "浜у搧浠ｇ爜": data.浜у搧浠ｇ爜
+ , "浜у搧鍚嶇О": data.浜у搧
+ , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
+ , "鐢熶骇璁㈠崟鏁伴噺": data.鐢熶骇鏁伴噺
});
- $("#Serial_number").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- $("#Serial_number").css("background-color", "#efefef4d");
- $("#Serial_number").css("box-shadow", "none");
- $("#Entrants_number").removeAttr("readonly");//绉婚櫎杩涚珯鏁伴噺鍙
- $("#Entrants_number").css("background-color", "white");
- $("#Entrants_number").focus();
- $("#Entrants_number").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#sProcNo").css("box-shadow", "none");
+ $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
} else {
- // $("#verifycode").click();
- //layer.msg(result.Message, { icon: 5 });
layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
@@ -443,11 +403,11 @@
});
//鏂板鎸夐挳
- form.on('submit(HAddBT)', function (data) {//閫�鍑�
- layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.location.reload();
- });
- });
+ //form.on('submit(HAddBT)', function (data) {//閫�鍑�
+ // layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ // window.location.reload();
+ // });
+ //});
--
Gitblit v1.9.1