From 2386776aed38a5a1f310db7b3e5a3f8daee7fe9f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 15 十二月 2022 09:52:53 +0800
Subject: [PATCH] 器具维护 工序出站单 未出站数量 投产计划报表 物料代码模糊查询
---
WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html | 5 +-
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 25 ++++++++----
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 32 +++++----------
WebTM/views/设备管理/设备档案/Gy_EquipFileBillResume.html | 2
4 files changed, 31 insertions(+), 33 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
index 61aefc0..2cb1e38 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
@@ -586,7 +586,7 @@
, area: ['90%', '90%'] //澶у皬
, title: '渚涘簲鍟嗚〃' //鏍囬
, shift: 2 //寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳涓� 鐨勫洖璋�
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮圭獥椤甸潰
@@ -597,7 +597,7 @@
//鑾峰彇鏁版嵁
$("#HSupID").val(checkStatus.data[0].HItemID);//渚涘簲鍟唅d
- $("#HSupIDName").val(checkStatus.data[0].HName);//渚涘簲鍟嗗悕绉�
+ $("#HSupIDName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
//鍏抽棴椤甸潰
layer.close(index);
@@ -735,6 +735,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
index 5c51329..b236776 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
@@ -395,7 +395,7 @@
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
}
if (EndHCreateDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
}
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/Cj_StationOutBill.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_StationOutBill.html"
index 45c9c9f..6b1c21c 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_StationOutBill.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_StationOutBill.html"
@@ -147,19 +147,25 @@
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">褰撳墠宸ュ簭</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HProcID" id="HProcID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">褰撳墠宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏈嚭绔欐暟閲�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;" id="NoOutboundHqty">
</div>
</div>
</div>
@@ -990,6 +996,7 @@
"HProcID": data.HProcID
, "HCenterName": data.宸ヤ綔涓績
, "HCenterID": data.HCenterID
+ , "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
});
if (data.棣栭亾宸ュ簭 == "鏄�") {
FirstEndHProcNo = 1;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 9c9a0c4..30d99ed 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -68,13 +68,9 @@
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <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="HMaterNumber" id="HMaterNumber">
</div>
</div>
<div class="layui-inline">
@@ -83,14 +79,6 @@
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</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="HModel" id="HModel" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row" style="margin: 10px 0 10px;">
<div class="layui-inline">
<label class="layui-form-label">鐝粍</label>
<div class="layui-input-inline">
@@ -101,6 +89,8 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row" style="margin: 10px 0 10px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍞竴ID</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -220,10 +210,10 @@
});
});
- //鐗╂枡
- form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
- get_btnHMaterID();
- });
+ ////鐗╂枡
+ //form.on('submit(btnHMaterID)', function (data) {
+ // get_btnHMaterID();
+ //});
//#endregion
@@ -232,7 +222,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -374,6 +364,7 @@
$("#HProcExchBillNo").val("");
$("#HName").val("");
$("#HBillNo").val("");
+ $("#HMaterNumber").val("");
$("#F_BSV_WYID").val("");
$("#HState").val("0")
$("input[name='checkWRuku']").prop("checked", false);
@@ -402,7 +393,6 @@
}
$("#HMaterID").val(checkStatus.data[0].HItemID);
$("#HMaterNumber").val(checkStatus.data[0].HNumber);
- $("#HModel").val(checkStatus.data[0].HModel);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
})
--
Gitblit v1.9.1