From 9fc747c8fe1b492e0e82da57a60f4ac17ef196d8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 22:28:09 +0800
Subject: [PATCH] 1、上架归还单：先扫条码再扫货架，如果不匹配不允许提交。2、下架找货单：已下架的条码允许再次下架。
---
WebTM/views/工序汇报/MES_StationInBill_PDA.html | 90 +++++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 43 deletions(-)
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 2b55ef2..a7d711e 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"
@@ -75,7 +75,8 @@
<tr>
<th>宸ュ簭浠ｇ爜</th>
<td class="t1_input">
- <input type="text" name="HProcID" class="layui-input" id="HProcID" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
@@ -97,7 +98,7 @@
<input type="text" name="HQty" class="layui-input" id="HQty" placeholder="璇疯緭鍏ヨ繘绔欐暟閲�">
</td>
</tr>
- <tr>
+ <tr style="display:none;">
<th>鐢熶骇璧勬簮</th>
<td class="bz_td">
<input type="text" name="HSource" class="layui-input" id="HSource" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;" readonly>
@@ -214,15 +215,27 @@
//鑾峰彇褰撳墠鏃堕棿澶勭悊
$("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HEmp").val(sessionStorage["HUserName"]);
- $("#HEmpID").val(sessionStorage["Czybm"]);
+ $("#HEmp").val(sessionStorage["HUserName"]);//鍒涘缓浜�
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
+ $("#HProc").val(sessionStorage["HProc"]);//宸ュ簭
+ $("#HProcName").val(sessionStorage["HProcName"]);//宸ュ簭浠ｇ爜
+ $("#HProcID").val(sessionStorage["HProcID"]);//宸ュ簭ID
+ $("#HSource").val(sessionStorage["HSource"]);//鐢熶骇璧勬簮
+ $("#HSourceID").val(sessionStorage["HSourceID"]);
+ $("#HGroup").val(sessionStorage["HGroup"]);//鐢熶骇鐝粍
+ $("#HGroupID").val(sessionStorage["HGroupID"]);
+ $("#HCenter").val(sessionStorage["HWorkCenter"]);//宸ヤ綔涓績
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]);
+ $("#HProcNo").val(sessionStorage["HProcNo"]);//娴佹按鍙�
+
+
//椤甸潰鍒濆鍖栬祴鍊�
//鑾峰彇鍗曟嵁鍙�
$.ajax({
url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
- //data: { "HBillType": '3790' },
+ data: { "billType": '3790' },
success: function (d) {
$("#HBillNo").val(d.data.HBillNo);//杩涚珯鍗曞彿
$("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
@@ -233,10 +246,6 @@
$("#HBarCode").focus();
$("#HBarCode").css("box-shadow", "0 0 0 1px #00ff00");
- $("#Serial_number").attr("readonly", "readonly");//娴佹按鍙峰彧璇�
- $("#Serial_number").css("background-color", "#efefef4d");
- $("#Entrants_number").attr("readonly", "readonly");//杩涚珯鏁伴噺鍙
- $("#Entrants_number").css("background-color", "#efefef4d");
//鎵潯褰㈢爜鏂规硶
@@ -248,7 +257,6 @@
layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
- //
$.ajax({
url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
type: "GET",
@@ -256,19 +264,19 @@
"sBillBarCode": HBarCode
},
success: function (result) {
- var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcExchBillNo": $("#HBarCode").val()
- , "HProcID": data.HProcID
- , "HProc": data.宸ュ簭
- , "HCenter": data.宸ヤ綔涓績
- , "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ //, "HProcID": data.HProcID
+ //, "HProc": data.宸ュ簭
+ //, "HCenter": data.宸ヤ綔涓績
+ //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
, "HICMOInterID": data.hicmointerid
, "HICMOBillNo": data.浠诲姟鍗曞彿
, "HDeptID": data.HDeptID
, "HQty": data.璁″垝鏁伴噺
- , "HMaterID": data.浜у搧浠ｇ爜
+ , "HMaterID": data.HMaterID
, "HMaterName": data.浜у搧
, "HMaterModel": data.瑙勬牸鍨嬪彿
, "HICMOQty": data.鐢熶骇鏁伴噺
@@ -277,12 +285,8 @@
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
$("#HBarCode").css("box-shadow", "none");
- $("#HProcNo").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
- $("#HProcNo").css("background-color", "white");
- $("#HProcNo").focus();
- $("#HProcNo").css("box-shadow", "0 0 0 1px #00ff00");
} else {
- layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
@@ -311,15 +315,15 @@
var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcID": data.HProcID
- , "HProc": data.宸ュ簭
- , "HCenter": data.宸ヤ綔涓績
- , "HCenterID": data.宸ヤ綔涓績浠ｇ爜
- , "HICMOInterID": data.hicmointerid
+ //"HProcID": data.HProcID
+ //, "HProc": data.宸ュ簭
+ //, "HCenter": data.宸ヤ綔涓績
+ //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ "HICMOInterID": data.hicmointerid
, "HICMOBillNo": data.浠诲姟鍗曞彿
, "HDeptID": data.HDeptID
, "HQty": data.璁″垝鏁伴噺
- , "HMaterID": data.浜у搧浠ｇ爜
+ , "HMaterID": data.HMaterID
, "HMaterName": data.浜у搧
, "HMaterModel": data.瑙勬牸鍨嬪彿
, "HICMOQty": data.鐢熶骇鏁伴噺
@@ -327,7 +331,7 @@
$("#HProcNo").css("box-shadow", "none");
checkPopup();
} else {
- layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
layer.alert("娴佹按鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
@@ -402,12 +406,10 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
//debugger;
var sMainStr =data.field;
- console.log(sMainStr);
$.ajax(
{
type: "POST",
- //url: GetWEBURL() + "/api/newBill/setStationInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: "http://localhost:12761/api/newBill/setStationInBill",
+ url: GetWEBURL() + "/api/newBill/setStationInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: sMainStr,
dataType: "json",
@@ -434,16 +436,16 @@
//閫�鍑烘寜閽�
form.on('submit(Close)', function (data) {//閫�鍑�
layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.layui.admin.events.closeThisTabs();
+ parent.location.href = "../../views/index.html";
});
});
//鏂板鎸夐挳
- //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();
+ });
+ });
@@ -460,10 +462,11 @@
//鏍￠獙鏄惁閫夋嫨寮圭獥浜嬩欢
function checkPopup() {
- if (!$("#HSource").val()) {
- $("#HSource").css("box-shadow", "0 0 1px 2px #00ff00");
- }
- else if (!$("#HGroup").val()) {
+ //if (!$("#HSource").val()) {//鐢熶骇璧勬簮
+ // $("#HSource").css("box-shadow", "0 0 1px 2px #00ff00");
+ //}
+ //else
+ if (!$("#HGroup").val()) {
$("#HGroup").css("box-shadow", "0 0 1px 2px #00ff00");
}
else if (!$("#HCenter").val()) {
@@ -484,6 +487,7 @@
}
}
+ //杩斿洖鐢熶骇璧勬簮
function GetProductionResourcesValue(obj) { //杩斿洖鐢熶骇璧勬簮
if ($("#HSource").val()) {
$("#HSource").css("box-shadow", "none");
@@ -497,9 +501,9 @@
//杩斿洖宸ヤ綔涓績
function GetWorkCenterValue(obj) { //杩斿洖宸ヤ綔涓績
if (obj.length == 0) {
- layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
+ layer.msg("璇峰厛閫夋嫨宸ヤ綔涓績", { index: 0 });
} else {
- $("#HCenter").val(obj[0].鐢熶骇鐝粍);
+ $("#HCenter").val(obj[0].宸ヤ綔涓績);
$("#HCenterID").val(obj[0].HItemID);
$("#HCenter").css("box-shadow", "none");
checkPopup();
--
Gitblit v1.9.1