Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2025-08-05 bef1b10cc26f29b96c5eb7afacfdcce8ca534ea5

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill_JiaNan.html

@@ -244,6 +244,8 @@
            var HSourceBillNo = params[params[5]];

            var HZZRQ = "";                             //制造日期

            var HQty_waitProduce = 0;                   //可生成条码数量
            //源单单号
            //#endregion
            //#endregion
@@ -263,6 +265,14 @@

            }
            else if (OperationType == "4") {                                        //下推
                var temp = getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
                var dataArray = [];
                dataArray.push(temp);
                if (dataArray[0].条码同步标记.trim() != "") {
                    layer.alert("该单据明细记录条码已经同步，不允许生成条码，请撤销同步后再进行生成！！", { icon: 5 });
                    return;
                }

                setInit_PushBill();
            }
            else {
@@ -287,6 +297,16 @@
                var sMainData_temp = [];

                if (sMainData.HBarCodeType == "BarCode") {
                    //判断生成条码数量是否超过可生成条码数量
                    var temp = getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
                    var dataArray = [];
                    dataArray.push(temp);
                    var HQty_SourceBill = $("#HQty_SourceBill").val() * 1;
                    if (HQty_SourceBill > ((dataArray[0].数量 * 1) - (dataArray[0].已生成条码数量 * 1))) {
                        layer.msg("条码生成数量大于最大可生成数量【" + ((dataArray[0].数量 * 1) - (dataArray[0].已生成条码数量 * 1)) + "】!!");
                        return false;
                    }

                    sMainData_temp = [
                        {
                            "HMainID": sMainData.HMainSourceInterID
@@ -701,6 +721,12 @@
                            return false;
                        }

                        if (newHQty_SourceBill > HQty_waitProduce) {
                            layer.msg("条码生成数量大于最大可生成数量【" + HQty_waitProduce + "】!!");
                            $("#HQty_SourceBill").val(oldHQty_SourceBill);
                            return false;
                        }

                        //输入的源单数量合法，重算相关数据
                        var HQty_SourceBill = newHQty_SourceBill * 1;                               //源单数量
                        var HMinQty = $("#HMinQty").val() * 1;                                      //每包数量
@@ -997,13 +1023,15 @@
                        , "HMaterModel": dataArray[0].规格型号
                        , "HUnitID": dataArray[0].HUnitID
                        , "HUnitName": dataArray[0].计量单位
                        , "HQty_SourceBill": dataArray[0].数量
                        , "HQty_SourceBill": (dataArray[0].数量 * 1) - (dataArray[0].已生成条码数量 * 1)
                        , "HBatchNo": dataArray[0].批号
                        , "HAuxPropID": dataArray[0].HAuxPropID
                        , "HAuxPropNumber": dataArray[0].辅助属性代码
                        , "HAuxPropName": dataArray[0].辅助属性
                    });
                    HZZRQ = dataArray[0].制造日期;

                    HQty_waitProduce = (dataArray[0].数量 * 1) - (dataArray[0].已生成条码数量 * 1);
                }
                else if (HBarCodeType == "BarCode_Box") {
                    var HQty_SourceElement = document.getElementById("HQty_SourceElement");