From 2b917b5c9a4b21df1dbc7840085e5368d9085d1f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 21 十二月 2021 15:02:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html | 6 ++
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 12 ++-
WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html | 100 ++++++++++++++++++++-------------
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html | 10 ++-
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html | 6 ++
5 files changed, 85 insertions(+), 49 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
index 3990263..85547e6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
@@ -145,6 +145,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
<input id="HProcID" name="HProcID" type="hidden" />
+ <input id="HProcNumber" name="HProcNumber" type="hidden" />
</div>
</div>
</div>
@@ -152,7 +153,7 @@
<div class="layui-inline">
<label class="layui-form-label">浜у搧浠ｇ爜</label>
<div class="layui-input-inline">
- <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HMaterNumber" id="HMaterNumber" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -194,6 +195,7 @@
<label class="layui-form-label">鐢熶骇鐝粍:</label>
<div class="layui-input-inline">
<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HGroupNumber" id="HGroupNumber" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" id="HGroupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -205,8 +207,9 @@
<div class="layui-inline">
<label class="layui-form-label">鎿嶄綔鍛�:</label>
<div class="layui-input-inline">
- <input type="text" name="HWorkManName" id="HWorkManName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWorkManID" id="HWorkManID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpNumber" id="HEmpNumber" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -215,16 +218,21 @@
<div class="layui-inline">
<label class="layui-form-label">涓嶈壇鏁伴噺:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBadQty" lay-verify="HBadQty" id="HBadQty" autocomplete="off">
+ <input class="layui-input" name="HBadCount" lay-verify="HBadCount" id="HBadCount" autocomplete="off">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎶ュ簾鏁伴噺:</label>
+ <label class="layui-form-label">鍥犲伐鎶ュ簾鏁�:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HWasterQty" lay-verify="HWasterQty" id="HWasterQty" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">鍥犳枡鎶ュ簾鏁�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWasterQty2" lay-verify="HWasterQty2" id="HWasterQty2" autocomplete="off">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -238,13 +246,13 @@
<div class="layui-inline">
<label class="layui-form-label">寮�宸ユ椂闂�:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HWorkBeginDate" id="HWorkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HRelBeginDate" id="HRelBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鎶ュ伐鏃堕棿:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HWorkReportDate" id="HWorkReportDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HRelEndDate" id="HRelEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
</div>
@@ -396,11 +404,11 @@
function set_InitFrom() {
//鏃ユ湡鏃堕棿閫夋嫨鍣�
laydate.render({
- elem: '#HWorkBeginDate'
+ elem: '#HRelBeginDate'
, type: 'datetime'
});
laydate.render({
- elem: '#HWorkReportDate'
+ elem: '#HRelEndDate'
, type: 'datetime'
});
laydate.render({
@@ -434,7 +442,7 @@
{
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
+ $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
}
@@ -444,7 +452,7 @@
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
+ $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
@@ -453,15 +461,15 @@
$('#HSourceBillNo').attr("disabled", true);
$('#HProcExchBillNo').attr("disabled", true);
$('#HProcName').attr("disabled", true);
- $('#HMaterCode').attr("disabled", true);
+ $('#HMaterNumber').attr("disabled", true);
$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HMaterName').attr("disabled", true);
$('#HMaterSpec').attr("disabled", true);
$('#HPlanQty').attr("disabled", true);
$('#HSourceName').attr("disabled", true);
$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HWorkBeginDate').attr("disabled", true);
- $('#HWorkReportDate').attr("disabled", true);
+ $('#HRelBeginDate').attr("disabled", true);
+ $('#HRelEndDate').attr("disabled", true);
$.ajax(
{
@@ -480,9 +488,10 @@
{
var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
$("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
+ $("#HProcNumber").val(LoadData[0].HProcNumber); //褰撳墠宸ュ簭缂栫爜
$("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
$("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
- $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
+ $("#HMaterNumber").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
$("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
$("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
$("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
@@ -492,11 +501,12 @@
$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
$("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
$("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+ $("#HGroupNumber").val(LoadData[0].HDeptNumber); //鐝粍缂栫爜
$("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
- $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
+ $("#HRelBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
$("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
}
@@ -520,15 +530,15 @@
$('#HSourceBillNo').attr("disabled", true);
$('#HProcExchBillNo').attr("disabled", true);
$('#HProcName').attr("disabled", true);
- $('#HMaterCode').attr("disabled", true);
+ $('#HMaterNumber').attr("disabled", true);
$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HMaterName').attr("disabled", true);
$('#HMaterSpec').attr("disabled", true);
$('#HPlanQty').attr("disabled", true);
$('#HSourceName').attr("disabled", true);
$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HWorkBeginDate').attr("disabled", true);
- $('#HWorkReportDate').attr("disabled", true);
+ $('#HRelBeginDate').attr("disabled", true);
+ $('#HRelEndDate').attr("disabled", true);
$.ajax(
{
@@ -548,10 +558,11 @@
$("#HInterID").val(LoadData[0].HInterID); //鍗曟嵁ID
$("#HBillNo").val(LoadData[0].鍗曟嵁鍙�); //鍗曟嵁鍙�
$("#HDate").val(formatDate(LoadData[0].鏃ユ湡)); //鏃ユ湡
- $("#HProcID").val(""); //褰撳墠宸ュ簭ID
- $("#HProcName").val(""); //褰撳墠宸ュ簭
+ $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
+ $("#HProcNumber").val(LoadData[0].HProcNumber); //褰撳墠宸ュ簭缂栫爜
+ $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
$("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
- $("#HMaterCode").val(LoadData[0].浜у搧浠ｇ爜); //浜у搧浠ｇ爜
+ $("#HMaterNumber").val(LoadData[0].浜у搧浠ｇ爜); //浜у搧浠ｇ爜
$("#HMaterName").val(LoadData[0].浜у搧鍚嶇О); //浜у搧鍚嶇О
$("#HMaterSpec").val(LoadData[0].浜у搧瑙勬牸); //浜у搧瑙勬牸
$("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
@@ -561,18 +572,21 @@
$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
$("#HSourceBillType").val(LoadData[0].婧愬崟绫诲瀷); //婧愬崟绫诲瀷
$("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+ $("#HGroupNumber").val(LoadData[0].鐢熶骇鐝粍浠ｇ爜); //鐝粍缂栫爜
$("#HGroupName").val(LoadData[0].鐢熶骇鐝粍); //鐝粍
- $("#HWorkManID").val(LoadData[0].HWorkManID); //鎿嶄綔鍛業D
- $("#HWorkManName").val(LoadData[0].鎿嶄綔鍛�); //鎿嶄綔鍛�
+ $("#HEmpID").val(LoadData[0].HWorkManID); //鎿嶄綔鍛業D
+ $("#HEmpNumber").val(LoadData[0].鎿嶄綔鍛樼紪鐮�); //鎿嶄綔鍛樼紪鐮�
+ $("#HEmpName").val(LoadData[0].鎿嶄綔鍛�); //鎿嶄綔鍛�
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
- $("#HWorkBeginDate").val(formatDate(LoadData[0].寮�宸ユ椂闂�)); //寮�宸ユ椂闂�
- $("#HWorkReportDate").val(formatDate(LoadData[0].鎶ュ伐鏃堕棿)); //鎶ュ伐鏃堕棿
+ $("#HRelBeginDate").val(formatDate(LoadData[0].寮�宸ユ椂闂�)); //寮�宸ユ椂闂�
+ $("#HRelEndDate").val(formatDate(LoadData[0].鎶ュ伐鏃堕棿)); //鎶ュ伐鏃堕棿
$("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
$("#HQty").val(LoadData[0].姹囨姤鏁伴噺); //鎶ュ伐鏁伴噺
- $("#HBadQty").val(LoadData[0].涓嶈壇鏁伴噺); //涓嶈壇鏁伴噺
- $("#HWasterQty").val(LoadData[0].鎶ュ簾鏁伴噺); //鎶ュ簾鏁伴噺
+ $("#HBadCount").val(LoadData[0].涓嶈壇鏁伴噺); //涓嶈壇鏁伴噺
+ $("#HWasterQty").val(LoadData[0].鍥犲伐鎶ュ簾鏁伴噺); //鍥犲伐鎶ュ簾鏁伴噺
+ $("#HWasterQty2").val(LoadData[0].鍥犳枡鎶ュ簾鏁伴噺); //鍥犳枡鎶ュ簾鏁伴噺
$("#HMaker").val(LoadData[0].鍒跺崟浜�); //鍒跺崟浜�
$("#HMakeDate").val(formatDate(LoadData[0].鍒跺崟鏃ユ湡)); //鍒跺崟鏃ユ湡
$("#HUpDater").val(sessionStorage["HUserName"]); //淇敼浜�
@@ -605,7 +619,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3724' },
+ data: { "HBillType": '3714' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
$("#HInterID").val(0);
@@ -687,7 +701,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterCode").val(checkStatus.data[0].HNumber);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
$("#HMaterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -763,8 +777,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HWorkManName").val(checkStatus.data[0].HName);
- $("#HWorkManID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpNumber").val(checkStatus.data[0].HNumber);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -804,6 +819,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HGroupName").val(checkStatus.data[0].HName);
+ $("#HGroupNumber").val(checkStatus.data[0].HNumber);
$("#HGroupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -842,9 +858,10 @@
success: function (datas) {
var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
var HQty = LoadData[0].HQty;
- var HBadQty = LoadData[0].HBadQty;
+ var HBadCount = LoadData[0].HBadCount;
var HWasterQty = LoadData[0].HWasterQty;
- var yessqty = HQty + HBadQty + HWasterQty;
+ var HWasterQty2 = LoadData[0].HWasterQty2;
+ var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
var sumqty = parseFloat($("#HQty").val()) + yessqty;
if (sumqty > parseFloat($("#HPlanQty").val())) {
layer.confirm("宸叉眹鎶ユ暟閲�:銆�" + yessqty + "銆�,褰撳墠姹囨姤鏁伴噺:銆�" + parseFloat($("#HQty").val()) + "銆戜笉鑳藉ぇ浜庤鍒掓暟閲�:銆�" + parseFloat($("#HPlanQty").val()) + "銆戯紒", {
@@ -869,11 +886,14 @@
//鎻愪氦璇锋眰ajax
function Submit(data) {
- if (data.field.HBadQty == "" || data.field.HBadQty == null) {
- data.field.HBadQty = 0;
+ if (data.field.HBadCount == "" || data.field.HBadCount == null) {
+ data.field.HBadCount = 0;
}
if (data.field.HWasterQty == "" || data.field.HWasterQty == null) {
data.field.HWasterQty = 0;
+ }
+ if (data.field.HWasterQty2 == "" || data.field.HWasterQty2 == null) {
+ data.field.HWasterQty2 = 0;
}
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + refSav;
@@ -994,11 +1014,11 @@
layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HWorkBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
+ if ($("#HRelBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HWorkReportDate").val() == '' || $("#HWorkReportDate").val() == null) {
+ if ($("#HRelEndDate").val() == '' || $("#HRelEndDate").val() == null) {
layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
@@ -1006,7 +1026,7 @@
layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HWorkManID").val() == '' || $("#HWorkManID").val() == null) {
+ if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
index 8286507..acf9ccc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
@@ -193,7 +193,7 @@
option = {
elem: '#mainTable'
, height: 'full-50'
- , page: true
+ , page: true
, cellMinWidth: 90
, cols: [[
{ type: 'checkbox', fixed: 'left' }
@@ -205,6 +205,8 @@
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
+ , { field: 'HProcNumber', title: '宸ュ簭缂栫爜', width: 200 }
+ , { field: 'HProcName', title: '宸ュ簭鍚嶇О', width: 200 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
@@ -232,7 +234,7 @@
//鎶ュ伐骞冲彴杩涘叆(鏈夋簮鍗�)
function set_AddNew()
{
- sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
+ sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
SchWhere = sWhere;
console.log(sWhere);
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -264,8 +266,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].HInterID.toString();
- var HICMOInID = data[0].HICMOInterID.toString();
- var HICMOEnID = data[0].HICMOEntryID.toString();
+ var HICMOInID = data[0].HSourceInterID.toString();
+ var HICMOEnID = data[0].HSourceEntryID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index 37707f5..d7f6fd9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -241,10 +241,12 @@
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 200 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 200 }
, { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸', width: 200 }
+ , { field: 'HProcID', title: 'HProcID', width: 200, hide: true}
+ , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', width: 200 }
+ , { field: 'HProcName', title: '宸ュ簭鍚嶇О', width: 200 }
, { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺', width: 200 }
, { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
- , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
@@ -353,8 +355,8 @@
if (checkStatus.data.length === 1) {
console.log(data[0]);
var HInterID = data[0].HInterID;
- var HICMOInID = data[0].HICMOInterID;
- var HICMOEnID = data[0].HICMOEntryID;
+ var HICMOInID = data[0].HSourceInterID;
+ var HICMOEnID = data[0].HSourceEntryID;
var HRelationInterID = data[0].HRelationInterID;
if (HRelationInterID == 1) {
layer.msg('鍗曟嵁宸叉姤妫�瀹℃牳鏃犳硶淇敼锛�');
@@ -391,8 +393,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].HInterID.toString();
- var HICMOInID = data[0].HICMOInterID.toString();
- var HICMOEnID = data[0].HICMOEntryID.toString();
+ var HICMOInID = data[0].HSourceInterID.toString();
+ var HICMOEnID = data[0].HSourceEntryID.toString();
var HRelationInterID = data[0].HRelationInterID.toString();
if (HRelationInterID == 1) {
layer.msg('鍗曟嵁宸叉姤妫�瀹℃牳鏃犳硶鍒犻櫎锛�');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
index 9541692..a97213e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
@@ -252,6 +252,12 @@
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
, { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 115 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 115 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
+ , { field: 'HProcID', title: 'HProcID', width: 115, hide: true}
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 115 }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 115 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
, { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 115 }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
index e0c7fe4..ccfd4b6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
@@ -261,6 +261,12 @@
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
, { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: 'HProcID', title: 'HProcID', width: 160, hide: true}
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 160 }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 160 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
, { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 115 }
--
Gitblit v1.9.1