From 735bc39f7c133aaf3f1e90471c8db90dda094f5c Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 10 三月 2022 14:54:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html | 22 +++++++
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 148 ++++++++++++++++++++++++++++++++++++++++++------
WebTM/views/index.html | 1
3 files changed, 151 insertions(+), 20 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 9249277..a5f2269 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -323,6 +323,7 @@
<dd>
<a>寮�缁撶彮绠＄悊(宸ュ簭)</a>
<dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">寮�鐝崟</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">寮�鐝崟缁存姢</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html">鍋滃伐鎸傝捣鍗曠淮鎶�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">缁撶彮鍗曠淮鎶�</a></dd>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
index a2e1f6e..c9fdef9 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
@@ -75,6 +75,18 @@
<input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -631,6 +643,8 @@
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //閮ㄩ棬淇℃伅
+ var HModelNumber = $("#HModelNumber").val(); //閮ㄩ棬淇℃伅
if (HStatus) {
switch (HStatus) {
case '-1': //鍏ㄩ儴
@@ -660,6 +674,12 @@
if (HDept) {
sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HDept + "%'";
}
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModelNumber) {
+ sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+ }
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -672,6 +692,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");
$("#HDept").val("");
+ $("#HMaterNumber").val("");
+ $("#HModelNumber").val("");
sWhere = "";
get_Display(sWhere);
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index 3106419..0f0a3a6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -423,8 +423,82 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew()
{
+ refSav = "Add";
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+ $("#HMainSourceBillNo").focus();
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //寮�宸ユ棩鏈�
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+
+ $('#HMaterCode').attr("disabled", false);
+ $('#HMaterCode').attr("readonly", true);
+ $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMaterName').attr("readonly", true);
+ $('#HMaterSpec').attr("readonly", true);
+ $('#HSourceName').attr("disabled", false);
+ $('#HSourceName').attr("readonly", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HEmpName').attr("disabled", false);
+ $('#HEmpName').attr("readonly", true);
+ $('#HEmpList').addClass("layui-btn-disabled").attr("disabled", true);
+ $("#HMainSourceInterID").val("");
+ $("#HMainSourceEntryID").val("");
+ $("#HMainSourceBillNo").val("");
+ $("#HMainSourceBillType").val("");
+ $('#HMainSourceBillNo').attr("disabled", false);
+ $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+ //鎵簩缁寸爜鏂规硶
+ $('#HMainSourceBillNo').on('keydown', function (event) { //鎵簮鐮�
+ var HBarCode = $('#HMainSourceBillNo').val();
+ if (event.keyCode == 13) {
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (HBarCode == "") {
+ layer.alert("婧愮爜涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ //
+ $.ajax({
+ url: GetWEBURL() + "Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBillByEWM",
+ type: "GET",
+ data: {
+ "sBillBarCode": HBarCode
+ },
+ success: function (result) {
+ var data = result.data.h_v_IF_ICMOBillList[0];
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ form.val("component-form-group", {
+ "HMaterID": data.HMaterID
+ , "HMaterCode": data.浜у搧浠ｇ爜
+ , "HMaterName": data.浜у搧鍚嶇О
+ , "HMaterSpec": data.瑙勬牸鍨嬪彿
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.涓氬姟鍛�
+ , "HDeptID": data.HDeptID
+ , "HDeptName": data.鐢熶骇杞﹂棿
+ , "HMainSourceInterID": data.hmainid
+ , "HMainSourceEntryID": data.HEntryID
+ , "HMainSourceBillType": "3710"
+ , "HICMOInterID": "0"
+ , "HICMOEntryID": "0"
+ , "HICMOBillNo": "0"
+ });
+ $("#HMainSourceBillNo").css("box-shadow", "none");
+ $("#HProcID").val(0);
+ $("#HProcName").val(0);
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鎵簮鐮佹柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+ }
+ });
+ }
+ });
}
//鏈夋簮鍗曟柊澧�
@@ -631,18 +705,19 @@
{
return false;
}
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: false,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.confirm(data.Message, {
- btn: ['纭']
- }, function (index) {
+ if (OperationType == 1) {
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkBillByEWM", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.confirm(data.Message, {
+ btn: ['纭']
+ }, function (index) {
if (data.Verify == "Y") //鑷姩瀹℃牳
{
layer.close(index);
@@ -651,16 +726,49 @@
else {
layer.close(index);
}
- });
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
}
- else {
- layer.alert(data.Message, { icon: 5 })
+ })
+ }
+ else {
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.confirm(data.Message, {
+ btn: ['纭']
+ }, function (index) {
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
}
- },
- error: function (err) {
- layer.alert(err, { icon: 5 })
- }
- })
+ })
+ }
});
//瀹℃牳鎸夐挳鎻愪氦
--
Gitblit v1.9.1