MES-WEB-LayUI.git

parent: 769177e4 | 补丁 | 提交 | ignore whitespace

销售订单列表增加行状态，进行下推销售出库单或在销售出库单选择源单的时候，只能选择单据为已审核且子表行状态为未关闭的物料、只要关闭了就不能选择；不管...

duhe

2024-01-19 273b97ce22c6c3659493b097c384d6449359ab36

销售订单列表增加行状态，进行下推销售出库单或在销售出库单选择源单的时候，只能选择单据为已审核且子表行状态为未关闭的物料、只要关闭了就不能选择；  不管是整单关闭还是 行关闭

3个文件已修改

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/销售出库/Kf_SellOutBill.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -5262,7 +5262,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBillList.html">
      <publishTime>01/18/2024 14:15:08</publishTime>
      <publishTime>01/19/2024 10:21:26</publishTime>
    </File>
    <File Include="views/éè´ç®¡ç/å§å¤è®¢å/WW_EntrustOrderBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -5283,7 +5283,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBillList.html">
      <publishTime>01/18/2024 14:15:08</publishTime>
      <publishTime>01/19/2024 10:21:26</publishTime>
    </File>
    <File Include="views/éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBill_LookDown.html">
      <publishTime>01/19/2024 09:43:33</publishTime>
@@ -5445,10 +5445,10 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/é¢æåè´§/éå®åºåº/Kf_SellOutBill.html">
      <publishTime>01/18/2024 14:00:41</publishTime>
      <publishTime>01/19/2024 11:11:04</publishTime>
    </File>
    <File Include="views/é¢æåè´§/éå®åºåº/Kf_SellOutBill.html">
      <publishTime>01/18/2024 14:00:41</publishTime>
      <publishTime>01/19/2024 11:11:04</publishTime>
    </File>
    <File Include="views/é¢æåè´§/éå®åºåº/Kf_SellOutBillList.html">
      <publishTime>01/16/2024 14:21:41</publishTime>

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillList.html

@@ -379,6 +379,7 @@
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 125, sort: true }
                        , { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
                        , { field: 'ç¶æ', title: 'ç¶æ', width: 125, sort: true }
                        , { field: 'è¡ç¶æ', title: 'è¡ç¶æ', width: 125, sort: true }
                        , { field: 'æ¯å¦ä¸æ¨çäº§è®¢å', title: 'æ¯å¦ä¸æ¨çäº§è®¢å', width: 125, sort: true }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
                        , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true }
@@ -871,6 +872,12 @@
                            layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + data[i].åæ®å· + "ãåæ®ç¶æä¸ä¸ºå·²å®¡æ ¸ç¶æ!");
                            return;
                        }

                        if (data[i].è¡ç¶æ == "å·²å³é") {
                            layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + data[i].åæ®å· + "ãä¸éä¸çè®°å½ä¸åå¨å·²å³éç¶æçè®°å½!");
                            return;
                        }

                        if (data[i].å®¢æ· != HCusName) {
                            layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åå®¢æ·!");
                            return;
@@ -1250,7 +1257,7 @@
                var addSWhere = "";

                if (openType == 2) {
                    addSWhere = " and ç¶æ = 'å·²å®¡æ ¸' and HOrgID = " + HOrgID;
                    addSWhere = " and ç¶æ = 'å·²å®¡æ ¸' and è¡ç¶æ = '' and HOrgID = " + HOrgID;
                }
                return addSWhere;
            }

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html

