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

wtt

2025-05-08 06f92c17e2178797c7f9b7244ac1063ae4bfa4f8

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

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

@@ -202,7 +202,7 @@
            var closeType = params[params[3]];  //关闭类型
        }


        var OptionData = [];
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -1780,7 +1780,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                                content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes'],
                                btn: [get_MessageError('[0000-2-051]确定', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]取消', sessionStorage["HTranSlate"])]
                                , btn1: function (index, layero) {

@@ -1805,8 +1805,16 @@
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {

                                }
                                    if (OptionData.length > 0) {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HEmpID": OptionData[0].HItemID
                                            , "HEmpNumber": OptionData[0].职员代码
                                            , "HEmpName": OptionData[0].职员名称
                                        })
                                        OptionData = [];
                                    }
                                }                               
                            });
                        }
                        //班组代码
@@ -1958,6 +1966,12 @@


        });

        //操作员
        function GetHEmpValue(obj) {
            OptionData = obj;
        }

    </script>
</body>
</html>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξߵã¼ì±£Ñø/Sc_MouldMaintainBill_PDA.html

@@ -168,8 +168,12 @@
                                            <th>保养计划</th>
                                            <td class="bz_td">
                                                <input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                                <input type="hidden" name="HMouldMaintainPlanInterID" class="layui-input LineHeight" id="HMouldMaintainPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
                                                <input type="hidden" name="HMouldMaintainPlanEntryID" class="layui-input LineHeight" id="HMouldMaintainPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
                                                <input type="hidden" name="HPlanInterID" id="HPlanInterID" value="0" readonly>
                                                <input type="hidden" name="HMouldMaintainPlanInterID" id="HMouldMaintainPlanInterID" value="0" readonly>
                                                <input type="hidden" name="HMouldMaintainPlanEntryID" id="HMouldMaintainPlanEntryID" value="0" readonly>
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0" readonly>
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" readonly>
                                                <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0" readonly>
                                            </td>
                                        </tr>
                                    </tbody>
@@ -551,8 +555,12 @@
                        $("#HMouldMaintainRuleInterNo").val(checkStatus.data[0].单据号);
                        $("#HMouldMaintainRuleInterID").val(checkStatus.data[0].hmainid);
                        $("#HPlanNo").val(checkStatus.data[0].保养计划号);
                        $("#HPlanInterID").val(checkStatus.data[0].保养计划id);
                        $("#HMouldMaintainPlanInterID").val(checkStatus.data[0].保养计划id);
                        $("#HMouldMaintainPlanEntryID").val(checkStatus.data[0].保养计划子id);
                        $("#HMainSourceBillNo").val(checkStatus.data[0].保养计划号);
                        $("#HMainSourceInterID").val(checkStatus.data[0].保养计划id);
                        $("#HMainSourceEntryID").val(checkStatus.data[0].保养计划子id);
                        get_DocCheckItem2();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackCheckBillMain.html

@@ -553,7 +553,7 @@
                                    var LoadData = data.data;
                                    $("#HDeptID").val(LoadData[0].HDeptID); //部门ID
                                    $("#HDeptName").val(LoadData[0].发送部门); //发送部门
                                    $("#HReceiveID").val(LoadData[0].HReceiveID); //部门ID
                                    $("#HReceiveID").val(LoadData[0].HRecDeptID); //部门ID
                                    $("#HReceiveName").val(LoadData[0].接收部门); //接收部门
                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //异常类型名称ID
                                    $("#HErrMsgBackTypeName").val(LoadData[0].异常类型名称); //异常类型名称

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackHandleBillMain.html

@@ -562,7 +562,7 @@
                                    var LoadData = data.data;
                                    $("#HDeptID").val(LoadData[0].HDeptID); //部门ID
                                    $("#HDeptName").val(LoadData[0].发送部门); //发送部门
                                    $("#HReceiveID").val(LoadData[0].HReceiveID); //部门ID
                                    $("#HReceiveID").val(LoadData[0].HRecDeptID); //部门ID
                                    $("#HReceiveName").val(LoadData[0].接收部门); //接收部门
                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //异常类型名称ID
                                    $("#HErrMsgBackTypeName").val(LoadData[0].异常类型名称); //异常类型名称

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackSignBillMain.html

