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

yusijie

2024-01-16 c75b62d30f30cea15e9426065d17f20c52a0e778

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

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

@@ -427,6 +427,13 @@
        </div>
    </script>

    <!--复选框 æŽ’产工序标记-->
    <script type="text/html" id="HSortProcFlag">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HSortProcFlag" lay-filter="HSortProcFlag" id="HSortProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>

    <!--复选框 ä¸‹é“流转工序-->
    <script type="text/html" id="HNextProcFlag">
        <div class="layui-input-block" style="margin-left: 20px;">
@@ -482,7 +489,7 @@
                , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
                , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "工序": ""
                , "HProcID": 0, "工作中心代码": "", "HCenterID": 0, "工作中心": "", "HSupID": 0
                , "供应商代码": "", "供应商": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
                , "供应商代码": "", "供应商": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
                , "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
                , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
                , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
@@ -520,6 +527,7 @@
                    , { field: '供应商代码', title: '供应商代码', edit: 'text', width: 110, event: "CheckHSupID" }
                    , { field: '供应商', title: '供应商' }//f7
                    , { field: 'HSupFlag', title: '外协标记', templet: "#HSupFlag" }//checkbox
                    , { field: 'HSortProcFlag', title: '排产工序标记', templet: "#HSortProcFlag" }//checkbox

                    //, { field: 'HProcType', title: '工序类型', templet: '#HProcType' }//选择
                    ////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
@@ -786,6 +794,18 @@
                });
            });

            //排产工序标记
            form.on('checkbox(HSortProcFlag)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HSortProcFlag = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });

            //下道流转工序
            form.on('checkbox(HNextProcFlag)', function (data) {
                //获取下拉框选中的值
@@ -859,7 +879,7 @@
                    , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
                    , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "工序": ""
                    , "HProcID": 0, "工作中心代码": "", "HCenterID": 0, "工作中心": "", "HSupID": 0
                    , "供应商代码": "", "供应商": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
                    , "供应商代码": "", "供应商": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
                    , "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
                    , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
                    , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
@@ -882,6 +902,10 @@
                            //委外协助
                            if (option.data[i - 1].HSupFlag) {
                                $('#HSupFlag' + i + '').attr("checked", true);
                            }
                            //排产工序标记
                            if (option.data[i - 1].HSortProcFlag) {
                                $('#HSortProcFlag' + i + '').attr("checked", true);
                            }
                            //下道流转工序
                            if (option.data[i - 1].HNextProcFlag) {
@@ -922,6 +946,10 @@
                                //委外协助
                                if (option.data[i - 1].HSupFlag) {
                                    $('#HSupFlag' + i + '').attr("checked", true);
                                }
                                //排产工序标记
                                if (option.data[i - 1].HSortProcFlag) {
                                    $('#HSortProcFlag' + i + '').attr("checked", true);
                                }
                                //下道流转工序
                                if (option.data[i - 1].HNextProcFlag) {
@@ -1477,7 +1505,7 @@
                                                , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
                                                , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "工序": WorkCente[j]["工序名称"]
                                                , "HProcID": WorkCente[j]["HProcID"], "工作中心代码": WorkCente[j]["工作中心代码"], "HCenterID": WorkCente[j]["HCenterID"], "工作中心": WorkCente[j]["工作中心名称"], "HSupID": 0
                                                , "供应商代码": "", "供应商": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
                                                , "供应商代码": "", "供应商": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
                                                , "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
                                                , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
                                                , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
@@ -1839,7 +1867,7 @@
                                    , "HWorkQty_S": d.data[i].产线产能, "HSubStdEmpQty_S": d.data[i].产线人数, "HMouldNo": d.data[i].模具编号, "HChangeMould": d.data[i].换模时间, "HPackStd": d.data[i].周转箱标准
                                    , "HPack": d.data[i].周转箱, "HPutArea": d.data[i].暂放区, "HMyWorkDays": d.data[i].生产周期, "HMyFixWorkDays": d.data[i].固定生产天数, "工序": d.data[i].工序
                                    , "HProcID": d.data[i].hprocid, "工作中心代码": d.data[i].工作中心代码, "HCenterID": d.data[i].HCenterID, "工作中心": d.data[i].工作中心名称, "HSupID": d.data[i].HSupID
                                    , "供应商代码": d.data[i].供应商代码, "供应商": d.data[i].供应商, "HSupFlag": d.data[i].委外标记 == 0 ? false : true, "HTimeUnit": d.data[i].时间单位, "HUnitTime": d.data[i].运行时间
                                    , "供应商代码": d.data[i].供应商代码, "供应商": d.data[i].供应商, "HSupFlag": d.data[i].委外标记 == 0 ? false : true, "HSortProcFlag": d.data[i].排产工序标记 == 0 ? false : true, "HTimeUnit": d.data[i].时间单位, "HUnitTime": d.data[i].运行时间
                                    , "HWorkQty": d.data[i].加工数量, "HPassRate": d.data[i].良率, "HOverRate": d.data[i].超额比例, "HReadyTime": d.data[i].准备时间, "HQueueTime": d.data[i].排队时间
                                    , "HMoveTime": d.data[i].转移时间, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].流转工序 == 0 ? false : true, "HSubStdEmpQty": d.data[i].标准人数, "HSubCanUseSourceQty": d.data[i].可操作设备数
                                    , "HFixPrice": d.data[i].班产定额, "HProcPrice": d.data[i].加工单价, "HBadPrice": d.data[i].不合格单价, "HWasterPrice": d.data[i].报废单价, "HStdFlag": d.data[i].标准定额
@@ -1859,6 +1887,9 @@
                        for (var i = 0; i < d.data.length; i++) {
                            if (d.data[i].委外标记) {
                                $('#HSupFlag' + (i + 1)).attr("checked", true);
                            }
                            if (d.data[i].排产工序标记) {
                                $('#HSortProcFlag' + (i + 1)).attr("checked", true);
                            }
                            if (d.data[i].HNextProcFlag) {
                                $('#HNextProcFlag' + (i + 1)).attr("checked", true);
@@ -1968,6 +1999,7 @@
                //    layer.msg("生产班组没有选择");
                //    return false;
                //}
                var pc = 0;
                var num = [];
                for (var i = 0; i < option.data.length; i++) {

@@ -1996,6 +2028,17 @@
                                return false;
                            }
                        }

                        //排产工序标记
                        if (option.data[i]["HSortProcFlag"]) {
                            pc += 1;
                        }

                        if (pc > 1) {
                            layer.msg("排产工序标记只能选择一个,请重新选择!");
                            return false;
                        }

                        //else {
                        //    if (option.data[i]["HCenterID"] == "0") {
                        //        layer.msg("第" + (i + 1) + "行:工作中心不能为空!");
@@ -2036,7 +2079,6 @@
                        }
                    }
                }

                return true;
            }