From 16fb2995c39f0b2ee0329530843e3002ab95da8d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 20 五月 2022 15:26:44 +0800
Subject: [PATCH] 功能完善
---
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 48 ++++--
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 5
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 5
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 5
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html | 5
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html | 84 ++++++-----
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 68 ++++----
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 78 +++++-----
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html | 29 ++--
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html | 5
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | 5
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html | 32 ++--
12 files changed, 189 insertions(+), 180 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index 8806b7a..d127421 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -391,7 +391,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -406,7 +406,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -414,7 +413,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index ea6df00..38a3fc1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -284,11 +284,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -303,7 +301,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -887,9 +885,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList",
type: "GET",
@@ -912,42 +910,49 @@
, "HExplanation": d.data[0].鎽樿
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
- , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[0].瀛愯〃閲囪喘缁勭粐
- , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�
- , "HDayPlanBillNo": d.data[0].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
- , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[0].HWorkShopID
- , "HWorkShopIDName": d.data[0].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[0].鍙敤閲囪喘鏁伴噺
- , "HPOOrderInterID": d.data[0].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[0].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[0].閲囪喘璁㈠崟鍙�
- , "HPOOrderBillSEQ": d.data[0].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[0].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[0].濮斿璁㈠崟瀛愬唴鐮�
- , "HWWOrderBillNo": d.data[0].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[0].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[0].閲囪喘閮ㄩ棬
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[0].閫佽揣鍗曟暟閲�
- , "HReciveQty": d.data[0].鏀舵枡鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿
- , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[0].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[0].閲囪喘璁㈠崟浜よ揣鏃ユ湡),'yyyy-MM-dd')
- , "HPOOrderBillRemark": d.data[0].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[0].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HLaterReason": d.data[i].寤惰繜鍘熷洜, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[i].瑙勬牸鍨嬪彿, "HUnitID": d.data[i].HUnitID, "HUnitIDName": d.data[i].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[i].鐗╂枡灞炴��, "HQty": d.data[i].鏁伴噺, "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[i].瀛愯〃閲囪喘缁勭粐
+ , "HStatus": d.data[i].鐘舵��, "HFixleadTime": d.data[i].鎻愬墠鏈�
+ , "HDayPlanBillNo": d.data[i].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[i].婧愬崟ID, "HSourceEntryID": d.data[i].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[i].婧愬崟鍗曞彿, "HSourceBillType": d.data[i].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[i].HWorkShopID
+ , "HWorkShopIDName": d.data[i].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[i].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[i].鍙敤閲囪喘鏁伴噺
+ , "HPOOrderInterID": d.data[i].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[i].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[i].閲囪喘璁㈠崟鍙�
+ , "HPOOrderBillSEQ": d.data[i].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[i].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[i].濮斿璁㈠崟瀛愬唴鐮�
+ , "HWWOrderBillNo": d.data[i].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[i].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[i].閲囪喘閮ㄩ棬
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[i].閫佽揣鍗曟暟閲�
+ , "HReciveQty": d.data[i].鏀舵枡鏁伴噺, "HCloseStatus": d.data[i].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[i].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[i].閿�鍞鍗曞彿
+ , "HUnReciveQty": d.data[i].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[i].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[i].閲囪喘璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd')
+ , "HPOOrderBillRemark": d.data[i].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[i].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ for (var i = 0; i < d.data.length; i++) {
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub'+(i+1)).attr("checked", true);
+ }
- //鍏抽棴鐘舵��
- if (d.data[0].鍏抽棴鐘舵�� == "1") {
- $('#HCloseStatus1').attr("checked", true);
+ //鍏抽棴鐘舵��
+ if (d.data[i].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus' + (i + 1)).attr("checked", true);
+ }
+
+
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + (i + 1)).find("option[value='" + d.data[i].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ $('#HErpClsID' + (i + 1)).find("option[value='" + d.data[i].鐗╂枡灞炴�� + "']").attr("selected", true);
+ $('#HPURCHASEORGIDSub' + (i + 1)).find("option[value='" + d.data[i].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
+ $('#HStatus' + (i + 1)).find("option[value='" + d.data[i].鐘舵�� + "']").attr("selected", true);
+
}
form.render('checkbox');
-
- //寤惰繜鍘熷洜
- $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
- $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
- $('#HPURCHASEORGIDSub1').find("option[value='" + d.data[0].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
- $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
form.render('select');
}
})
@@ -972,8 +977,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index 8bd1324..6b3a93d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -398,7 +398,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝淇℃伅鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -413,7 +413,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -421,7 +420,7 @@
, area: ['100%', '100%']
, title: '鎻愭枡璁″垝淇℃伅鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
index 19ccd2f..cadb713 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -145,11 +145,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -163,7 +161,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -255,7 +253,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1 ) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -410,9 +408,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
type: "GET",
@@ -426,15 +424,17 @@
, "HPRDORGID": d.data[0].缁勭粐
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[0].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
- , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
- , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HSupplierID": d.data[i].HSupplierID, "HSupplierNumber": d.data[i].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[i].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О, "HMaterModel": d.data[i].瑙勬牸鍨嬪彿
+ , "HJITMaterGroup": d.data[i].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[i].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[i].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[i].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[i].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+ , "HLeadTime": d.data[i].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[i].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[i].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[i].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- form.render('select');
}
})
}
@@ -453,8 +453,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
index e29c983..203ffc5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
@@ -340,7 +340,7 @@
, area: ['100%', '100%']
, title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -355,7 +355,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -363,7 +362,7 @@
, area: ['100%', '100%']
, title: '杞﹂棿浠撳簱瀵圭収鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
index 980d784..e0d47b1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -143,11 +143,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -161,7 +159,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -241,7 +239,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -250,7 +248,9 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData()) {
+ set_AddNew(data);
+ }
});
//鐩戝惉鎻愪氦
@@ -272,7 +272,7 @@
//缁勭粐閫夋嫨椤甸潰
function get_Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -395,9 +395,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/ComplementGoodBillList",
type: "GET",
@@ -410,15 +410,16 @@
, "HInterID": d.data[0].hmainid
, "HPRDORGID": d.data[0].缁勭粐
});
-
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿浠ｇ爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HWHID": d.data[0].HWHID
- , "HWHNumber": d.data[0].浠撳簱浠ｇ爜, "HWHName": d.data[0].浠撳簱鍚嶇О, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
- option.data = rowdata;
- table.render(option);
- form.render('select');
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].杞﹂棿浠ｇ爜, "HWorkShopName": d.data[i].杞﹂棿鍚嶇О, "HWHID": d.data[i].HWHID
+ , "HWHNumber": d.data[i].浠撳簱浠ｇ爜, "HWHName": d.data[i].浠撳簱鍚嶇О, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ option.data = rowdata;
+ table.render(option);
+ }
}
})
}
@@ -437,8 +438,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';'+ OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -464,6 +464,16 @@
});
}
+ //闈炵┖楠岃瘉
+ function AllowLoadData() {
+
+ if ($("#HPRDORGID").val() == "0") {
+ layer.msg("缁勭粐娌℃湁閫夋嫨");
+ return false;
+ }
+ return true;
+ }
+
//#endregion
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
index fbaadbd..2e78e14 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
@@ -398,7 +398,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝淇℃伅鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -413,7 +413,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -421,7 +420,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝淇℃伅鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
index 6d6dfee..7516e6c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
@@ -145,16 +145,14 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '4611' },
+ data: { "HBillType": '4615' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -163,7 +161,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -255,7 +253,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -410,9 +408,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/NeedMaterPlanConfigBillList",
type: "GET",
@@ -425,16 +423,17 @@
, "HInterID": d.data[0].hmainid
, "HPRDORGID": d.data[0].缁勭粐
});
-
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿缂栫爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
- , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
- , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].杞﹂棿缂栫爜, "HWorkShopName": d.data[i].杞﹂棿鍚嶇О, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О, "HMaterModel": d.data[i].瑙勬牸鍨嬪彿
+ , "HJITMaterGroup": d.data[i].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[i].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[i].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[i].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[i].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+ , "HLeadTime": d.data[i].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[i].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[i].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[i].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- form.render('select');
}
})
}
@@ -453,8 +452,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index a479d5e..1dee345 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -582,11 +582,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -601,7 +599,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -1191,7 +1189,7 @@
if (table.cache["mainTable"][i] != "") {
//鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
if (table.cache["mainTable"][i].HEntryCloseDate == "") {
- table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01 00:00:00.000"
+ table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01"
}
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
@@ -1201,8 +1199,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -1229,15 +1226,14 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (d) {
-
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": d.data[0].鍗曟嵁鍙�
@@ -1293,7 +1289,7 @@
, "HSourceBillNo": d.data[0].婧愬崟缂栧彿
, "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟鏄庣粏鍐呯爜
, "HMainInterID": d.data[0].瀵煎叆鎺掍骇ID
- , "HProdORGID": d.data[0].鐢熶骇缁勭粐
+ , "HProdORGID": d.data[0].HProdORGID
, "HLeftPlanQty": d.data[0].鏈帓鏁伴噺
, "HEmpID": d.data[0].HEmpID
, "HEmpIDName": d.data[0].鑱屽憳
@@ -1309,15 +1305,17 @@
, "HHangUp": d.data[0].鎸傝捣鏍囪 == "0" ? false : true
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HMasterDate": Format(new Date(d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
- , "HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[0].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[0].缁撴潫鏃堕棿), "yyyy-MM-dd")
- , "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[0].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate":Format(new Date(d.data[0].瀛愬叧闂椂闂�), "yyyy-MM-dd")
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": d.data[0].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[0].鏄惁榻愬
- , "HStatusTag": d.data[0].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[0].鎵嬪伐淇敼鏍囪 == 0 ? false : true
- }];
-
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ rowdata.push({
+ "HMasterDate": Format(new Date(d.data[i].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[i].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[i].姹囨姤瀹屾垚鏁伴噺
+ , "HTimes": d.data[i].鍓╀綑宸ユ椂, "HUseTimes": d.data[i].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[i].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[i].缁撴潫鏃堕棿), "yyyy-MM-dd")
+ , "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[i].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), "yyyy-MM-dd")
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[i].Excel鍒楀ご, "HLockedSub": d.data[i].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[i].鏄惁榻愬
+ , "HStatusTag": d.data[i].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[i].鎵嬪伐淇敼鏍囪 == 0 ? false : true
+ });
+ }
option.data = rowdata;
table.render(option);
@@ -1329,25 +1327,27 @@
if (d.data[0].鎸傝捣鏍囪 == "1") {
$("#checkboxHHangUp").attr("checked", true);
}
+ for (var i = 0; i < d.data.length; i++) {
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
+ }
- //閿佸畾鏍囪
- if (d.data[0].瀛愰攣瀹氭爣璁� == "1") {
- $('#HLockedSub1').attr("checked", true);
- }
+ //閿佸畾鏍囪
+ if (d.data[i].瀛愰攣瀹氭爣璁� == "1") {
+ $('#HLockedSub' + (i + 1)).attr("checked", true);
+ }
- //鐘舵�佹爣璁�
- if (d.data[0].鐘舵�佹爣璁� == "1") {
- $('#HStatusTag1').attr("checked", true);
- }
+ //鐘舵�佹爣璁�
+ if (d.data[i].鐘舵�佹爣璁� == "1") {
+ $('#HStatusTag' + (i + 1)).attr("checked", true);
+ }
- //鎵嬪伐淇敼鏍囪
- if (d.data[0].鎵嬪伐淇敼鏍囪 == "1") {
- $('#HIsHandModify1').attr("checked", true);
+ //鎵嬪伐淇敼鏍囪
+ if (d.data[i].鎵嬪伐淇敼鏍囪 == "1") {
+ $('#HIsHandModify' + (i + 1)).attr("checked", true);
+ }
}
form.render('checkbox');
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index 4c2759e..ee2ab03 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -401,7 +401,7 @@
, area: ['100%', '100%']
, title: '鏃ヨ鍒掑伐鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -416,7 +416,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -424,7 +423,7 @@
, area: ['100%', '100%']
, title: '鏃ヨ鍒掑伐鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
index 92e5ee6..6bff735 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -276,11 +276,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == -1) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -295,7 +293,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -631,7 +629,6 @@
//澶氶�� 鍒锋柊琛ㄦ牸
function checkRefresh() {
for (var i = 1; i <= option.data.length; i++) {
- console.log(JSON.stringify(option.data[i - 1]))
//寤惰繜鍘熷洜
$('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
//鐗╂枡灞炴��
@@ -838,9 +835,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
type: "GET",
@@ -862,44 +859,52 @@
, "HExplanation": d.data[0].鎽樿
});
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
- , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
- , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HProdORGID": d.data[0].瀛愮敓浜х粍缁�
- , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
- , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd')
- , "HRelationQty": d.data[0].鍏宠仈鏁伴噺, "HICMOInterID": d.data[0].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟瀛愬唴鐮�
- , "HICMOBillSEQ": d.data[0].鐢熶骇璁㈠崟琛屽彿, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd')
- , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HReciveQty": d.data[0].鍏ュ簱鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false
- , "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿, "HICMOEmpID": d.data[0].HICMOEmpID, "HICMOEmpIDName": d.data[0].鐢熶骇璁㈠崟鍒跺崟浜�
- , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HICMOBillDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd')
- , "HICMOBillDeliveryDate": Format(new Date(d.data[0].鐢熶骇璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[0].鐢熶骇璁㈠崟鎽樿
- , "HICMOBillNote": d.data[0].鐢熶骇璁㈠崟琛ㄤ綋澶囨敞
- }];
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HLaterReason": d.data[i].寤惰繜鍘熷洜, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠ｇ爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[i].瑙勬牸鍨嬪彿, "HUnitID": d.data[i].HUnitID, "HUnitIDName": d.data[i].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[i].鐗╂枡灞炴��, "HQty": d.data[i].鏁伴噺, "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HProdORGID": d.data[i].瀛愮敓浜х粍缁�
+ , "HStatus": d.data[i].鐘舵��, "HFixleadTime": d.data[i].鎻愬墠鏈�, "HSourceInterID": d.data[i].婧愬崟ID, "HSourceEntryID": d.data[i].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[i].婧愬崟鍗曞彿, "HSourceBillType": d.data[i].瀛愭簮鍗曠被鍨�, "HDayPlanDate": Format(new Date(d.data[i].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd')
+ , "HRelationQty": d.data[i].鍏宠仈鏁伴噺, "HICMOInterID": d.data[i].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": d.data[i].鐢熶骇璁㈠崟瀛愬唴鐮�
+ , "HICMOBillSEQ": d.data[i].鐢熶骇璁㈠崟琛屽彿, "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), 'yyyy-MM-dd')
+ , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HReciveQty": d.data[i].鍏ュ簱鏁伴噺, "HCloseStatus": d.data[i].鍏抽棴鐘舵�� == "1" ? true : false
+ , "HRemoveQty": d.data[i].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[i].閿�鍞鍗曞彿, "HICMOEmpID": d.data[i].HICMOEmpID, "HICMOEmpIDName": d.data[i].鐢熶骇璁㈠崟鍒跺崟浜�
+ , "HUnReciveQty": d.data[i].鏈敹鏂欐暟閲�, "HICMOBillDate": Format(new Date(d.data[i].鐢熶骇璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd')
+ , "HICMOBillDeliveryDate": Format(new Date(d.data[i].鐢熶骇璁㈠崟浜よ揣鏃ユ湡), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[i].鐢熶骇璁㈠崟鎽樿
+ , "HICMOBillNote": d.data[i].鐢熶骇璁㈠崟琛ㄤ綋澶囨敞
+ });
+ }
option.data = rowdata;
table.render(option);
- //鏄惁鎵嬪伐鍏抽棴
- if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
- $('#HCloseTypeSub1').attr("checked", true);
- }
+ for (var i = 0; i < d.data.length; i++) {
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+ $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
+ }
- //鍏抽棴鐘舵��
- if (d.data[0].鍏抽棴鐘舵�� == "1") {
- $('#HCloseStatus1').attr("checked", true);
- }
- form.render('checkbox');
+ //鍏抽棴鐘舵��
+ if (d.data[i].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus' + (i + 1)).attr("checked", true);
+ }
- //寤惰繜鍘熷洜
- $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
- //鐗╂枡灞炴��
- $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
- //鐢熶骇缁勭粐
- $('#HProdORGIDSub1').find("option[value='" + d.data[0].瀛愮敓浜х粍缁� + "']").attr("selected", true);
- //鐘舵��
- $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + (i + 1)).find("option[value='" + d.data[i].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ //鐗╂枡灞炴��
+ $('#HErpClsID' + (i + 1)).find("option[value='" + d.data[i].鐗╂枡灞炴�� + "']").attr("selected", true);
+ //鐢熶骇缁勭粐
+ $('#HProdORGIDSub' + (i + 1)).find("option[value='" + d.data[i].瀛愮敓浜х粍缁� + "']").attr("selected", true);
+ //鐘舵��
+ $('#HStatus' + (i + 1)).find("option[value='" + d.data[i].鐘舵�� + "']").attr("selected", true);
+ }
form.render('select');
+ form.render('checkbox');
+
+
+
}
})
}
@@ -923,8 +928,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index 115dbfb..3163db1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -391,7 +391,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝鍗曞垪琛�-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
+ , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -406,7 +406,6 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
- var linteridSub = data[0].hsubid;
layer.open({
type: 2
@@ -414,7 +413,7 @@
, area: ['100%', '100%']
, title: '瑕佹枡璁″垝鍗曞垪琛�-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , content: '../瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
--
Gitblit v1.9.1