@@ -536,7 +536,7 @@
                                    var LoadData = data.data;
                                    $("#HDeptID").val(LoadData[0].HDeptID); //部门ID
                                    $("#HDeptName").val(LoadData[0].发送部门); //发送部门
                                    $("#HReceiveID").val(LoadData[0].HReceiveID); //部门ID
                                    $("#HReceiveID").val(LoadData[0].HRecDeptID); //部门ID
                                    $("#HReceiveName").val(LoadData[0].接收部门); //接收部门
                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //异常类型名称ID
                                    $("#HErrMsgBackTypeName").val(LoadData[0].异常类型名称); //异常类型名称
@@ -572,7 +572,7 @@
                                    var LoadData = data.data;
                                    $("#HDeptID").val(LoadData[0].HDeptID); //部门ID
                                    $("#HDeptName").val(LoadData[0].发送部门); //发送部门
                                    $("#HReceiveID").val(LoadData[0].HReceiveID); //部门ID
                                    $("#HReceiveID").val(LoadData[0].HReceiveID == undefined ? 0 : LoadData[0].HReceiveID); //部门ID
                                    $("#HReceiveName").val(LoadData[0].接收部门); //接收部门
                                    $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //异常类型ID
                                    $("#HErrMsgBackTypeName").val(LoadData[0].接收部门); //异常类型

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm_TK.html

