From c90b7430a9adaf4f2138ef129171efbe84bb89f4 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 15 十月 2024 18:01:14 +0800
Subject: [PATCH] 出站汇报单列表添加下推生产质量汇报单功能；生产质量汇报单添加必填控制
---
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 127 +++++++++++++++++++++++++++++++++++++++--
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 49 ++++++++++++++++
3 files changed, 169 insertions(+), 9 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
index 8b9b6d7..403e217 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
@@ -187,7 +187,7 @@
, soulTable = layui.soulTable
var option = [];
var sWhere = "";
-
+ var HModName = "Sc_QualityReportStepBillList";
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index 21a9ece..68bcdb3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -258,7 +258,8 @@
<option value="鏀捐">鏀捐</option>
<option value="宸ュ簾">宸ュ簾</option>
<option value="鏂欏簾">鏂欏簾</option>
- <option value="鏍蜂欢淇濈暀">鏍蜂欢淇濈暀</option>
+ <option value="鏍蜂欢淇濈暀">鏍蜂欢淇濈暀</option>
+ <option value="">璇烽�夋嫨</option>
</select>
</script>
<script>
@@ -332,6 +333,11 @@
//瀛愯〃鍒濆鍖�
set_InitGrid();
set_ProcessBill(linterid, HEntryID);
+ }
+ else if (OperationType == 6) { //鍑虹珯姹囨姤鍗曚笅鎺�
+ //瀛愯〃鍒濆鍖�
+ set_InitGrid();
+ set_StationOutBill(linterid);
}
//#endregion
@@ -1049,6 +1055,95 @@
})
}
//#endregion
+
+ //#region (鍑虹珯姹囨姤鍗�)涓嬫帹椤甸潰鍒濆鍖�
+ function set_StationOutBill(linterid) {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationOutBill/PushDownBackInfo",
+ type: "GET",
+ async: false,
+ data: { "linterid": linterid,"user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ //涓昏〃璧嬪��
+ $("#HEmpID").val(sessionStorage["HEmpID"] == undefined ? 0 : sessionStorage["HEmpID"]);
+ $("#HEmpName").val(sessionStorage["HEmpName"]);
+ $("#HDeptID").val(data.HDeptID);
+ $("#HDeptName").val(data.杞﹂棿);
+ $("#HGroupID").val(data.HGroupID);
+ $("#HGroupName").val(data.鐢熶骇鐝粍);
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = data.缁勭粐;
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i]["HMaterID"],
+ "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
+ "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
+ "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+ "HProcID": result.data[i]["HProcID"],
+ "宸ュ簭": result.data[i]["宸ュ簭"],
+ "HUnitID": result.data[i]["HUnitID"],
+ "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+ "HQty": result.data[i]["鍑虹珯鏁伴噺"],
+ "HSourceID": result.data[i]["HSourceID"],
+ "鐢熶骇璧勬簮": result.data[i]["鐢熶骇璧勬簮"],
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
+ "HRemark": "",
+ "HProcExchInterID": result.data[i]["HProcExchInterID"],
+ "HProcExchEntryID": result.data[i]["HProcExchEntryID"],
+ "HProcExchBillNo": result.data[i]["宸ュ簭娴佽浆鍗″彿"],
+ "HICMOInterID": result.data[i]["HICMOInterID"],
+ "HICMOEntryID": result.data[i]["HICMOEntryID"],
+ "HICMOBillNo": result.data[i]["鐢熶骇璁㈠崟鍙�"],
+ "HSourceInterID": result.data[i]["hmainid"],
+ "HSourceEntryID": "0",
+ "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
+ "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"],
+ "HResult": "",
+ "HEmpID": "0",
+ "妫�楠屽憳": "",
+ "HBadReasonID": "0",
+ "涓嶈壇鍘熷洜": "",
+ "HBarCode": "",
+ "HReportType": "3",
+ "HAddr": "",
+ "HMaker": "",
+ "HMakeDate": Format(new Date(), 'yyyy-MM-dd')
+ }
+ );
+ }
+ option.data = rowdata;
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//#region 寮圭獥閫夋嫨鏂规硶
//#region 鐢熶骇杞﹂棿閫夋嫨椤甸潰
@@ -1134,7 +1229,7 @@
function set_SaveBill(data) {
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
- if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5 || OperationType == 6) {
refSav = "Add";
data.field.HChangeDate = new Date();
data.field.HSTOCKORGID = data.field.HOrgID;
@@ -1206,7 +1301,7 @@
// return false;
//}
- if ($("#HEmpID").val() == "0") {
+ if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null) {
layer.msg("鐧昏浜烘湭閫夋嫨!");
return false;
}
@@ -1226,6 +1321,22 @@
return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i+1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ if (option.data[i]["HMaterID"] == 0 || option.data[i]["HMaterID"] == undefined || option.data[i]["HMaterID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡淇℃伅涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HProcID"] == 0 || option.data[i]["HProcID"] == undefined || option.data[i]["HProcID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細宸ュ簭淇℃伅涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HResult"] == 0 || option.data[i]["HResult"] == undefined || option.data[i]["HResult"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鍒ゅ畾缁撴灉涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HBadReasonID"] == 0 || option.data[i]["HBadReasonID"] == undefined || option.data[i]["HBadReasonID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細涓嶈壇鍘熷洜涓嶅厑璁镐负绌猴紒");
return false;
}
}
@@ -1430,7 +1541,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": HDataTemp.HItemID
@@ -1473,7 +1584,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HUnitID": HDataTemp.HItemID
@@ -1512,7 +1623,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HEmpID": HDataTemp.HItemID
@@ -1551,7 +1662,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSourceID": HDataTemp.HItemID
@@ -1590,7 +1701,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HBadReasonID": HDataTemp.HItemID
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 370eed7..b7cddfd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -191,6 +191,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-NoPassProd" id="btn-NoPassProd">涓嬫帹涓嶈壇鍝佽瘎瀹″鐞嗗崟</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-QualityReport" id="btn-QualityReport">涓嬫帹璐ㄩ噺姹囨姤鍗�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
@@ -728,6 +729,9 @@
//涓嬫帹宸ュ簭鍑虹珯姹囨姤鍗�
case 'btn-NoPassProd': set_NoPassProd();
break;
+ //涓嬫帹璐ㄩ噺姹囨姤鍗�
+ case 'btn-QualityReport': set_QualityReport();
+ break;
//棰勮
case 'btn-Cell': layer.msg('棰勮锛�');
break;
@@ -1548,6 +1552,51 @@
}
}
+ //涓嬫帹璐ㄩ噺姹囨姤鍗�
+ function set_QualityReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length > 0) {
+
+ var linterid = [];
+ var HERR = "";
+ var HGroupID_JY = data[0].HGroupID;
+ var HDeptID_JY = data[0].HDeptID;
+
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (data[i].HGroupID != HGroupID_JY || data[i].HDeptID || HDeptID_JY) {
+ HERR += "绗�" + (i+1) + "琛岋紝鐢熶骇鐝粍鎴栬�呯敓浜ц溅闂达紝涓庡叾浣欒涓嶄竴鑷达紝涓嶅厑璁稿悎骞朵笅鎺紒"
+ }
+
+ linterid.push(data[i].hmainid.toString());
+ }
+
+ if (HERR != "") {
+ layer.msg(HERR,{ time: 3000, })
+ return;
+ }
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璐ㄩ噺姹囨姤鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html?OperationType=' + 6 + '&linterid=' + linterid.toString() + '&HEntry=0&HProcNo=' + 0 + '&HEntryID=' + 0 + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+
//鏂板鍗曟嵁
function set_AddNew() {
layer.open({
--
Gitblit v1.9.1