From a7f249aba00079f45a5ae2ea04f6d324825b3e87 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 八月 2023 14:39:31 +0800
Subject: [PATCH] 染厂项目模块开发；（子工艺路线 功能 、工序子流转卡 功能； HBillSubType varchar(50) --单据子类型（SUB） HMainProcID int //工序 ） 主工艺 路线列表 过滤 HBillSubType<>'SUB' 主工序流转卡列表 过滤 <>'SUB' 子工艺路线列表 ='SUB' PDA 增加 指引卡开工单（模块名：Sc_StationInSubBill 单据类型 ：379002）；（沿用 工序进站接收单 表结构， Hbillsubtype 为 SUB， 可以考虑用同一个 模块， 标题根据菜单来变） PDA 增加 指引卡完工单（模块名：Sc_StationOutSubBill 单据类型 ：379102）；（沿用 工序出站汇报单 表结构， Hbillsubtype 为 SUB， 可以考虑用同一个 模块， 标题根据菜单来变）
---
WebTM/views/PublicPage/HSourceReportHtml.html | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 47c28e2..9d21aa2 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -134,7 +134,7 @@
var OperationType = 1;//鎿嶄綔绫诲瀷
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
+ var HOrgID = params[params[1]];//婧愬崟id
var HSouceBillType = decodeURI(params[params[2]]);//婧愬崟绫诲瀷
}
var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
@@ -161,10 +161,6 @@
var option = [];
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var HDeptID = 0;
-
- var params = getUrlVars();
- var HDeptID = params[params[0]];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -186,6 +182,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": HOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
@@ -197,9 +194,6 @@
}
$("#HDeptName").append(HDeptName);
- if (!isNaN(HDeptID)) {
- $("#HDeptName").val(HDeptID);
- }
form.render('select');
}
layer.closeAll("loading");
@@ -304,7 +298,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
type: "GET",
- data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": linterid },
+ data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": HOrgID },
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
@@ -407,10 +401,7 @@
}
sWhere += " and " + ColName + " " + com;
}
- //浼犻�掔殑鍙傛暟涓嶄负NAN
- if (!isNaN(HDeptID) && HDeptName == 0) {
- HDeptName = HDeptID;
- }
+
switch (HSouceBillType) {
case '鐢熶骇璁㈠崟':
if (HBillNo) {
@@ -487,6 +478,21 @@
}
return sWhere;
break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
+ return sWhere;
+ break;
case '閫�璐ч�氱煡鍗�':
return sWhere;
break;
--
Gitblit v1.9.1