@@ -1298,7 +1298,7 @@
                        layer.close(ajaxLoad);
                        if (HinterID_S.length > 0) {
                            get_Display_1(HinterID_S);
                            get_Display_2(HinterID_S)
                            get_Display_2(HinterID_S);
                        }

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -3078,15 +3078,30 @@

        //将数据排程到网格
        function SetInfoToGrid(grd, ds, dsPre, iRow, sLeftQty, sWorkQty, bAddFlag, HPlanDay) {
            var dsindex = 0;
            var HPCDate_Reset = "";
            //判断当前生产资源已经排产到哪个日期了，当前生产资源还有产能的最近日期与当前订单的排产日期不符，则重置当前排产日期
            if (Format(ds[0]["日期"], 'yyyy/MM/dd') != Format(HPCDate, 'yyyy/MM/dd')) {
              
                for (var i = 0; i < ds.length; i++) {
                    if (Format(ds[i]["日期"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['最早开工日期'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
                        //用来重置当前排产日期（有些订单开工日期靠后，要先把后面日期的资源工时占用，排产结束后在把日期调回到没被排产的日期）
                        if (i != 0) {
                            HPCDate_Reset = ds[0]["日期"];
                        }

                        //匹配订单适合的排产日期
                        dsindex = i;
                        break;
                    }
                }
                //当前生产资源剩余产能最近的日期满足最早开工日期，则重置排产日期为当前生产资源剩余产能最近的日期
                if (Format(ds[0]["日期"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['最早开工日期'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
                if (Format(ds[dsindex]["日期"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['最早开工日期'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {

                    if (HArrIndex.length + HArrIndex_PC.length == option.data.length) {
                        HPCDate = Format(grd.data[iRow]['最早开工日期'], 'yyyy/MM/dd');
                    } else {
                        HPCDate = Format(ds[0]["日期"], 'yyyy/MM/dd');
                        HPCDate = Format(ds[dsindex]["日期"], 'yyyy/MM/dd');
                    }

                    //如果是最后一笔订单在排产，则重置排产日期为最早开工日期（下方会判断，不会超产能排产）
@@ -3094,7 +3109,6 @@
                        HPCDate = Format(grd.data[iRow]['最早开工日期'], 'yyyy/MM/dd');
                    }
                } else { //当前日期不符合订单的最早开工日期，则把订单重新加入待排产列表

                    //将下标加入未排产订单数组
                    if (HArrIndex.indexOf(iRow) == -1) {
                        HArrIndex.push(iRow);
@@ -3314,7 +3328,12 @@
                                            //oSub.iRow = iRow;
                                            //oSub.iCol = j;
                                            //option.data[iRow]["HLeftTimes"] = ds[i]["最大剩余工时"];
                                            HPCDate = Format(grd.cols[0][j].field, 'yyyy/MM/dd');//赋值排产日期

                                            if (HPCDate_Reset != "") {
                                                HPCDate = HPCDate_Reset;
                                            } else {
                                                HPCDate = Format(grd.cols[0][j].field, 'yyyy/MM/dd');//赋值排产日期
                                            }                                            

                                            HIsPriority = false;
                                            break;
@@ -3794,6 +3813,13 @@
            //删除子表数据 ä¼šå ç”¨æ•°ç»„的位置,需要重新排一下顺序
            var num = [];
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i].物料名称.indexOf("\"") != -1 || option.data[i].物料名称.indexOf(";") != -1) {
                    option.data[i].物料名称 = option.data[i].物料名称.replaceAll("\"", "”").replaceAll(";", "；")
                }
                if (option.data[i].规格型号.indexOf("\"") != -1 || option.data[i].规格型号.indexOf(";") != -1) {
                    option.data[i].规格型号 = option.data[i].规格型号.replaceAll("\"", "”").replaceAll(";", "；")
                }

                if (option.data[i] != "") {
                    if (parseFloat(option.data[i]["拆单数量"]) == 0) {
                        return layer.msg("第" + (i + 1) + "行,拆产数量有误,请重新输入!");
@@ -3806,42 +3832,50 @@
                }
            }

            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr +"&和" + sessionStorage["HUserName"];

            var HDataSub = [];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
                async: HAsync,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        if ($("#HWorkShopID").val() == 0) {
                            get_FastQuery(1);
                            HAsync = true;

            //JIT导入计划，每次导入100行数据,可修改i的自增值决定每次循环导入的行数
            for (var i = 0; i < option.data.length; i += 100) {
                HDataSub = option.data.slice(i, i + 100)
                console.log("开始保存前" + i + "条订单");

                var sSubStr = JSON.stringify(HDataSub);
                var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
                
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
                    async: HAsync,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {                           
                            //layer.close(index);
                            //layer.msg("保存成功");
                        }
                        else {
                            get_FastQuery(2);
                            //layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            HAsync = true;
                        }
                        layer.close(index);
                        layer.msg("保存成功");
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    },
                    error: function (err) {
                        //layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        HAsync = true;
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    HAsync = true;
                }
            });
                });
            }
            layer.close(index);
            if ($("#HWorkShopID").val() == 0) {
                get_FastQuery(1);
                HAsync = true;
            }
            else {
                get_FastQuery(2);
                HAsync = true;
            }
        }

        function set_AddNew1(num) {

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -1403,7 +1403,7 @@
                    case 'HWorkQty': //约当系数
                        if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
                            obj.update({
                                HYDCoefficient: (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6)
                                HYDCoefficient: !isNaN(parseFloat((localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6) : 0
                            });
                        }
                        break;
@@ -2277,7 +2277,7 @@
                                            option.data[i]["工段"] = checkStatus.data[j]["工段名称"];
                                            option.data[i]["标准工价"] = checkStatus.data[j]["标准工价"];
                                            option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["标准工价"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
                                            option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["标准工价"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6)//约当系数=基准值/小时产能
                                            option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["标准工价"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["标准工价"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6) : 0;//约当系数=基准值/小时产能
                                            j++;
                                        }
                                    }
@@ -2312,7 +2312,7 @@
                                            , "工段": OptionData[0].工段名称
                                            , "标准工价": OptionData[0].标准工价
                                            , "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].标准工价 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
                                            , "HYDCoefficient": (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].标准工价 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6)
                                            , "HYDCoefficient": !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].标准工价 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].标准工价 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6) : 0

                                        })
                                        OptionData = [];
@@ -2712,7 +2712,7 @@
                                option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
                                option.data[i]["工段"] = data.data[j]["工段名称"];
                                option.data[i]["标准工价"] = WorkCente[j]["标准工价"];
                                option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
                                option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;

                                j++;
                            }
@@ -2753,7 +2753,7 @@
                                option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
                                option.data[i]["工段"] = data.data[j]["工段名称"];
                                option.data[i]["标准工价"] = WorkCente[j]["标准工价"];
                                option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
                                option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
                                j++;
                            }
                        }

 WebTM/views/ÖÊÁ¿¹ÜÀí/Òì³£·´À¡/OA_ErrMsgBackSelfQuery_BGT.html

@@ -374,9 +374,20 @@
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HSourceName").val("");
                $('#HSourceID').val("0");
                $('#HSourceID').val("");
                var HStatus = $("#HReadFlag").val();//阅读状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HSourceID = $("#HSourceID").val();//生产资源                         
                sWhere = {
                    HStatus: HStatus
                    , HBeginDate: HBeginDate
                    , HEndDate: HEndDate
                    , HSourceID: HSourceID
                }
                get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion