From 85393c9a8be22f933fea250975f19eccba8d62a2 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 12 一月 2026 15:14:26 +0800
Subject: [PATCH] 四维尔：产品包装容器关联信息，增加限制 子表不能又相同的容器主档。容器只有为发货容器、周转容器时才可以将其设置为对应的默认发货容器、默认周转容器
---
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 2 +-
WebTM/views/基础资料/公用基础资料/Gy_MaterialPackingRelation_Edit.html | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 01e5004..6b9915b 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3776,7 +3776,7 @@
<publishTime>11/07/2025 16:30:14</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialPackingRelation_Edit.html">
- <publishTime>01/08/2026 10:35:57</publishTime>
+ <publishTime>01/08/2026 10:58:54</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material_Excel.html">
<publishTime>10/11/2024 11:32:36</publishTime>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelation_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelation_Edit.html"
index c41832d..ce377bd 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelation_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelation_Edit.html"
@@ -879,6 +879,18 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
+ //鍒ゆ柇鏄惁宸茬粡瀛樺湪璇ュ鍣ㄤ簡
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HMouldID"] == checkStatus.data[0].hmainid) {
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ layer.msg("瀹瑰櫒銆愬鍣ㄤ唬鐮侊細" + checkStatus.data[0].妯″叿缂栧彿 + "锛涘鍣ㄥ悕绉帮細" + checkStatus.data[0].妯″叿鍚嶇О + "銆戯細褰撳墠瀹瑰櫒宸茬粡瀛樺湪锛屼笉鍙噸澶嶈缃紒锛�");
+ obj.event = "";
+ return false;
+ }
+ }
+
+ //鏇存柊鏁版嵁
obj.update({
"HMouldID": checkStatus.data[0].hmainid,
"HMouldNumber": checkStatus.data[0].妯″叿缂栧彿,
@@ -973,6 +985,13 @@
//鍒ゆ柇鏄惁鏈夊叾浠栭粯璁ょ殑鍛ㄨ浆瀹瑰櫒
if (data.value * 1 == 1) {
+ if (value.HTransPackFlag * 1 == 0) {
+ value.HDefaultTransPackFlag = 0; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHDefaultTransPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈DefaultTransPackFlag鍊艰缃笅鎷夊垪琛�
+ layer.msg("褰撳墠瀹瑰櫒涓嶄负鍛ㄨ浆瀹瑰櫒锛屽彲浠ヨ缃负榛樿鍛ㄨ浆瀹瑰櫒锛侊紒锛�");
+ return;
+ }
+
var count = 0;
for (var i = 0; i < option.data.length; i++) {
if (option.data[i]["HDefaultTransPackFlag"] * 1 == 1) {
@@ -1012,6 +1031,14 @@
//鍒ゆ柇鏄惁鏈夊叾浠栭粯璁ょ殑鍛ㄨ浆瀹瑰櫒
if (data.value * 1 == 1) {
+ if (value.HSendPackFlag * 1 == 0) {
+ value.HDefaultSendPackFlag = 0; //鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ setSelectHDefaultSendPackFlagByTableRender(); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ layer.msg("褰撳墠瀹瑰櫒涓嶄负鍙戣揣瀹瑰櫒锛屼笉鍙涓洪粯璁ゅ彂璐у鍣紒锛侊紒");
+ return;
+ }
+
+ //鍒ゆ柇鏄惁鏈夊叾浠栧鍣ㄥ凡缁忚缃负榛樿鍙戣揣瀹瑰櫒
var count = 0;
for (var i = 0; i < option.data.length; i++) {
if (option.data[i]["HDefaultSendPackFlag"] * 1 == 1) {
--
Gitblit v1.9.1