@@ -538,6 +538,9 @@
                            } else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
                                layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i+1) + "è¡ï¼æºååæ®ç¶ææªä¸º'å·²å®¡æ ¸'ç¶æ!", { icon: 5 });
                                return;
                            } else if (HSourceBillData.è¡ç¶æ == "å·²å³é") {
                                layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼è¯¥è¡è®°å½è¡ç¶æä¸º'å·²å³é'ç¶æ!", { icon: 5 });
                                return;
                            }
                        } else {
                            return;
@@ -2346,6 +2349,12 @@
                            layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãåæ®ç¶æä¸ä¸ºå·²å®¡æ ¸ç¶æ!");
                            return;
                        }

                        if (temp.è¡ç¶æ == "å·²å³é") {
                            layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãä¸éä¸çè®°å½ä¸åå¨å·²å³éç¶æçè®°å½!");
                            return;
                        }

                        if (temp.å®¢æ· != HCusName) {
                            layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åå®¢æ·!");
                            return;

			@@ -5262,7 +5262,7 @@
			<publishTime>04/11/2023 16:34:43</publishTime>
			</File>
			<File Include="views/éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBillList.html">
			<publishTime>01/18/2024 14:15:08</publishTime>
			<publishTime>01/19/2024 10:21:26</publishTime>
			</File>
			<File Include="views/éè´ç®¡ç/å§å¤è®¢å/WW_EntrustOrderBillList.html">
			<publishTime>11/03/2023 21:45:51</publishTime>
			@@ -5283,7 +5283,7 @@
			<publishTime>11/03/2023 21:45:51</publishTime>
			</File>
			<File Include="views/éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBillList.html">
			<publishTime>01/18/2024 14:15:08</publishTime>
			<publishTime>01/19/2024 10:21:26</publishTime>
			</File>
			<File Include="views/éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBill_LookDown.html">
			<publishTime>01/19/2024 09:43:33</publishTime>
			@@ -5445,10 +5445,10 @@
			<publishTime>04/11/2023 16:34:43</publishTime>
			</File>
			<File Include="views/é¢æåè´§/éå®åºåº/Kf_SellOutBill.html">
			<publishTime>01/18/2024 14:00:41</publishTime>
			<publishTime>01/19/2024 11:11:04</publishTime>
			</File>
			<File Include="views/é¢æåè´§/éå®åºåº/Kf_SellOutBill.html">
			<publishTime>01/18/2024 14:00:41</publishTime>
			<publishTime>01/19/2024 11:11:04</publishTime>
			</File>
			<File Include="views/é¢æåè´§/éå®åºåº/Kf_SellOutBillList.html">
			<publishTime>01/16/2024 14:21:41</publishTime>

			@@ -379,6 +379,7 @@
			, { field: 'åæ®å·', title: 'åæ®å·', width: 125, sort: true }
			, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 125, sort: true }
			, { field: 'è¡ç¶æ', title: 'è¡ç¶æ', width: 125, sort: true }
			, { field: 'æ¯å¦ä¸æ¨çäº§è®¢å', title: 'æ¯å¦ä¸æ¨çäº§è®¢å', width: 125, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true }
			@@ -871,6 +872,12 @@
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + data[i].åæ®å· + "ãåæ®ç¶æä¸ä¸ºå·²å®¡æ ¸ç¶æ!");
			return;
			}

			if (data[i].è¡ç¶æ == "å·²å³é") {
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + data[i].åæ®å· + "ãä¸éä¸çè®°å½ä¸åå¨å·²å³éç¶æçè®°å½!");
			return;
			}

			if (data[i].å®¢æ· != HCusName) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åå®¢æ·!");
			return;
			@@ -1250,7 +1257,7 @@
			var addSWhere = "";

			if (openType == 2) {
			addSWhere = " and ç¶æ = 'å·²å®¡æ ¸' and HOrgID = " + HOrgID;
			addSWhere = " and ç¶æ = 'å·²å®¡æ ¸' and è¡ç¶æ = '' and HOrgID = " + HOrgID;
			}
			return addSWhere;
			}

			@@ -538,6 +538,9 @@
			} else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i+1) + "è¡ï¼æºååæ®ç¶ææªä¸º'å·²å®¡æ ¸'ç¶æ!", { icon: 5 });
			return;
			} else if (HSourceBillData.è¡ç¶æ == "å·²å³é") {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼è¯¥è¡è®°å½è¡ç¶æä¸º'å·²å³é'ç¶æ!", { icon: 5 });
			return;
			}
			} else {
			return;
			@@ -2346,6 +2349,12 @@
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãåæ®ç¶æä¸ä¸ºå·²å®¡æ ¸ç¶æ!");
			return;
			}

			if (temp.è¡ç¶æ == "å·²å³é") {
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãä¸éä¸çè®°å½ä¸åå¨å·²å³éç¶æçè®°å½!");
			return;
			}

			if (temp.å®¢æ· != HCusName) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åå®¢æ·!");
			return;