From f3359631f63eb0c371f6586fef3948041645d1fa Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 24 三月 2023 09:50:42 +0800
Subject: [PATCH] 工序派工；工序进出站
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 47 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html | 8
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 282 +++++++----
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_Detail.html | 201 +++++++-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 64 +-
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html | 763 +++++++++++--------------------
WebTM/views/index_Mobile.html | 18
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 5
8 files changed, 706 insertions(+), 682 deletions(-)
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 61a644c..07d3c15 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -83,7 +83,7 @@
<cite>杞﹂棿绠＄悊</cite>
</a>
<dl class="layui-nav-child">
- <dd>
+ <!--<dd>
<a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_OLD.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭杩涚珯鎺ユ敹鍗�
@@ -106,7 +106,7 @@
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
</a>
- </dd>
+ </dd>-->
<dd>
<a lay-href="杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -143,24 +143,24 @@
浜х嚎鍏抽敭浠剁粦瀹�
</a>
</dd>
- <dd>
+ <!--<dd>
<a lay-href="" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭姹囨姤鍗昻ull
</a>
- </dd>
- <dd>
+ </dd>-->
+ <!--<dd>
<a lay-href="" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
濮斿宸ュ簭璁″垝杞嚭鍗昻ull
</a>
- </dd>
- <dd>
+ </dd>-->
+ <!--<dd>
<a lay-href="" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
濮斿宸ュ簭璁″垝姹囨姤鍗昻ull
</a>
- </dd>
+ </dd>-->
<dd>
<a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -170,7 +170,7 @@
<dd>
<a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 宸ュ簭鍑虹珯鎺ユ敹鍗�
+ 宸ュ簭鍑虹珯姹囨姤鍗�
</a>
</dd>
</dl>
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 468d42e..c13a690 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"
@@ -1385,6 +1385,11 @@
, resize: false
, cancel: function (index, layero) {
}
+ , end: function () {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
})
} else {
layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^', { icon: 7 });
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 eaf73ff..b9b1bc4 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"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>宸ュ簭鍑虹珯鎺ユ敹鍗�</title>
+ <title>宸ュ簭鍑虹珯姹囨姤鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -116,7 +116,7 @@
</div>
<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
- <button type="button" lay-submit="" lay-filter="Detail" class="layui-btn layui-btn-radius">鏄庣粏</button>
+ <button type="button" lay-submit="" lay-filter="Detail" class="layui-btn layui-btn-radius" id="Detail">鏄庣粏</button>
<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
@@ -180,10 +180,10 @@
<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;" readonly>
+ <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" >
</td>
<td class="bz_td">
- <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
</td>
@@ -278,13 +278,6 @@
<td class="bz_td">
<input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
<input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
- </td>
- </tr>
- <tr>
- <th>鐢熶骇缁勭粐</th>
- <td class="bz_td">
- <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
@@ -406,35 +399,7 @@
var option = [];
var titleData = [];
//#region 鍒濆鍖栭〉闈�
- //laydate.render({
- // elem: '#HBeginDate'
- // , type: 'datetime'
- //});
- //laydate.render({
- // elem: '#HEndDate'
- // , type: 'datetime'
- //});
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- //});
- //laydate.render({
- // elem: '#HMakeDate'
- // , type: 'datetime'
- //});
- //laydate.render({
- // elem: '#HUpDateDate'
- // , type: 'datetime'
- //});
- //laydate.render({
- // elem: '#HCheckDate'
- // , type: 'datetime'
- //});
- //laydate.render({
- // elem: '#HDeleteDate'
- // , type: 'datetime'
- //});
- //#endregion
+
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
@@ -470,7 +435,7 @@
var HProcNo = params[params[2]];//娴佹按鍙�
var HBarCode = HBillNo;//鏉″舰鐮�
- var sProcNo = HProcNo;//娴佹按鍙�
+ var sProcNo = HProcNo;//娴佹按鍙�
if (HBarCode != "undefined" && sProcNo != "undefined") {
$("#HBarCode").val(HBarCode);
@@ -693,7 +658,10 @@
});
function txtHBarCode_KeyDown(HBarCode) {
+ //鎵爜绫诲瀷1
var barNo = HBarCode.substr(0, 3);
+ //鎵爜绫诲瀷2
+ var barNo2 = HBarCode.substr(0, 4);
if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
layer.close(index);
@@ -709,66 +677,34 @@
if (result.count == 1) {
var data = result.data[0];
- switch (barNo) {
- case "HCX":
+ switch (barNo2) {
+ case "GXLZ":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HSourceID": data.HItemID,
- "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
- });
- break;
- case "SBM":
- layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
- break;
- case "JYM"://妫�楠屽憳
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HQCCheckID": data.HItemID,
- "HQCCheckName": data.鑱屽憳鍚嶇О
- //"HGroupID": data.鐝粍ID,
- //"HGroupName": data.鐝粍鍚嶇О
- });
- break;
- case "GRM"://鎿嶄綔鍛橈紝鎺ユ敹浜�
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HEmpID": data.HItemID,
- "HEmpNumber": data.鑱屽憳浠ｇ爜,
- "HEmpName": data.鑱屽憳鍚嶇О,
- "HGroupID": data.鐝粍ID,
- "HGroupName": data.鐝粍鍚嶇О
- });
- break;
- //case "CGM":
- // form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- // "HEmpID": data.HItemID,
- // "HEmpNumber": data.鑱屽憳浠ｇ爜,
- // "HEmpName": data.鑱屽憳鍚嶇О
- // });
- // break;
- case "HWH":
- var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
- layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
- break;
- case "HSP":
- 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="" 瀵瑰簲鐨勫��
- "HProcID": data.HItemID,
- "HProcName": data.宸ュ簭鍚嶇О,
- "HProcNo": data.娴佹按鍙�,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "lngBillKey": data.hmainid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HPRDOrgID": data.缁勭粐,
"lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HProcNo": data.娴佹按鍙�,
"HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID
+ "HCenterID": data.HCenterID,
+ "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
});
+ HProcExchBillNoFlag = true;
break;
- case "WLM":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMaterID": data.HItemID,
- "HMaterName": data.鐗╂枡鍚嶇О,
- "HMaterNumber": data.鐗╂枡浠ｇ爜,
- "HMaterModel": data.瑙勬牸鍨嬪彿
- });
- break;
- case "GXL":
+ case "GXLX":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HICMOInterID": data.hicmointerid,
"HICMOBillNo": data.浠诲姟鍗曞彿,
@@ -848,6 +784,75 @@
table.render(option)
break;
}
+
+ switch (barNo) {
+ case "HCX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSourceID": data.HItemID,
+ "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ });
+ break;
+ case "SBM":
+ layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
+ break;
+ case "JYM"://妫�楠屽憳
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HQCCheckID": data.HItemID,
+ "HQCCheckName": data.鑱屽憳鍚嶇О
+ //"HGroupID": data.鐝粍ID,
+ //"HGroupName": data.鐝粍鍚嶇О
+ });
+ break;
+ case "GRM"://鎿嶄綔鍛橈紝鎺ユ敹浜�
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HEmpID": data.HItemID,
+ "HEmpNumber": data.鑱屽憳浠ｇ爜,
+ "HEmpName": data.鑱屽憳鍚嶇О,
+ "HGroupID": data.鐝粍ID,
+ "HGroupName": data.鐝粍鍚嶇О
+ });
+ break;
+ //case "CGM":
+ // form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ // "HEmpID": data.HItemID,
+ // "HEmpNumber": data.鑱屽憳浠ｇ爜,
+ // "HEmpName": data.鑱屽憳鍚嶇О
+ // });
+ // break;
+ case "HWH":
+ var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
+ layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
+ break;
+ case "HSP":
+ 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="" 瀵瑰簲鐨勫��
+ "HProcID": data.HItemID,
+ "HProcName": data.宸ュ簭鍚嶇О,
+ "HProcNo": data.娴佹按鍙�,
+ "lngBillSubKey": data.hsubid,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
+ });
+ break;
+ case "WLM":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMaterID": data.HItemID,
+ "HMaterName": data.鐗╂枡鍚嶇О,
+ "HMaterNumber": data.鐗╂枡浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿
+ });
+ break;
+ case "PGM":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMaterID": data.HItemID,
+ "HMaterName": data.鐗╂枡鍚嶇О,
+ "HMaterNumber": data.鐗╂枡浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿
+ });
+ break;
+ }
//layer.close(index);
//set_InitGrid();
//table.render(option);
@@ -902,9 +907,10 @@
BasicInfo_KeyDown(sBillNo);
}
})
+
//鎿嶄綔鍛�
- $('#HEmpName').on('keydown', function (event) {
- var sBillNo = $('#HEmpName').val();
+ $('#HEmpNumber').on('keydown', function (event) {
+ var sBillNo = $('#HEmpNumber').val();
if (event.keyCode == 13) {
if (!HProcExchBillNoFlag) {
layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
@@ -924,7 +930,7 @@
BasicInfo_KeyDown2(sBillNo);
}
})
-
+
function BasicInfo_KeyDown(sBillNo) {
var index = layer.load();
var billType = sBillNo.substr(0, 3);
@@ -1002,7 +1008,7 @@
if (result.count == 1) {
var data = result.data[0];
- switch (billType) {
+ switch (billType) {
case "JYM":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HQCCheckID": data.HItemID,
@@ -1324,13 +1330,47 @@
BtnBF();
}
}
- if (data.Verify == "Y") {
- location.replace('MES_StationOutBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
- }
- else {
- //淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
- }
+
+ var HMaterID = $("#HMaterID").val();
+ var HWorkProcID = $("#HProcID").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill_Detail/get_Display2',
+ type: "GET",
+ data: { "HMaterID": HMaterID, "HWorkProcID": HWorkProcID, "HProcExchBillNo": HProcExchBillNo },
+ success: function (data1) {
+ if (data1.data.length > 1) {
+ var HBillNo = $("#HBillNo").val();
+ var HProcNo = $("#HProcNo").val();
+ var HPlanQty = $("#HPlanQty").val();
+ var HProcID = $("#HProcID").val();
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍑虹珯鏄庣粏'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1'
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //if (data.Verify == "Y") {
+ // location.replace('MES_StationOutBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ //}
+ //else {
+ // //淇濆瓨鍚庢祻瑙�
+ // ReRoadBillMain();
+ //}
}
else {
layer.close(index);
@@ -1358,16 +1398,25 @@
//#endregion
form.on('submit(Detail)', function (data) {
+ var HBillNo = $("#HBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HProcNo = $("#HProcNo").val();
+ var HPlanQty = $("#HPlanQty").val();
+ var HProcID = $("#HProcID").val();
+ var HMaterID = $("#HMaterID").val();
+ var HProcExchHinteID = $("#HProcExchHinteID").val();
+
layer.open({
type: 2
- , skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
, title: '鍑虹珯鏄庣粏'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: './MES_StationOutBill_PDA_Detail.html?OperationType=1&linterid='
- , end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1'
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
}
})
})
@@ -1415,6 +1464,11 @@
, resize: false
, cancel: function (index, layero) {
}
+ , end: function () {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {
// //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1430,7 +1484,7 @@
} else {
layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^', { icon: 7 });
//alert('璇峰厛杈撳叆娴佽浆鍗″彿!')
- }
+ }
});
//閫夋嫨鐢熶骇鐝粍寮圭獥
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 d1298c4..02d39ae 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"
@@ -65,6 +65,7 @@
<th>娴佹按鍙�</th>
<td class="bz_td">
<input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="娴佹按鍙�" style="border-radius:50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HBillNo_bak" id="HBillNo_bak" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
@@ -140,6 +141,18 @@
return vars;
}
var params = getUrlVars();
+ console.log(params);
+
+ $("#HBillNo_bak").val(params[params[0]]);
+ $("#HProcNo").val(params[params[2]]);
+ $("#HWorkProcName").val(params[params[4]]);
+ $("#HPlanQty").val(params[params[3]]);
+
+ var HProcExchBillNo = params[params[1]];
+ var HWorkProcID = params[params[4]];
+ var HMaterID = params[params[5]];
+ var HProcExchHinteID = params[params[6]];
+
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
@@ -159,7 +172,7 @@
get_DisplayTech(HBillNo);
}
} else {
- var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var OperationType = params[params[7]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
@@ -169,9 +182,10 @@
var option = [];
+ get_Display(HMaterID, HWorkProcID, HProcExchBillNo);
set_InitGrid();
- //澶村伐鍏锋爮浜嬩欢
+ //#region [澶村伐鍏锋爮浜嬩欢]
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -213,6 +227,12 @@
break;
}
});
+ //#endregion
+
+ //鎻愪氦鎸夐挳
+ form.on('submit(Saver)', function (data) {
+ Saver(data);
+ });
//#region 閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
@@ -230,8 +250,10 @@
})
//#endregion
- //琛屽唴浜嬩欢
+ //#region [琛屽唴浜嬩欢]
table.on('tool(mainTable)', function (obj) {
+ set_GridCellCheck(obj); //琛屽唴鑾峰彇鏁版嵁
+
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
@@ -246,18 +268,21 @@
});
}
});
+ //#endregion
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- //琛ㄥご
+ //琛ㄥご
columns = [ //琛ㄥご
//{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- { field: 'HProcID', title: '宸ヨ祫', width: 70 }
- , { field: 'HProcNumber', title: '鑱屽憳', width: 60 }
- , { field: 'HProcName', title: '宸ヤ环', width: 60 }
- , { field: 'HGroupID', title: '鏁伴噺', width: 60 }
- , { field: 'HGroupNumber', title: '鐢熶骇璧勬簮', width: 60 }
- , { type: 'numbers', title: '搴忓彿', totalRow: true, width: 50 }
+ { field: 'HMoney', title: '宸ヨ祫', width: 70 }
+ , { field: 'HWorkEmpID', title: '鑱屽憳ID', width: 60, hide: true }
+ , { field: 'HWorkName', title: '鑱屽憳', edit: 'text', event: "HWorkName" }
+ , { field: 'HProcPrice', title: '宸ヤ环', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 60, edit: 'text', totalRow: true}
+ , { field: 'HWorkSourceID', title: '鐢熶骇璧勬簮ID', width: 60, hide: true }
+ , { field: 'HWorkSourceName', title: '鐢熶骇璧勬簮', width: 60 }
+ , { type: 'numbers', title: '搴忓彿', width: 50 }
//, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -269,32 +294,142 @@
, cellMinWidth: 120
, height: 400
, cols: [columns]
- , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , done: function (res, curr, count) {
- option.data = res.data;
- //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
- $('.layui-form-select').find('input').unbind("blur");
- //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
- $('tr').each(function (e) {
- var $cr = $(this);
- var dataIndex = $cr.attr("data-index");
- $.each(option.data, function (index, value) {
- if (value.LAY_TNDEX == dataIndex) {
- $cr.find('input').val(value.HSupFlag);
+ //, totalRow: true
+ };
+ table.render(option);
+ }
+
+ //#region 鍔犺浇琛ㄥご
+ function get_Display(HMaterID, HWorkProcID, HProcExchBillNo) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationOutBill_Detail/get_Display2",
+ type: "GET",
+ data: { "HMaterID": HMaterID, "HWorkProcID": HWorkProcID, "HProcExchBillNo": HProcExchBillNo },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ //"HBillNo": data.鍗曟嵁鍙�
+ //, "HDate": formatDate(data.鏃ユ湡)
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": data[i].鐢熶骇璧勬簮鍚嶇О,
+ "HQty": 0, "HRate": 0, "HProcPrice": data[i].宸ヤ环, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
+ }
+ )
+ }
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鎻愪氦鏂规硶
+ function Saver(data) {
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ';' + sessionStorage["HUserName"];
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Cj_StationOutBill/AddBill_Detail", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //淇濆瓨鍚庢祻瑙�
+ //ReRoadBillMain();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+ function set_GridCellCheck(obj) {
+ var employeeBar;
+ var employeeName;
+ table.on('edit(mainTable)', function (obj) {
+ employeeBar = obj.value;
+ obj.update({
+ "HMoney": obj.data.HProcPrice * obj.data.HQty
+ })
+ $("#HPlanQty").focus();
+ $(document).on('keydown', '.layui-table-edit', function (event) {
+ if (event.keyCode == 13) {
+ var data = obj.data;
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
+ type: "GET",
+ async: false,
+ data: { "HBarCode": employeeBar, "HInterID": HProcExchHinteID, "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HPlanQty").focus();
+ obj.update({
+ "HWorkEmpID": result.data[0].HItemID,
+ "HWorkName": result.data[0].鑱屽憳鍚嶇О
+ })
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- });
- }
- , done: function (res, curr, count) {
+
+ setTimeout(function () {
+
+ }, 1000);
- }
- };
- option.data = [{
- "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": "",
- "HQty": 0, "HRate": 0, "HProcPrice": 0, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
- }];
- table.render(option);
-
+ obj.event = "";
+ return false;
+ }
+ })
+ });
}
//浠ヤ笂涓簂ayui妯″潡
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\345\215\241/Sc_ProcessExchangeBillList.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\345\215\241/Sc_ProcessExchangeBillList.html"
index 4b1d0e2..1f278ea 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\345\215\241/Sc_ProcessExchangeBillList.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\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -148,7 +148,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭杩斿伐</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Pg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Pg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>杩斿伐鐢宠</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Jl"><i class="layui-icon layui-icon-file-b"></i>杩斿伐璁板綍</button>
</div>
@@ -318,8 +318,8 @@
case 'get_Jl': get_Jl();
break
//宸ュ簭娲惧伐鍗�
- case 'get_Pg': get_Pg();
- break
+ //case 'get_Pg': get_Pg();
+ // break
};
});
table.on('toolbar(mainTable3)', function (obj) {
@@ -1014,35 +1014,35 @@
}
//宸ュ簭娲惧伐
- function get_Pg() {
- var checkStatus = table.checkStatus('mainTable2')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- if (checkStatus.data[0]["娴佹按鍙�"] != "9999") {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "宸ュ簭娲惧伐鍗曠紪杈�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["100%", "100%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + checkStatus.data[0]["HEntryID"], "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- } else {
- layer.msg('娲惧伐宸ュ簭涓嶈兘鏄浆宸ュ簭锛�');
- }
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
+ //function get_Pg() {
+ // var checkStatus = table.checkStatus('mainTable2')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // if (checkStatus.data[0]["娴佹按鍙�"] != "9999") {
+ // layer.open({
+ // type: 2
+ // , skin: "layui-layer-rim" //鍔犱笂杈规
+ // , title: "宸ュ簭娲惧伐鍗曠紪杈�" //鏍囬
+ // , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ // , shift: 2 //寮瑰嚭鍔ㄧ敾
+ // , area: ["100%", "100%"] //绐椾綋澶у皬
+ // , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ // , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + checkStatus.data[0]["HEntryID"], "yes"]
+ // , btn: ["纭畾", "鍙栨秷"]
+ // , btn1: function (index, laero) {
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // DisPlay_HideColumn();
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // layer.close(index);//鍏抽棴寮圭獥
+ // }
+ // })
+ // } else {
+ // layer.msg('娲惧伐宸ュ簭涓嶈兘鏄浆宸ュ簭锛�');
+ // }
+ // } else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ // }
+ //}
//#region 鏄剧ず鍒楁暟鎹� (涓诲垪琛�)
function DisPlay_HideColumn() {
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\345\215\241/Sc_ProcessExchangeIssueBillList.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\345\215\241/Sc_ProcessExchangeIssueBillList.html"
index c467ca5..e8895ea 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\345\215\241/Sc_ProcessExchangeIssueBillList.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\345\215\241/Sc_ProcessExchangeIssueBillList.html"
@@ -93,6 +93,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Issue"><i class="layui-icon layui-icon-file-b"></i>涓嬭揪</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelIssue"><i class="layui-icon layui-icon-file-b"></i>鍙嶄笅杈�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendWork"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_PlanDate"><i class="layui-icon layui-icon-file-b"></i>鎸囨淳鏃ユ湡</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-file-b"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -100,7 +101,7 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>-->
</div>
</script>
</form>
@@ -161,6 +162,9 @@
break;
//鍙嶄笅杈�
case 'set_CancelIssue': set_CancelIssue();
+ break;
+ //宸ュ簭娲惧伐
+ case 'set_SendWork': set_SendWork();
break;
//鎸囨淳鏃ユ湡
case 'set_PlanDate': set_PlanDate();
@@ -695,6 +699,47 @@
});
}
+ //宸ュ簭娲惧伐
+ function set_SendWork() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var array = [];
+ for (let i = 0; i < data.length; i++) {
+ array.push(checkStatus.data[i]["HEntryID"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
+
+ //鍒ゆ柇鍗曟嵁鍙锋槸鍚︾浉鍚�
+ if (checkStatus.data[0]["鍗曟嵁鍙�"] != checkStatus.data[i]["鍗曟嵁鍙�"]) {
+ layer.msg("鍕鹃�変簡涓嶅悓娴佽浆鍗″彿锛岃纭");
+ return;
+ }
+ }
+ var HEntryID = array.join(",");//鐢ㄩ�楀彿鍒嗗壊鏁扮粍
+ if (checkStatus.data.length >= 1) {
+ if (checkStatus.data[0]["娴佹按鍙�"] != "9999") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ュ簭娲惧伐鍗曠紪杈�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["100%", "100%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + HEntryID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ } else {
+ layer.msg('娲惧伐宸ュ簭涓嶈兘鏄浆宸ュ簭锛�');
+ }
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁缂栬緫锛�');
+ }
+ }
//#region 鎸囨淳鏃ユ湡
function set_PlanDate() {
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\345\215\241/Sc_ProcessSendWorkEdit.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\345\215\241/Sc_ProcessSendWorkEdit.html"
index eac6675..96596a5 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\345\215\241/Sc_ProcessSendWorkEdit.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\345\215\241/Sc_ProcessSendWorkEdit.html"
@@ -74,177 +74,63 @@
</div>
</div>
<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">浠诲姟鍗曞彿</label>
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+ <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkShop" id="btnSearchWorkShop" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">宸ュ簭璁″垝鍗曞彿</label>
+ <label class="layui-form-label">鐢熶骇缁勭粐</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcPlanBillNo" id="HProcPlanBillNo" style="background-color:#efefef4d;" readonly>
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">閿�鍞鍗曞彿</label>
+ <!--<div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鐢熶骇缁勭粐</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" value="0">
- <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" value="0">
+ <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchORG" id="btnSearchORG" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3 layui-inline" >
+ </div>-->
+ <div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
<input type="date" class="layui-input" name="HDate" id="HDate">
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">宸ュ簭璁″垝<br>寮�宸ユ棩鏈�</label>
- <div class="layui-input-inline" >
- <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">宸ュ簭璁″垝<br>瀹屽伐鏃ユ湡</label>
- <div class="layui-input-inline" >
- <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline" >
- <label class="layui-form-label">鎵瑰彿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
</div>
<div class="layui-row">
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">宸ュ簭浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcNumber" id="HProcNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HProcID" id="HProcID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">宸ュ簭鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">閮ㄩ棬浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HDeptNumber" id="HDeptNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HDeptID" id="HDeptID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDep" id="btnSearchDep" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">浜у搧浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">宸ュ簭璁″垝<br>鐢熶骇鏁伴噺</label>
- <div class="layui-input-inline" >
- <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鐝粍浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HGroupNumber" id="HGroupNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HGroupID" id="HGroupID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchGroup" id="btnSearchGroup" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鐝粍鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍗曚綅浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HUnitNumber" id="HUnitNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HUnitID" id="HUnitID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchUnit" id="btnSearchUnit" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍗曚綅鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
-
-
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;" readonly>
- </div>
- <!--宸ヨ壓璺嚎ID-->
- <div class="layui-input-inline">
- <input type="hidden" name="HRoutingInterID" id="HRoutingInterID" value="0">
+ <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;">
</div>
</div>
- <div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:537px;">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" style="background-color:#efefef4d;">
</div>
</div>
- </div>
+ <div class="layui-col-xs3 layui-inline" style="display:none">
+ <label class="layui-form-label">婧愬崟淇℃伅</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
+ </div>
+ </div>
+ </div>
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -369,6 +255,9 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
+ //鑾峰彇缁勭粐
+ Organ();
+
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
var OperationType = -1;//鎿嶄綔绫诲瀷
@@ -383,7 +272,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3712' },
+ data: { "HBillType": '3798' },
success: function (d) {
//$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
@@ -391,33 +280,21 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
-
//鏌ヨ宸ュ簭娴佽浆鍗�
get_ProcessExchange();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
} else if (OperationType == 3) {
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
RoadBillMain(linterid);
}
//#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- //閫夋嫨璐熻矗浜�
- form.on('submit(btnHEmpID)', function () {
- get_btnHEmpID();
- });
-
- //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
- form.on('select(HSupFlag)', function (data) {
- //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
- var elem = data.othis.parents('tr');
- var dataindex = elem.attr("data-index");
- $.each(option.data, function (index, value) {
- if (value.LAY_TABLE_INDEX == dataindex) {
- value.HSupFlag = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
- }
- });
- });
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -425,11 +302,10 @@
, 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
+ "HProcNo": 0, "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
+ "HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
+ "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
+ "HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0
};
switch (obj.event) {
@@ -512,19 +388,19 @@
}
});
}
-
+ //#region [ 琛ㄤ綋F7浜嬩欢 ]
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event == 'HProcCheck') {
+ if (obj.event == 'HMaterCheck') {
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '宸ュ簭鍒楄〃',
+ title: '浜у搧鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -534,9 +410,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HProcName: checkStatus.data[0].宸ュ簭
- , HProcID: checkStatus.data[0].HItemID
- , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ HMaterName: checkStatus.data[0].HName
+ , HMaterID: checkStatus.data[0].HItemID
+ , HMaterNumber: checkStatus.data[0].HNumber
});
layer.close(layer.index);
@@ -548,6 +424,72 @@
}
});
}
+ if (obj.event == 'HUnitCheck') {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁￠噺鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HUnitName: checkStatus.data[0].HName
+ , HUnitID: checkStatus.data[0].HItemID
+ , HUnitNumber: checkStatus.data[0].HNumber
+ });
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HSourceCheck') {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇璧勬簮鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HSourceName: checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ , HSourceID: checkStatus.data[0].HItemID
+ , HSourceNumber: checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
+ });
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
if (obj.event == 'HGroupCheck') {
layer.open({
type: 2,
@@ -619,27 +561,8 @@
return false;
}
})
- //鍗曞嚮鏀瑰彉涓嶅彲缂栬緫鍊�
- if (obj.event === 'isEditCheck') {
- var flag = obj.data.isEdit;
- var flagValue = obj.data.isEditValue;
- if (flagValue === "false") {
- flagValue = "true";
- flag = "鏄�";
- }
- else if (flagValue === "true") {
- flagValue = "false";
- flag = "鍚�";
- }
- else {
- flagValue = "false";
- flag = "鍚�";
- }
- obj.update({
- isEdit: flag
- , isEditValue: flagValue
- });
- }
+ //#endregion
+
});
//淇濆瓨鎻愪氦
@@ -656,16 +579,16 @@
}
});
- //閫夋嫨宸ュ簭寮圭獥
- form.on('submit(btnSearchProc)', function () {//宸ュ簭
+ //閫夋嫨鐢熶骇杞﹂棿寮圭獥
+ form.on('submit(btnSearchWorkShop)', function () {
layer.open({
type: 2
, area: ['80%', '80%']
- , title: '宸ュ簭'
+ , title: '鐢熶骇杞﹂棿'
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -675,9 +598,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
- $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
- $("#HProcID").val(checkStatus.data[0].HItemID);
+ $("#HWorkShopName").val(checkStatus.data[0].HName);
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -693,155 +615,69 @@
})
});
- //閫夋嫨閮ㄩ棬寮圭獥
- form.on('submit(btnSearchDep)', function () {//閮ㄩ棬
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '閮ㄩ棬'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
+ //鎵撳嵃
+ form.on('submit(btn_print)', function () {//浜у搧
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
+ var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and 鍗曟嵁鍙�='" + $("#HBillNo").val() + "' ";
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var hinterid = "";
+ if (data1.data.length != 0) {
+ hinterid = data1.data[0]["hmainid"];
+ }
+ layer.close(ajaxLoad);
+
+ if (hinterid != "") {
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcessExchangeBillList/QJQD',
+ type: "GET",
+ data: { "HProcExchHinteID": hinterid },
+ success: function (res) {
+ if (res.count == 1) {
+ if (res.data.length != 0) {
+ hinterid += ",1";
+ } else {
+ hinterid += ",0";
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hinterid + '&MyMsg=' + hinterid + '&Type=HProcessExchange', 'yes']
+ , resize: false
+ })
+
+ } else {
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+
+ } else {
+ layer.msg("璇峰厛淇濆瓨,鍦ㄨ繘琛屾墦鍗�!");
+ }
+ } else {
+ layer.close(ajaxLoad);
}
- $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠ｇ爜);
- $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
- $("#HDeptID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
+ });
- },
- success: function (layero, index) {
-
- }
- })
});
-
- //閫夋嫨鐝粍寮圭獥
- form.on('submit(btnSearchGroup)', function () {//鐝粍
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐝粍'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HGroupNumber").val(checkStatus.data[0].鐝粍浠ｇ爜);
- $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
- $("#HGroupID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- })
- });
-
- //閫夋嫨浜у搧寮圭獥
- form.on('submit(btnSearchMater)', function () {//浜у搧
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '浜у搧'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
- $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
- $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
- $("#HMaterID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- })
- });
-
- //閫夋嫨鍗曚綅寮圭獥
- form.on('submit(btnSearchUnit)', function () {//鍗曚綅
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鍗曚綅'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HUnitNumber").val(checkStatus.data[0].HNumber);
- $("#HUnitName").val(checkStatus.data[0].HName);
- $("#HUnitID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- })
- });
-
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -854,41 +690,60 @@
set_InitGrid();
}
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
//琛ㄥご
columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HProcID', title: '宸ュ簭ID', hide: true }
- , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
- , { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
- , { field: 'HGroupID', title: '鐝粍ID', hide: true }
- , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', event: "HGroupCheck" }
- , { field: 'HGroupName', title: '鐝粍鍚嶇О' }
+ , { field: 'HProcNo', title: '娴佹按鍙�' }
+ , { field: 'HMaterID', title: '浜у搧ID', hide: true }
+ , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜', edit: 'text', event: "HMaterCheck" }
+ , { field: 'HMaterName', title: '浜у搧鍚嶇О' }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', hide: true }
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: "HUnitCheck" }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О' }
+ , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', hide: true }
+ , { field: 'HSourceNumber', title: '鐢熶骇璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
+ , { field: 'HSourceName', title: '鐢熶骇璧勬簮鍚嶇О' }
, { field: 'HWorkerID', title: '鎿嶄綔宸D', hide: true }
, { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck" }
, { field: 'HWorkerName', title: '鎿嶄綔宸ュ悕绉�' }
- , { field: 'HQty', title: '娲惧伐鏁伴噺', edit: 'text' }
- , { field: 'HPlanBeginDate', title: '璁″垝寮�宸ユ棩鏈�', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
- , { field: 'HPlanEndDate', title: '璁″垝瀹屽伐鏃ユ湡', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
- , { field: 'HPlanTimes', title: '璁″垝宸ユ椂', edit: 'text' }
- , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富ID', hide: true }
- , { field: 'HSeOrderEntryID', title: '閿�鍞瓙ID', hide: true }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿' }
- , { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿' }
+ , { field: 'HGroupID', title: '鐝粍ID', hide: true }
+ , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', event: "HGroupCheck" }
+ , { field: 'HGroupName', title: '鐝粍鍚嶇О' }
+ , { field: 'HPlanQty', title: '娴佽浆鍗℃暟閲�' }
+ , { field: 'HQty', title: '娲惧伐鏁伴噺', edit: 'text'}
+ , { field: 'HBatchNo', title: '鎵规', edit: 'text' }
+ , { field: 'HPlanBeginDate', title: '瑕佹眰寮�宸ユ棩鏈�', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
+ , { field: 'HPlanEndDate', title: '瑕佹眰瀹屽伐鏃ユ湡', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
+ , { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿', hide: true }
, { field: 'HICMOInterID', title: '浠诲姟鍗旾D', hide: true }
- , { field: 'HProcPlanInterID', title: '宸ュ簭璁″垝鍗旾D', hide: true }
- , { field: 'HProcPlanEntryID', title: '宸ュ簭璁″垝鍗曞瓙ID', hide: true }
- , { field: 'HProcPlanBillNo', title: '宸ュ簭璁″垝鍗曞彿' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text'}
- , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛怚D', hide: true }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 130 }
- , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text' }
- , { field: 'HRelationMoney', title: '鍏宠仈閲戦', edit: 'text' }
+ , { field: 'HICMOEntryID', title: '浠诲姟鍗曞瓙鍐呯爜', hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
- ];
+ ];
option = {
id: 'mainTable'
, elem: '#mainTable'
@@ -918,78 +773,47 @@
}
};
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
+ "HProcNo": 0, "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
+ "HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
+ "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
+ "HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0
}];
table.render(option);
- }
-
- //璐熻矗浜�
- function get_btnHEmpID() {
- layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鑱屽憳琛�'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- //鑾峰彇鏁版嵁
- $("#HEmpID").val(checkStatus.data[0].HItemID);//璐熻矗浜篿d
- $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//璐熻矗浜哄悕绉�
-
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- })
- }
+ }
//鏌ヨ宸ュ簭娴佽浆鍗�
function get_ProcessExchange() {
- var sWhere = " where hmainid=" + linterid + " and (HEntryID=" + HEntryID + " or HEntryID>" + HEntryID + ") ";
+ var sWhere = " where hmainid=" + linterid + " and HEntryID in (" + HEntryID + ")";
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_ProcExchWorkBackBill/GetProcessExchangeBillSub',
+ url: GetWEBURL() + 'Sc_ProcExchSendWorkBill/GetProcessExchangeBillSub',
type: "GET",
data: { "sWhere": sWhere },
success: function (result) {
if (result.count == 1) {
- $("#HProcNumber").val(result.data[0]["宸ュ簭浠ｇ爜"]);
- $("#HProcID").val(result.data[0]["HProcID"]);
- $("#HProcName").val(result.data[0]["宸ュ簭鍚嶇О"]);
- $("#HMaterNumber").val(result.data[0]["浜у搧浠ｇ爜"]);
- $("#HMaterID").val(result.data[0]["HMaterID"]);
- $("#HMaterName").val(result.data[0]["浜у搧鍚嶇О"]);
- $("#HMaterModel").val(result.data[0]["瑙勬牸鍨嬪彿"]);
- //$("#HGroupID").val(result.data[0]["HGroupID"]);
- //$("#HGroupNumber").val(result.data[0]["鐝粍浠ｇ爜"]);
- //$("#HGroupName").val(result.data[0]["鐝粍"]);
- $("#HUnitID").val(result.data[0]["HUnitID"]);
- $("#HUnitNumber").val(result.data[0]["鍗曚綅浠ｇ爜"]);
- $("#HUnitName").val(result.data[0]["鍗曚綅"]);
- $("#HPlanQty").val(result.data[0]["鐢熶骇鏁伴噺"]);
- $("#HICMOBillNo").val(result.data[0]["浠诲姟鍗曞彿"]);
- $("#HICMOInterID").val(result.data[0]["hicmointerid"]);
-
+ $("#HWorkShopName").val(result.data[0]["鐢熶骇杞﹂棿"]);
+ $("#HWorkShopID").val(result.data[0]["HWorkShopID"]);
+ $("#HPRDORGName").val(result.data[0]["缁勭粐"]);
+ $("#HPRDORGID").val(result.data[0]["HPRDORGID"]);
+ //$("#HICMOBillNo").val(result.data[0]["浠诲姟鍗曞彿"]);
+ //$("#HICMOInterID").val(result.data[0]["hicmointerid"]);
+ //$("#HICMOEntryID").val(result.data[0]["HICMOEntryID"]);
+ $("#HMainSourceBillType").val(result.data[0]["婧愬崟绫诲瀷"]);
+ $("#HMainSourceInterID").val(result.data[0]["婧愬崟涓诲唴鐮�"]);
+ $("#HMainSourceEntryID").val(result.data[0]["婧愬崟瀛愬唴鐮�"]);
+ $("#HMainSourceBillNo").val(result.data[0]["娴佽浆鍗″彿"]);
+ //$("#HExplanation").val(result.data[0]["鎽樿"]);
+ //$("#HRemark").val(result.data[0]["琛ㄥご澶囨敞"]);
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < result.data.length; i++) {
rowdata.push(
{
- "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
- "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": "", "HPlanEndDate": "",
- "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": result.data[0]["浠诲姟鍗曞彿"], "HICMOInterID": 0,
- "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
- "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": result.data[0]["鍗曟嵁鍙�"], "HRelationQty": 0, "HRelationMoney": 0
+ "HProcNo": result.data[i]["娴佹按鍙�"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HUnitID": result.data[i]["HUnitID"], "HUnitNumber": result.data[i]["鍗曚綅浠ｇ爜"], "HUnitName": result.data[i]["鍗曚綅"],
+ "HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠ｇ爜"], "HSourceName": result.data[i]["鐢熶骇璧勬簮"], "HWorkerID": result.data[i]["HWorkerID"], "HWorkerNumber": result.data[i]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[i]["鎿嶄綔宸�"],
+ "HGroupID": result.data[i]["HGroupID"], "HGroupNumber": result.data[i]["鐝粍浠ｇ爜"], "HGroupName": result.data[i]["鐝粍"], "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": 0, "HBatchNo": result.data[i][""], "HPlanBeginDate": new Date(),
+ "HPlanEndDate": new Date(), "HICMOBillNo": result.data[i]["浠诲姟鍗曞彿"], "HICMOInterID": result.data[i]["hicmointerid"], "HICMOEntryID": result.data[i]["HICMOEntryID"]
}
)
}
@@ -1030,7 +854,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_ProcessSendWork/SaveProcessSendWork",
+ url: GetWEBURL() + "/Sc_ProcExchSendWorkBill/SaveProcessSendWork",
async: true,
data: { "msg": sMainSub },
dataType: "json",
@@ -1057,73 +881,34 @@
{
var sWhere = " and hmainid=" + linterid;
$.ajax({
- url: GetWEBURL() + "/Sc_ProcessSendWork/Sc_ProcessSendWorkList",
+ url: GetWEBURL() + "/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList",
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- success: function (d) {
- if (d.count == 1) {
- //涓昏〃
- $("#HBillNo").val(d.data[0]["鍗曟嵁鍙�"]);
- $("#HInterID").val(d.data[0]["hmainid"]);
- $("#HDate").val(Format(d.data[0]["鏃ユ湡"], "yyyy-MM-dd"));
- $("#HICMOBillNo").val(d.data[0]["鐢熶骇浠诲姟鍗曞彿"]);
- $("#HICMOInterID").val(d.data[0]["HICMOInterID"]);
- $("#HSeOrderBillNo").val(d.data[0]["閿�鍞鍗曞彿"]);
- $("#HSeOrderInterID").val(d.data[0]["HSeOrderInterID"]);
-
- //$("#HMaterNumber").val(d.data[0]["浜у搧浠ｇ爜"]);
- //$("#HMaterID").val(d.data[0]["HMaterID"]);
- //$("#HMaterName").val(d.data[0]["浜у搧鍚嶇О"]);
- //$("#HModel").val(d.data[0]["瑙勬牸鍨嬪彿"]);
- //$("#HUnitID").val(d.data[0]["HUnitID"]);
- //$("#HUnitName").val(d.data[0]["鍗曚綅"]);
- //$("#HPlanQty").val(d.data[0]["璁㈠崟鏁伴噺"]);
- //$("#HQty").val(d.data[0]["杩斿伐鏁伴噺"]);
- //$("#HProcBegName").val(d.data[0]["杩斿伐寮�濮嬪伐搴�"]);
- //$("#HProcBegID").val(d.data[0]["HProcBegID"]);
- //$("#HProcEndName").val(d.data[1]["杩斿伐缁撴潫宸ュ簭"]);
- //$("#HProcEndID").val(d.data[1]["HProcEndID"]);
- //$("#HProcExchBegNO").val(d.data[0]["杩斿伐寮�濮嬫祦姘村彿"]);
- //$("#HProcExchEndNO").val(d.data[1]["杩斿伐缁撴潫娴佹按鍙�"]);
- //$("#HPRDORGID").val(d.data[0]["HPRDORGID"]);
- //$("#HPRDORGName").val(d.data[0]["缁勭粐"]);
- //$("#HICMOBillNo").val(d.data[0]["鐢熶骇璁㈠崟鍙�"]);
- //$("#HICMOInterID").val(d.data[0]["HICMOInterID"]);
- //$("#HICMOEntryID").val(d.data[0]["HICMOEntryID"]);
- //$("#HOrderProcNO").val(d.data[0]["璁㈠崟璺熻釜鍙�"]);
- //$("#HInnerBillNo").val(d.data[0]["鍐呴儴鍗曟嵁鍙�"]);
- //$("#HRemark").val(d.data[0]["琛ㄥご澶囨敞"]);
- //$("#HMakeDate").val(d.data[0]["鍒跺崟浜�"] == "" ? "" : Format(d.data[0]["鍒跺崟鏃ユ湡"], "yyyy-MM-dd"));
- //$("#HMaker").val(d.data[0]["鍒跺崟浜�"]);
- //$("#HCheckDate").val(d.data[0]["瀹℃牳浜�"] == "" ? "" : Format(d.data[0]["瀹℃牳鏃ユ湡"], "yyyy-MM-dd"));
- //$("#HChecker").val(d.data[0]["瀹℃牳浜�"]);
- //$("#HCloseDate").val(d.data[0]["鍏抽棴浜�"] == "" ? "" : Format(d.data[0]["鍏抽棴鏃ユ湡"], "yyyy-MM-dd"));
- //$("#HCloseMan").val(d.data[0]["鍏抽棴浜�"]);
- //$("#HUpDateDate").val(d.data[0]["淇敼浜�"] == "" ? "" : Format(d.data[0]["淇敼鏃ユ湡"], "yyyy-MM-dd"));
- //$("#HUpDater").val(d.data[0]["淇敼浜�"]);
- //$("#HDeleteDate").val(d.data[0]["浣滃簾浜�"] == "" ? "" : Format(d.data[0]["浣滃簾鏃ユ湡"], "yyyy-MM-dd"));
- //$("#HDeleteMan").val(d.data[0]["浣滃簾浜�"]);
+ success: function (result) {
+ if (result.count == 1) {
+ //涓昏〃
+ $("#HBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+ $("#HInterID").val(result.data[0]["hmainid"]);
+ $("#HWorkShopName").val(result.data[0]["鐢熶骇杞﹂棿"]);
+ $("#HWorkShopID").val(result.data[0]["鐢熶骇杞﹂棿ID"]);
+ $("#HPRDORGName").val(result.data[0]["缁勭粐"]);
+ $("#HPRDORGID").val(result.data[0]["缁勭粐ID"]);
+ $("#HExplanation").val(result.data[0]["鎽樿"]);
+ $("#HRemark").val(result.data[0]["琛ㄥご澶囨敞"]);
var rowdata = [];
- for (var i = 0; i < d.data.length; i++) {
+ for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
rowdata.push({
- "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
+ "HProcNo": result.data[0]["娴佹按鍙�"], "HMaterID": result.data[0]["浜у搧ID"], "HMaterNumber": result.data[0]["浜у搧浠ｇ爜"], "HMaterName": result.data[0]["浜у搧鍚嶇О"], "HUnitID": result.data[0]["鍗曚綅ID"], "HUnitNumber": result.data[0]["璁￠噺鍗曚綅浠ｇ爜"], "HUnitName": result.data[0]["璁￠噺鍗曚綅鍚嶇О"],
+ "HSourceID": result.data[0]["鐢熶骇璧勬簮ID"], "HSourceNumber": result.data[0]["鐢熶骇璧勬簮浠ｇ爜"], "HSourceName": result.data[0]["鐢熶骇璧勬簮鍚嶇О"], "HWorkerID": result.data[0]["鎿嶄綔宸D"], "HWorkerNumber": result.data[0]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[0]["鎿嶄綔宸ュ悕绉�"],
+ "HGroupID": result.data[0]["鐝粍ID"], "HGroupNumber": result.data[0]["鐝粍浠ｇ爜"], "HGroupName": result.data[0]["鐝粍鍚嶇О"], "HPlanQty": result.data[0]["娴佽浆鍗℃暟閲�"], "HQty": result.data[0]["娲惧伐鏁伴噺"], "HBatchNo": result.data[0]["鎵规"], "HPlanBeginDate": result.data[0]["瑕佹眰寮�宸ユ棩鏈�"],
+ "HPlanEndDate": result.data[0]["瑕佹眰瀹屽伐鏃ユ湡"]
});
}
option.data = rowdata;
- table.render(option);
-
- for (var i = 0; i < d.data.length; i++) {
- //濮斿鏍囪
- $('#HSupFlag' + (i + 1)).find("option[value='" + d.data[i].濮斿鏍囪 + "']").attr("selected", true);
- }
- form.render('select');
+ table.render(option);
} else {
layer.msg(result.code + result.Message, { icon: 5 });
}
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\345\215\241/Sc_ProcessSendWorkList.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\345\215\241/Sc_ProcessSendWorkList.html"
index c6f2cfa..1d0c2ed 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\345\215\241/Sc_ProcessSendWorkList.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\345\215\241/Sc_ProcessSendWorkList.html"
@@ -229,7 +229,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_ProcessSendWork/Sc_ProcessSendWorkList',
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -336,7 +336,7 @@
sWhere += " and 浜у搧浠ｇ爜 like '%" + HMaterName + "%'";
}
if (HDeptName && HDeptName != "0") {
- sWhere += " and HWorkShopID = '" + HDeptName + "'";
+ sWhere += " and 鐢熶骇杞﹂棿ID = '" + HDeptName + "'";
}
if (HProcExchBillNo) {
sWhere += " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'";
@@ -388,7 +388,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鐢熶骇璁㈠崟缂栬緫'
+ , title: '宸ュ簭娲惧伐鍗曠紪杈�'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
, end: function () {
@@ -411,7 +411,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + '/Sc_ProcessSendWork/DelProcessSendWork',
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/DelProcessSendWork',
type: "GET",
data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
success: function (result) {
--
Gitblit v1.9.1