From 0e15b8f03be294dcf1a3ca88d18e327d5ce989bd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 10 八月 2023 13:45:26 +0800
Subject: [PATCH] 生产日记导入 产量汇报单 查询修改 jit 完善 出站单注释多余工序HProcID字段 客户订单报表 修改状态 备注 不刷新
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html | 148 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 118 insertions(+), 30 deletions(-)
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_ProcessSendWorkList.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_ProcessSendWorkList.html"
index 8cbe3c7..b2786ad 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_ProcessSendWorkList.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_ProcessSendWorkList.html"
@@ -60,7 +60,7 @@
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
</div>
</div>
<div class="layui-inline">
@@ -108,6 +108,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" 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" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -137,7 +141,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
+ var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID","hentryid","鐢熶骇杞﹂棿ID","缁勭粐ID","浜у搧ID","鍗曚綅ID","鐢熶骇璧勬簮ID","鎿嶄綔宸D","鐝粍ID","HWWOrderEntryID","HWWOrderInterID","ieid"];
var option = [];
var HModName = "Sc_ProcessSendWorkList";
@@ -163,11 +167,23 @@
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
- //瀹℃牳
- case 'set_CheckBill': set_CheckBill();
- break;
+ ////瀹℃牳
+ //case 'set_CheckBill': set_CheckBill();
+ // break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CloseBill(2);
break;
//鎵撳嵃
case 'btn_print': get_print();
@@ -215,6 +231,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
@@ -266,7 +283,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 800
+ , height: 'full-50'
, page: true //寮�鍚垎椤�
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -295,7 +312,7 @@
var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- var HMaterName = $("#HMaterName").val();//鐗╂枡
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡
var HDeptName = $("#HDeptName").val();//杞﹂棿
var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
var ColName = $("#ColName").val();//澶嶉�夋
@@ -336,8 +353,8 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- if (HMaterName) {
- sWhere += " and 浜у搧浠ｇ爜 like '%" + HMaterName + "%'";
+ if (HMaterNumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + HMaterNumber + "%'";
}
if (HDeptName && HDeptName != "0") {
sWhere += " and 鐢熶骇杞﹂棿ID = '" + HDeptName + "'";
@@ -355,7 +372,7 @@
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
$("#HBillNo").val("");//鍗曟嵁鍙�
- $("#HMaterName").val("");//鐗╂枡
+ $("#HMaterNumber").val("");//鐗╂枡
$("#HDeptName").val("0");//杞﹂棿
$("#HProcExchBillNo").val("");//娴佽浆鍗″彿
$("#ColContent").val("");
@@ -450,9 +467,11 @@
if (checkStatus.data.length >= 1) {
var rows = [];
var arr = [];
+ var ieid = [];
for (var i = 0; i < data.length; i++) {
rows.push(data[i].hmainid.toString());
arr.push(data[i].hentryid.toString());
+ ieid.push(data[i].hmainid.toString() + data[i].hentryid.toString())
}
layer.open({
@@ -462,7 +481,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList _GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&entryid=' + arr.toString(), 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList_GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
, resize: false
})
}
@@ -471,27 +490,101 @@
}
}
- //瀹℃牳
- function set_CheckBill() {
+ ////瀹℃牳
+ //function set_CheckBill() {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // var hmainid = data[0].hmainid;
+ // layer.confirm("纭瑕佸鏍稿悧锛屽鏍稿悗涓嶈兘鎭㈠", { title: "瀹℃牳纭" }, function (index) {
+ // var wait = layer.load();
+ // //閫昏緫鍒犻櫎鏂规硶
+ // $.ajax({
+ // url: GetWEBURL() + '/Sc_ProcExchWorkBackBill/set_CheckBill',
+ // type: "GET",
+ // data: { "HInterID": hmainid, "CurUserName": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // //鍏抽棴褰撳墠frame
+ // layer.close(wait);
+ // layer.msg(result.Message);
+ // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // get_FastQuery();
+
+ // } else {
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // layer.close(wait);
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // layer.close(wait);
+ // }
+ // });
+ // })
+ // }
+ // else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ // }
+
+ //}
+
+ // 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hmainid = data[0].hmainid;
- layer.confirm("纭瑕佸鏍稿悧锛屽鏍稿悗涓嶈兘鎭㈠", { title: "瀹℃牳纭" }, function (index) {
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
var wait = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
+ var HInterID = data[0].hmainid;
$.ajax({
- url: GetWEBURL() + '/Sc_ProcExchWorkBackBill/set_CheckBill',
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/CheckSc_ProcExchSendWorkBill',
type: "GET",
- data: { "HInterID": hmainid, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- //鍏抽棴褰撳墠frame
- layer.close(wait);
- layer.msg(result.Message);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/CloseSc_ProcExchSendWorkBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -504,16 +597,11 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
}
-
}
- // 鍒锋柊
- function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
- }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
--
Gitblit v1.9.1