From cb6832f2a5a8f577b2aab829498761b401ed530a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 17 三月 2023 09:02:57 +0800
Subject: [PATCH] 工序进出站
---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 107 ++++++++++++---------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 107 ++++++++++++---------
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_Detail.html | 21 +--
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 9 +
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 14 +-
5 files changed, 143 insertions(+), 115 deletions(-)
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_StationOutBill.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_StationOutBill.html"
index 283e015..fb5fe67 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_StationOutBill.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_StationOutBill.html"
@@ -747,49 +747,54 @@
type: "GET",
data: { "HInterID": linterid },
success: function (result) {
- var data = result.data[0];
- txtHBarCode_KeyDown(data.HBarCode);
- txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
- get_DisplayTech(data.HInterID);
- form.val("formData", { //HGroupName
- "HInterID": data.HInterID,
- "HBillNo": data.HBillNo,
- "HBarCode": data.HBarCode,
- "HProcNo": data.HProcNo,
- "HQty": data.HQty,
- "HWasterQty": data.HWasterQty,
- "HWorkTimes": data.HWorkTimes,
- "HGroupID": data.HGroupID,
- "HGroupName": data.HGroupName,
- "HSourceID": data.HSourceID,
- "HSourceName": data.HSourceName,
- "HQCCheckID": data.HQCCheckID,
- "HQCCheckName": data.HQCCheckName,
- "HEmpID": data.HEmpID,
- "HEmpName": data.HEmpName,
- "HEmpID2": data.HEmpID2,
- "HEmpName2": data.HEmpName2,
- "HEmpID3": data.HEmpID3,
- "HEmpName3": data.HEmpName3,
- "HEmpID4": data.HEmpID4,
- "HEmpName4": data.HEmpName4,
- "HEmpID5": data.HEmpID5,
- "HEmpName5": data.HEmpName5,
- "HRemark": data.HRemark
- });
- if (data.鏄惁瀹℃牳 == "true") {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
- } else {
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ if (result.code == 1) {
+ var data = result.data[0];
+ txtHBarCode_KeyDown(data.HBarCode);
+ txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
+ get_DisplayTech(data.HInterID);
+ form.val("formData", { //HGroupName
+ "HInterID": data.HInterID,
+ "HBillNo": data.HBillNo,
+ "HBarCode": data.HBarCode,
+ "HProcNo": data.HProcNo,
+ "HQty": data.HQty,
+ "HWasterQty": data.HWasterQty,
+ "HWorkTimes": data.HWorkTimes,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.HGroupName,
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.HSourceName,
+ "HQCCheckID": data.HQCCheckID,
+ "HQCCheckName": data.HQCCheckName,
+ "HEmpID": data.HEmpID,
+ "HEmpName": data.HEmpName,
+ "HEmpID2": data.HEmpID2,
+ "HEmpName2": data.HEmpName2,
+ "HEmpID3": data.HEmpID3,
+ "HEmpName3": data.HEmpName3,
+ "HEmpID4": data.HEmpID4,
+ "HEmpName4": data.HEmpName4,
+ "HEmpID5": data.HEmpID5,
+ "HEmpName5": data.HEmpName5,
+ "HRemark": data.HRemark
+ });
+ if (data.鏄惁瀹℃牳 == "true") {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ } else {
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ }
+ if (OperationType == 3) {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ }
+ PicUpload();
+ layer.close(index);
}
- if (OperationType == 3) {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ else {
+ layer.close(index);
}
- PicUpload();
- layer.close(index);
}
, error: function () {
layer.close(index);
@@ -864,7 +869,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -913,7 +918,11 @@
case "PRO":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcID": data.HItemID,
- "HProcName": data.宸ュ簭鍚嶇О
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
break;
case "WLM":
@@ -941,8 +950,8 @@
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrgID": data.缁勭粐
});
- $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- $("#HBarCode").css("background-color", "#efefef4d");
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
var HProcExchHinteID = $('#HProcExchHinteID').val();
@@ -951,7 +960,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
success: function (data1) {
if (data1.count == 1) {
var data = data1.data[0];
@@ -1298,6 +1307,10 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
+ if ($("#lngBillSubKey").val() == 0) {
+ layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var tableData = data.field;
var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
var index = layer.load();
@@ -1326,7 +1339,7 @@
}
}
}
- if (result.Verify == "Y") {
+ if (data.Verify == "Y") {
location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
}
else {
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_StationInBill_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_StationInBill_PDA.html"
index 1978428..468d42e 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_StationInBill_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_StationInBill_PDA.html"
@@ -897,7 +897,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In"},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -944,9 +944,13 @@
layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" +"浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
break;
case "PRO":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcID": data.HItemID,
- "HProcName": data.宸ュ簭鍚嶇О
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
break;
case "WLM":
@@ -987,7 +991,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "In" },
success: function (data1) {
if (data1.count == 1) {
var data = data1.data[0];
@@ -1172,7 +1176,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
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 6917316..eaf73ff 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"
@@ -583,49 +583,53 @@
type: "GET",
data: { "HInterID": linterid },
success: function (result) {
- var data = result.data[0];
- txtHBarCode_KeyDown(data.HBarCode);
- txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
- get_DisplayTech(data.HInterID);
- form.val("formData", { //HGroupName
- "HInterID": data.HInterID,
- "HBillNo": data.HBillNo,
- "HBarCode": data.HBarCode,
- "HProcNo": data.HProcNo,
- "HQty": data.HQty,
- "HWasterQty": data.HWasterQty,
- "HWorkTimes": data.HWorkTimes,
- "HGroupID": data.HGroupID,
- "HGroupName": data.HGroupName,
- "HSourceID": data.HSourceID,
- "HSourceName": data.HSourceName,
- "HQCCheckID": data.HQCCheckID,
- "HQCCheckName": data.HQCCheckName,
- "HEmpID": data.HEmpID,
- "HEmpName": data.HEmpName,
- "HEmpID2": data.HEmpID2,
- "HEmpName2": data.HEmpName2,
- "HEmpID3": data.HEmpID3,
- "HEmpName3": data.HEmpName3,
- "HEmpID4": data.HEmpID4,
- "HEmpName4": data.HEmpName4,
- "HEmpID5": data.HEmpID5,
- "HEmpName5": data.HEmpName5,
- "HRemark": data.HRemark
- });
- if (data.鏄惁瀹℃牳 == "true") {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ if (result.code == 1) {
+ var data = result.data[0];
+ txtHBarCode_KeyDown(data.HBarCode);
+ txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
+ get_DisplayTech(data.HInterID);
+ form.val("formData", { //HGroupName
+ "HInterID": data.HInterID,
+ "HBillNo": data.HBillNo,
+ "HBarCode": data.HBarCode,
+ "HProcNo": data.HProcNo,
+ "HQty": data.HQty,
+ "HWasterQty": data.HWasterQty,
+ "HWorkTimes": data.HWorkTimes,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.HGroupName,
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.HSourceName,
+ "HQCCheckID": data.HQCCheckID,
+ "HQCCheckName": data.HQCCheckName,
+ "HEmpID": data.HEmpID,
+ "HEmpName": data.HEmpName,
+ "HEmpID2": data.HEmpID2,
+ "HEmpName2": data.HEmpName2,
+ "HEmpID3": data.HEmpID3,
+ "HEmpName3": data.HEmpName3,
+ "HEmpID4": data.HEmpID4,
+ "HEmpName4": data.HEmpName4,
+ "HEmpID5": data.HEmpID5,
+ "HEmpName5": data.HEmpName5,
+ "HRemark": data.HRemark
+ });
+ if (data.鏄惁瀹℃牳 == "true") {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ } else {
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ }
+ if (OperationType == 3) {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ }
+ PicUpload();
+ layer.close(index);
} else {
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ layer.close(index);
}
- if (OperationType == 3) {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- }
- PicUpload();
- layer.close(index);
}
, error: function () {
layer.close(index);
@@ -700,7 +704,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -749,7 +753,11 @@
case "PRO":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcID": data.HItemID,
- "HProcName": data.宸ュ簭鍚嶇О
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
break;
case "WLM":
@@ -777,8 +785,8 @@
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrgID": data.缁勭粐
});
- $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- $("#HBarCode").css("background-color", "#efefef4d");
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
var HProcExchHinteID = $('#HProcExchHinteID').val();
@@ -787,7 +795,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
success: function (data1) {
if (data1.count == 1) {
var data = data1.data[0];
@@ -923,7 +931,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -1287,6 +1295,11 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
+ if ($("#lngBillSubKey").val() == 0) {
+ layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
var tableData = data.field;
var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
var index = layer.load();
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_Detail.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_Detail.html"
index b8b9ab4..d1298c4 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_Detail.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_Detail.html"
@@ -64,19 +64,20 @@
<tr>
<th>娴佹按鍙�</th>
<td class="bz_td">
- <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙�" style="border-radius:50px;">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="娴佹按鍙�" style="border-radius:50px;background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>宸ュ簭</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎閲�" style="border-radius:50px;">
+ <input type="text" name="HWorkProcName" class="layui-input" id="HWorkProcName" placeholder="宸ュ簭" style="border-radius:50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HWorkProcID" id="HWorkProcID" autocomplete="off" value="0" class="layui-input">
</td>
</tr>
<tr>
<th>鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎閲�" style="border-radius:50px;">
+ <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" placeholder="鏁伴噺" style="border-radius:50px;background-color:#efefef4d;" readonly>
</td>
</tr>
</tbody>
@@ -176,11 +177,8 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
- "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": "", "HPlanEndDate": "",
- "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
- "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
- "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+ "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": "",
+ "HQty": 0, "HRate": 0, "HProcPrice": 0, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
};
switch (obj.event) {
@@ -292,11 +290,8 @@
}
};
option.data = [{
- "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
- "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
- "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
- "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
- "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+ "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": "",
+ "HQty": 0, "HRate": 0, "HProcPrice": 0, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
}];
table.render(option);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index a3bb2c1..bdb7237 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -904,7 +904,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In" },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -954,7 +954,10 @@
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcID": data.HItemID,
"HProcName": data.宸ュ簭鍚嶇О,
- "HProcNo": data.娴佹按鍙�
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
});
break;
case "WLM":
@@ -995,7 +998,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType":"In" },
success: function (data1) {
if (data1.count == 1) {
var data = data1.data[0];
--
Gitblit v1.9.1