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/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 1dee345..3ec3ec8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -272,6 +272,8 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
+ <input type="text" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden />
+ <input type="text" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden />
</div>
</div>
<div class="layui-inline">
@@ -572,11 +574,11 @@
set_ClearBill();
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../user/login.html"; });
- }
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
@@ -936,6 +938,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false,
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
@@ -962,7 +965,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -974,12 +977,12 @@
case 1:
//鑾峰彇鏁版嵁
$("#HDeptID").val(checkStatus.data[0].HItemID);//璁″垝閮ㄩ棬id
- $("#HDeptIDName").val(checkStatus.data[0].HName);//璁″垝閮ㄩ棬鍚嶇О
+ $("#HDeptIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//璁″垝閮ㄩ棬鍚嶇О
break;
case 2:
//鑾峰彇鏁版嵁
$("#HWorkShopID").val(checkStatus.data[0].HItemID);//鐢熶骇杞﹂棿id
- $("#HWorkShopIDName").val(checkStatus.data[0].HName);//鐢熶骇杞﹂棿鍚嶇О
+ $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//鐢熶骇杞﹂棿鍚嶇О
break;
}
@@ -998,7 +1001,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1008,9 +1011,9 @@
}
//鑾峰彇鏁版嵁
$("#HMaterID").val(checkStatus.data[0].HItemID);
- $("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterIDNumber").val(checkStatus.data[0].HNumber);
- $("#HMaterModel").val(checkStatus.data[0].HModel);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1052,7 +1055,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鍗曚綅鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1062,7 +1065,7 @@
}
//鑾峰彇鏁版嵁
$("#HUnitID").val(checkStatus.data[0].HItemID);
- $("#HUnitIDName").val(checkStatus.data[0].HName);
+ $("#HUnitIDName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1078,7 +1081,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1091,12 +1094,12 @@
case 1:
//鑾峰彇鏁版嵁
$("#HWorkerID").val(checkStatus.data[0].HItemID);
- $("#HWorkerIDName").val(checkStatus.data[0].HName);
+ $("#HWorkerIDName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
break;
case 2:
//鑾峰彇鏁版嵁
$("#HEmpID").val(checkStatus.data[0].HItemID);
- $("#HEmpIDName").val(checkStatus.data[0].HName);
+ $("#HEmpIDName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
break;
}
@@ -1271,6 +1274,8 @@
, "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�濮嬫棩鏈�), "yyyy-MM-dd")
, "HPlanEndDate":Format(new Date(d.data[0].璁″垝缁撴潫鏃ユ湡), "yyyy-MM-dd")
, "HICMOBillNo": d.data[0].鐢熶骇璁㈠崟鍙�
+ , "HMainSourceInterID": d.data[0].婧愬崟涓诲唴鐮�
+ , "HMainSourceEntryID": d.data[0].婧愬崟瀛愬唴鐮�
, "HOwnerID": d.data[0].璐т富缂栫爜
, "HBatchNo": d.data[0].鎵规
, "HYX": d.data[0].浼樺厛绾�
--
Gitblit v1.9.1