From d94bbc4809e414329c8b7a30b7e6b8b12791620d Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 07 九月 2022 13:33:46 +0800
Subject: [PATCH] 生产任务单维护界面进去默认业务状态为开工 界面增加唯一ID 跟是否下推生成流转卡过滤
---
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul_RYQ.html | 154 +++++++++++++++++++++++---------------
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 36 ++++++++
3 files changed, 127 insertions(+), 65 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 01217c3..3c29edd 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,7 +4,7 @@
var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
- var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 70c0ab1..13d2b2b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -80,11 +80,13 @@
<label class="layui-form-label">涓氬姟鐘舵��</label>
<div class="layui-input-block">
<select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
- <option value="0" selected>鍏ㄩ儴</option>
+ <!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
+ <option value="寮�宸�">寮�宸�</option>
<option value="璁″垝">璁″垝</option>
<option value="璁″垝纭">璁″垝纭</option>
<option value="涓嬭揪">涓嬭揪</option>
- <option value="寮�宸�">寮�宸�</option>
+
+ <option value="0">鍏ㄩ儴</option>
<option value="瀹屽伐">瀹屽伐</option>
<option value="缁撴">缁撴</option>
</select>
@@ -101,6 +103,23 @@
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍞竴ID</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HERPID" id="HERPID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁涓嬫帹鐢熸垚娴佽浆鍗�</label>
+ <div class="layui-input-block">
+ <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
+ <!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
+ <option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
+ <option value="鏈笅鎺�">鏈笅鎺�</option>
+ </select>
+
</div>
</div>
</div>
@@ -322,6 +341,9 @@
, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
, { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: '鐘舵��', title: '鐘舵��', sort: true, width: 170 }
+ , { field: '鍞竴ID', title: '鍞竴ID', sort: true, width: 170 }
+ , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true, width: 170 }
, { field: '鏃ユ湡', title: '鏃ユ湡' }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
@@ -423,9 +445,11 @@
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
var HMaterName = $("#HMaterName").val();//鍗曟嵁鍙�
+ var HErpID = $("#HERPID").val();//鍞竴鏍囪瘑
var HDeptName = $("#HDeptName").val();//鍗曟嵁鍙�
var HStatus = $("#HStatus").val();//鍗曟嵁鍙�
var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+ var HSF = $("#HSF").val();//鍗曟嵁绫诲瀷
if (HDate) {
sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
}
@@ -445,11 +469,17 @@
sWhere += " and HDeptID = " + HDeptName ;
}
if (HStatus && HStatus != 0) {
- sWhere += " and 涓氬姟鐘舵�� like '%" + HStatus + "%'";
+ sWhere += " and 鐘舵�� like '%" + HStatus + "%'";
}
if (HBillType) {
sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HBillType + "%'";
}
+ if (HErpID) {
+ sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
+ }
+ if (HSF) {
+ sWhere += " and 鏄惁涓嬫帹鐢熸垚娴佽浆鍗� like '%" + HSF + "%'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
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/Sc_StationOutBill_Mul_RYQ.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/Sc_StationOutBill_Mul_RYQ.html"
index 18800f7..0ff82df 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/Sc_StationOutBill_Mul_RYQ.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/Sc_StationOutBill_Mul_RYQ.html"
@@ -246,6 +246,10 @@
, { field: 'HMakeDate', title: 'HMakeDate', hide: true }
, { field: 'HBarCodeMakeDate', title: 'HBarCodeMakeDate', hide: true }
, { field: 'HStationOutTime', title: 'HStationOutTime', hide: true }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
+ , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
+ , { field: 'HQty', title: 'HQty', hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
]]
, text: {
@@ -372,6 +376,29 @@
option1.data = table.cache["mainTable1"];//灏嗘暟鎹粦瀹氬埌data涓�
table.reload(option1);
layer.close(index);
+ });
+ }
+ if (obj.event === 'edit') {
+ var HBillNo = data.鍗曟嵁鍙�;
+ var HProcName = data.宸ュ簭鍚嶇О;
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/Mul_RYQ_DisPlayBillList',
+ type: "GET",
+ data: { "HBillNo": HBillNo, "HProcName": HBillNo },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option2.data = data1.data;
+ table.render(option2);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
});
}
})
@@ -584,10 +611,46 @@
//#region 鎻愪氦鎸夐挳(淇濆瓨)
form.on('submit(set_SaveBarCode)', function (data) {//鎻愪氦
+ var HEmpName1 = $("#HEmpName1").val();
+ var HEmpName2 = $("#HEmpName2").val();
+ var HEmpName3 = $("#HEmpName3").val();
+ var HEmpName4 = $("#HEmpName4").val();
+ var HEmpName5 = $("#HEmpName5").val();
+ var HEmpName6 = $("#HEmpName6").val();
+ var HEmpName7 = $("#HEmpName7").val();
+ var HEmpName8 = $("#HEmpName8").val();
+
+ var HMaker = "";
+ if (HEmpName1 != "")
+ {
+ HMaker = HMaker + ";" + HEmpName1;
+ }
+ if (HEmpName2 != "") {
+ HMaker = HMaker + "," + HEmpName2;
+ }
+ if (HEmpName3 != "") {
+ HMaker = HMaker + "," + HEmpName3;
+ }
+ if (HEmpName4 != "") {
+ HMaker = HMaker + "," + HEmpName4;
+ }
+ if (HEmpName5 != "") {
+ HMaker = HMaker + "," + HEmpName5;
+ }
+ if (HEmpName6 != "") {
+ HMaker = HMaker + "," + HEmpName6;
+ }
+ if (HEmpName7 != "") {
+ HMaker = HMaker + "," + HEmpName7;
+ }
+ if (HEmpName8 != "") {
+ HMaker = HMaker + "," + HEmpName8;
+ }
+
var HBillNo = $("#HMainBillNo").val();
sSubStr = table.cache["mainTable1"];
var sSubStr = JSON.stringify(sSubStr);
- var sSubStr = sSubStr + ';' + HBillNo;
+ var sSubStr = sSubStr + ';' + HBillNo + HMaker;
$.ajax({
type: "POST",
url: GetWEBURL() + "/Cj_StationOutBill/AddBill_Mul",
@@ -598,8 +661,7 @@
{
if (result.count == 1)
{
- layer.close(index);
- layer.msg("鎵爜鍑虹珯鎴愬姛锛�", { icon: 6 });
+ layer.msg("鎵爜鍑虹珯鎴愬姛锛�");
}
else
{
@@ -629,37 +691,7 @@
//#endregion
//#region 琛屽唴浜嬩欢
- //table.on('tool(mainTable1)', function (obj) {
- // var rowData = obj.data;
- // //鍒犻櫎鍗曟嵁
- // if (obj.event === 'del') {
- // layer.confirm('纭畾鍒犻櫎' + rowData.HBillNo + '鍚楋紵', function (index) {
- // var ajaxLoad = layer.load();
- // //閫昏緫鍒犻櫎鏂规硶
- // $.ajax({
- // url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
- // type: "GET",
- // data: { "HInterID": rowData.HInterID, "HDeleteMan": sessionStorage["HUserName"] },
- // success: function (result) {
- // if (result.count == 1) {
- // get_BarCodeDetail();
- // HqtyBill--;
- // $("#HqtyBill").val(HqtyBill);
- // layer.close(ajaxLoad);
- // layer.alert(result.Message, { icon: 6 });
- // } else {
- // layer.close(ajaxLoad);
- // layer.alert(result.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(ajaxLoad);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- // });
- // layer.close(index);
- // });
- // }
- //});
+
//#endregion
//#region 娴佹按鍙峰洖杞︽柟娉�
@@ -891,33 +923,33 @@
- table.on('tool(mainTable1)', function (obj) {
- var data = obj.data;
- var rowIndex = $(obj.tr).attr("data-index");
- if (obj.event === 'edit') {
- var HBillNo = data.鍗曟嵁鍙�;
- var HProcName = data.宸ュ簭鍚嶇О;
- $.ajax({
- url: GetWEBURL() + '/LEMS/Mul_RYQ_DisPlayBillList',
- type: "GET",
- data: { "HBillNo": HBillNo, "HProcName": HBillNo},
- success: function (data1) {
- if (data1.count == 1) {
- option2.data = data1.data;
- table.render(option2);
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- })
+ //table.on('tool(mainTable1)', function (obj) {
+ // var data = obj.data;
+ // var rowIndex = $(obj.tr).attr("data-index");
+ // if (obj.event === 'edit') {
+ // var HBillNo = data.鍗曟嵁鍙�;
+ // var HProcName = data.宸ュ簭鍚嶇О;
+ // $.ajax({
+ // url: GetWEBURL() + '/LEMS/Mul_RYQ_DisPlayBillList',
+ // type: "GET",
+ // data: { "HBillNo": HBillNo, "HProcName": HBillNo},
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option2.data = data1.data;
+ // table.render(option2);
+ // layer.close(ajaxLoad);
+ // //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ // } else {
+ // layer.close(ajaxLoad);
+ // layer.alert(data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(ajaxLoad);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ // }
+ //})
//#region 鑾峰彇娴佹按鍙蜂俊鎭�
function txtHProcNo_KeyDown(sBillNo, sProcNo) {
--
Gitblit v1.9.1