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

chenhaozhe

2025-09-23 65968b3e0e9e03ef0904de35b78872224b9ce00a

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

@@ -247,6 +247,8 @@
            var HOrgID = params[params[5]];             //组织id

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

            var HQty_waitProduce = 0;                   //可生成条码数量
            //#endregion
            //#endregion

@@ -270,6 +272,17 @@

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

                setInit_PushBill();
            }
            else {
@@ -294,6 +307,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
@@ -660,6 +683,8 @@
                        rows.push(dataArr[i].HItemID.toString());
                    }
                    //rows = rows.substring(rows.length - 1, 0);
                    var HBarCodeType_Temp = $("#HBarCodeType").val();

                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
@@ -667,7 +692,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HGy_BarCodeBill_JiaNan', 'yes']
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HGy_BarCodeBill_JiaNan_' + HBarCodeType_Temp, 'yes']
                        , resize: false
                    })
                }
@@ -700,6 +725,12 @@
                        var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                        if (!ref.test(newHQty_SourceBill)) {
                            layer.msg("源单数量请输入不小于0的数字!");
                            $("#HQty_SourceBill").val(oldHQty_SourceBill);
                            return false;
                        }

                        if (newHQty_SourceBill > HQty_waitProduce) {
                            layer.msg("条码生成数量大于最大可生成数量【" + HQty_waitProduce + "】!!");
                            $("#HQty_SourceBill").val(oldHQty_SourceBill);
                            return false;
                        }
@@ -1000,13 +1031,40 @@
                        , "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].辅助属性
                        , "HMinQty": dataArray[0].最小包装数
                    });
                    HZZRQ = dataArray[0].制造日期;

                    HQty_waitProduce = (dataArray[0].数量 * 1) - (dataArray[0].已生成条码数量 * 1);

                    //计算包数与尾包数量
                    var HQty_SourceBill = $("#HQty_SourceBill").val() * 1;       //金额文本框失焦时获取修改后的值
                    var HMinQty = $("#HMinQty").val() * 1;                                      //每包数量

                    //判断源单数量是否合法
                    var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                    if (!ref.test(HQty_SourceBill)) {
                        layer.msg("源单数量不为大于等于0的数字!!");
                        return false;
                    }

                    //判断每包数量是否合法
                    if (!ref.test(HMinQty) || HMinQty == "0") {
                        layer.msg("每包数量不为大于等于0的数字!!");
                        return false;
                    } else if (HMinQty == "0") {
                        return false;
                    }

                    var HEndQty = HQty_SourceBill % HMinQty;                                            //尾包数量
                    var HBQty = (HQty_SourceBill - HEndQty) / HMinQty + ((HEndQty > 0) ? 1 : 0);        //包数
                    $("#HBQty").val(HBQty);
                    $("#HEndQty").val(HEndQty);
                }
                else if (HBarCodeType == "BarCode_Box") {
                    var HQty_SourceElement = document.getElementById("HQty_SourceElement");