From 1fb20625ab327a7a24097c0bda3f8e43617aafe8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 23 十二月 2024 16:11:53 +0800
Subject: [PATCH] 条码生成：销售出库单 作为源单时，弹窗可以设置过滤条件进行查询
---
WebTM/views/PublicPage/HSourceReportHtml.html | 17 ++++++++++++++++-
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 4 ++--
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 3 ++-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 80e2e8d..71558b0 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1720,7 +1720,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/PublicPage/HSourceReportHtml.html">
- <publishTime>12/23/2024 13:18:27</publishTime>
+ <publishTime>12/23/2024 15:17:38</publishTime>
</File>
<File Include="views/PublicPage/LocationGroupInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
@@ -2404,7 +2404,7 @@
<publishTime>09/11/2024 21:05:00</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">
- <publishTime>12/23/2024 14:09:01</publishTime>
+ <publishTime>12/23/2024 14:38:03</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
<publishTime>09/13/2024 15:42:13</publishTime>
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 4bf2bc9..5ba0ccb 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -393,7 +393,7 @@
HModName = "ProcessExchangeBill_3772";
break;
case '閿�鍞嚭搴撳崟':
- HModName = "";
+ HModName = "SellOutBill_1205";
break;
}
//鍒濆鏌ヨ
@@ -654,6 +654,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;
}
}
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index ce6816e..13fd624 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -109,6 +109,7 @@
<label class="layui-form-label">鏉＄爜绫诲瀷</label>
<div class="layui-input-inline">
<select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
+ <option value="11">鍞竴鏉＄爜</option>
</select>
</div>
</div>
@@ -270,7 +271,7 @@
//鍔犺浇宸ュ巶浠ｇ爜鏁版嵁
set_HWorksNumber();
//鍔犺浇鏉＄爜绫诲瀷鏁版嵁
- set_HBarCodeType();
+ //set_HBarCodeType();
var rowdata = [{
"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
--
Gitblit v1.9.1