From 029404c7d0fb04afc46373e3d58069397cf96cdb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 29 七月 2022 08:36:01 +0800
Subject: [PATCH] 工序流转卡 功能维护
---
WebTM/App_Data/MssqlReportData.cs | 3 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 12 +++---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 13 ++++++
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 4 +-
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 50 ++++++++++++++++--------
5 files changed, 55 insertions(+), 27 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 47fd479..80d5ea5 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -20,8 +20,9 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳
- public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
+ //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
+ public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
//public string sServer;
//public string sDataBase;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index db6dc29..85f1cd5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -306,9 +306,9 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'Gy_Group/EditBill',
+ url: GetWEBURL() + '/Gy_Group/DeltetGy_Group',
type: "GET",
- data: { "HItemID": ItemID },
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 }, function () {
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 ae3c428..564537e 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"
@@ -56,27 +56,34 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content">
- <div class="layui-inline">
+ <div class="layui-row">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 10px;">
+ <input type="checkbox" name="checkHWasterQty" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="鎶ュ簾鏁伴噺涓嶄负0">
+ </div>
</div>
</div>
</div>
@@ -187,6 +194,7 @@
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', hide: true }
, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
@@ -434,6 +442,8 @@
var HWorkBillNo = $("#HWorkBillNo").val();
var HBillNo = $("#HBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//澶嶉�夋
+
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + HBeginDate + "'";
}
@@ -449,6 +459,12 @@
if (HProcExchBillNo) {
sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
}
+ if (HProcExchBillNo) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ if (checkHWasterQty) {
+ sWhere += " and 鎶ュ簾鏁伴噺>0 ";
+ }
if (HStatus) {
switch (HStatus) {
case '-1': //鍏ㄩ儴
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 9c2e203..5e42cfc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -351,7 +351,18 @@
<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
</div>
</div>
-
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鐗堟湰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鐗堟湰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 6b3900a..9eb234f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -363,6 +363,10 @@
, { field: 'HProcID', title: 'HProcID', hide: true}
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width:100 }
+ , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺', width: 120 }
+ , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺', width: 120 }
+ , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', width: 150 }
, { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
, { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
@@ -370,9 +374,9 @@
, { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
, { field: 'hmainid', title: 'hmainid', hide: true}
, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
, { field: 'hicmointerid', title: 'hicmointerid', hide: true}
- , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 100}
, { field: 'HWorkShopID', title: 'HWorkShopID', hide: true}
, { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
@@ -394,10 +398,6 @@
, { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: 'HBillType', title: 'HBillType', hide: true}
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺' }
- , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺' }
- , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺' }
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
--
Gitblit v1.9.1