From 51f5c344625ed6e8d703b23b50d794014a650d96 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 01 四月 2022 17:41:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
index 8b8c88e..3d7172c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
@@ -269,6 +269,9 @@
//#region 鏌ヨ
function get_Display(sWhere) {
+ var HOrgID = sessionStorage["OrganizationID"];//褰撳墠缁勭粐id
+ sWhere += " and 缁勭粐 =" + HOrgID + " ";
+
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
@@ -297,13 +300,11 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫椂闂�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃堕棿
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- var HDeptID =$("#HDeptID").val();//閮ㄩ棬
+ var HDeptName = $("#HDeptName").val();//鐢熶骇杞﹂棿
var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
var MaterialName =$("#MaterialName").val();//鐗╂枡鍚嶇О
- var SpecificationModel =$("#SpecificationModel").val();//瑙勬牸鍨嬪彿
- var Warehouse = $("#Warehouse").val();//鍙戞枡浠撳簱
- var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
- var Hmaker =$("#Hmaker").val();//鍒跺崟浜�
+ var MaterialModel = $("#MaterialModel").val();//瑙勬牸鍨嬪彿
+
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
@@ -314,8 +315,8 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- if (HDeptID) {
- sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HDeptID + "%'";
+ if (HDeptName) {
+ sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HDeptName + "%'";
}
if (MaterialCode) {
sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
@@ -323,18 +324,10 @@
if (MaterialName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
}
- if (SpecificationModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ if (MaterialModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + MaterialModel + "%'";
}
- if (Warehouse) {
- sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
- }
- if (HSourceBillNo) {
- sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
- }
- if (Hmaker) {
- sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
- }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
--
Gitblit v1.9.1