From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 111 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 90 insertions(+), 21 deletions(-)
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 0f0a3a6..3d77f62 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"
@@ -16,6 +16,7 @@
<script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../../layuiadmin/PubCustom.js"></script>
<script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -86,6 +87,7 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
+ <button type="button" id="NewAdd" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="NewAdd">鏂板</button>
<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
@@ -94,7 +96,7 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <h1 style="text-align:center;"><b>鐢熶骇寮�宸ュ崟</b></h1>
+ <h1 style="text-align:center;"><b>寮�宸ュ崟</b></h1>
<div class="layui-tab-content">
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
@@ -109,7 +111,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
-
+
</div>
</div>
<div class="layui-inline">
@@ -202,7 +204,7 @@
<div class="layui-inline">
<label class="layui-form-label">婧愬崟琛屽彿:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" autocomplete="off" disabled>
+ <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" autocomplete="off">
</div>
</div>
</div>
@@ -233,6 +235,28 @@
<input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
<input id="HICMOInterID" name="HICMOInterID" type="hidden" />
<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曞彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="F_YQN_XSDD" lay-verify="F_YQN_XSDD" id="F_YQN_XSDD" disabled autocomplete="off">
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞墿鏂欏悕绉�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="F_zzzz_Text4" lay-verify="F_zzzz_Text4" id="F_zzzz_Text4" disabled autocomplete="off">
+
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞暟閲�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="FQTY" lay-verify="FQTY" id="FQTY" disabled autocomplete="off">
</div>
</div>
</div>
@@ -368,6 +392,13 @@
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3787";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -425,7 +456,7 @@
{
refSav = "Add";
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
- $("#HMainSourceBillNo").focus();
+ $("#HMainSourceEntryID").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //寮�宸ユ棩鏈�
@@ -434,7 +465,7 @@
$('#HMaterCode').attr("disabled", false);
$('#HMaterCode').attr("readonly", true);
- $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", false);
$('#HMaterName').attr("readonly", true);
$('#HMaterSpec').attr("readonly", true);
$('#HSourceName').attr("disabled", false);
@@ -446,17 +477,18 @@
$("#HMainSourceInterID").val("");
$("#HMainSourceEntryID").val("");
$("#HMainSourceBillNo").val("");
+ $('#HMainSourceBillNo').attr("readonly", true);
$("#HMainSourceBillType").val("");
$('#HMainSourceBillNo').attr("disabled", false);
$('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
//鎵簩缁寸爜鏂规硶
- $('#HMainSourceBillNo').on('keydown', function (event) { //鎵簮鐮�
- var HBarCode = $('#HMainSourceBillNo').val();
+ $('#HMainSourceEntryID').on('keydown', function (event) { //鎵簮鐮�
+ var HBarCode = $('#HMainSourceEntryID').val();
if (event.keyCode == 13) {
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HBarCode == "") {
- layer.alert("婧愮爜涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert("婧愬崟琛屽彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
//
@@ -481,11 +513,14 @@
, "HDeptID": data.HDeptID
, "HDeptName": data.鐢熶骇杞﹂棿
, "HMainSourceInterID": data.hmainid
- , "HMainSourceEntryID": data.HEntryID
+ , "HMainSourceBillNo": data.鍗曟嵁鍙�
, "HMainSourceBillType": "3710"
, "HICMOInterID": "0"
, "HICMOEntryID": "0"
, "HICMOBillNo": "0"
+ , "F_YQN_XSDD": data.閿�鍞鍗曠紪鍙�
+ , "F_zzzz_Text4": data.閿�鍞墿鏂欏悕绉�
+ , "FQTY": data.閿�鍞暟閲�
});
$("#HMainSourceBillNo").css("box-shadow", "none");
$("#HProcID").val(0);
@@ -695,6 +730,24 @@
}
});
+ form.on('submit(NewAdd)', function (data) {
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3787' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(0);
+ //$("#HGroupID").val(sessionStorage["HGroupID"]); //榛樿鐝粍ID
+ //$("#HGroupName").val(sessionStorage["HGroup"]); //榛樿鐝粍
+ //$("#HEmpID").val(sessionStorage["HKeeperID"]); //榛樿鎿嶄綔鍛業D
+ //$("#HEmpName").val(sessionStorage["HKeeper"]); //榛樿鎿嶄綔鍛�
+ }
+ });
+ set_AddFNew();
+ });
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
@@ -826,7 +879,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/PartInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -836,10 +889,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterCode").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterCode").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterID").val(checkStatus.data[0].HItemID);
- $("#HMaterSpec").val(checkStatus.data[0].HModel);
+ $("#HMaterSpec").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -866,7 +919,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -876,7 +929,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSourceName").val(checkStatus.data[0].HName);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -904,7 +957,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/UserInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -914,7 +967,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -944,7 +997,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -954,7 +1007,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HGroupName").val(checkStatus.data[0].HName);
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
$("#HGroupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -982,7 +1035,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../PublicPage/DeptInformation.html', 'yes'],
+ content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -992,7 +1045,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1040,6 +1093,7 @@
return Result = false;
}
if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+ $("#HGroupID").val(0);
layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
@@ -1067,6 +1121,21 @@
return [year, month, day].join('-');
}
+ //鎿嶄綔鍛�
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //鐢熶骇鐝粍
+ function GetHGroupValue(obj) {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ //鐢熶骇杞﹂棿
+ function GetHDeptNameValue(obj) {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
--
Gitblit v1.9.1