工序流转卡 保存工艺路线内码 生产订单完善 工艺路线添加字段 仓库

yangle

2023-02-10 cbef45dac9b58580fac4b67c9c940d6818197730

工序流转卡  保存工艺路线内码
生产订单完善
工艺路线添加字段  仓库

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -55,6 +55,12 @@
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">关闭</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">反关闭</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelltionBill" id="set_CancelltionBill">作废</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCancelltion" id="set_AbandonCancelltion">反作废</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -288,9 +294,11 @@
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
            var HEntryID = params[params[2]]; //获取单据子id

            if (linterid == null || linterid == 0) {
                OperationType = 1;
                HEntryID = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
@@ -307,6 +315,7 @@
                $("#HDate").attr("disabled", true);
                RoadBillMain(linterid);
            }
            HfBtn();

            //#endregion

@@ -368,10 +377,40 @@

            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                //if (AllowLoadData(data)) {
                //    set_AddNew(data);
                //}
                set_AddNew(data);
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                }
                //set_AddNew(data);
            });

            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });

            //反审核
            form.on('submit(set_AbandonCheck)', function (data) {
                set_AbandonCheck(data);
            });

            //关闭
            form.on('submit(set_CloseBill)', function (data) {
                set_CloseBill(data);
            });

            //反关闭
            form.on('submit(set_CancelCloseBill)', function (data) {
                set_CancelCloseBill(data);
            });

            //作废
            form.on('submit(set_CancelltionBill)', function (data) {
                set_CancelltionBill(data);
            });

            //反作废
            form.on('submit(set_AbandonCancelltion)', function (data) {
                set_AbandonCancelltion(data);
            });

            //#endregion
@@ -380,12 +419,13 @@

            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                var time = new Date().getTime() + 86400000;
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HPlanEndDate").val(Format(new Date(time), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(time), "yyyy-MM-dd"));
                //初始化 ç»„织
                Organ();
            }
@@ -653,7 +693,7 @@
            function set_AddNew(data) {

                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr +  ';' + OperationType + ";" + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + HEntryID;

                var index = layer.load();
                $.ajax({
@@ -667,6 +707,13 @@
                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                            layer.close(index);
                            layer.msg("提交成功");
                            //恢复按钮
                            $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_CloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_CancelCloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_CancelltionBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_AbandonCancelltion').removeClass("layui-btn-disabled").attr("disabled", false);
                        }
                        else {
                            layer.close(index);
@@ -683,7 +730,7 @@
            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + "  and hmainid='" + linterid + "'";
                var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + "  and hmainid='" + linterid + "' and HEntryID=" + HEntryID;
                $.ajax({
                    url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
                    type: "GET",
@@ -753,8 +800,226 @@
                            , "HRemark": d.data[0].表头备注
                        });
                        form.render('select');
                       
                    }
                })
            }

            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Sc_ICMOBill/CheckSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);
                                layer.msg(result.Message, { icon: 1 });
                                layer.close(wait);
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                })
            }

            //反审核
            function set_AbandonCheck() {
                layer.confirm("确认要反审核吗?", function (index) {
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Sc_ICMOBill/CheckSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "Type": 2, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                HfBtn();
                                layer.msg(result.Message, { icon: 1 });
                                layer.close(wait);
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                })
            }

            //关闭
            function set_CloseBill() {
                layer.confirm("确认要关闭吗?", function (index) {
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Sc_ICMOBill/CloseSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_CancelCloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
                                layer.msg(result.Message, { icon: 1 });
                                layer.close(wait);
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                })
            }

            //反关闭
            function set_CancelCloseBill() {
                layer.confirm("确认要反关闭吗?", function (index) {
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Sc_ICMOBill/CloseSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "Type": 2, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                HfBtn();
                                layer.msg(result.Message, { icon: 1 });
                                layer.close(wait);
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                })
            }

            //作废
            function set_CancelltionBill() {
                layer.confirm("确认要作废吗?", function (index) {
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Sc_ICMOBill/CancellSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_CancelltionBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_AbandonCancelltion').removeClass("layui-btn-disabled").attr("disabled", false);
                                layer.msg(result.Message, { icon: 1 });
                                layer.close(wait);
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                })
            }

            //反作废
            function set_AbandonCancelltion() {
                layer.confirm("确认要反作废吗?", function (index) {
                    var wait = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Sc_ICMOBill/CancellSc_ICMOReportBill',
                        type: "GET",
                        data: { "HInterID": $("#HInterID").val(), "Type": 2, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                HfBtn();
                                layer.msg(result.Message, { icon: 1 });
                                layer.close(wait);
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(wait);
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                })
            }

            //按钮恢复
            function HfBtn() {
                //新增 æ—¶  ç¦ç”¨å…¶ä»–按钮
                if (OperationType == 1) {
                    $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_CancelltionBill').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_AbandonCancelltion').addClass("layui-btn-disabled").attr("disabled", true);
                } else if (OperationType == 3) {
                    //查询数据
                    var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + "  and hmainid='" + linterid + "' and HEntryID=" + HEntryID;
                    $.ajax({
                        url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
                        type: "GET",
                        async: false,
                        data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                        success: function (d) {
                            //每次恢复按钮
                            $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_CloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_CancelCloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_CancelltionBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            $('#set_AbandonCancelltion').removeClass("layui-btn-disabled").attr("disabled", false);

                            //禁用按钮
                            if (d.data[0]["作废人"] != "") {
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                                $('#set_CancelltionBill').addClass("layui-btn-disabled").attr("disabled", true);
                            } else {
                                $('#set_AbandonCancelltion').addClass("layui-btn-disabled").attr("disabled", true);

                                if (d.data[0]["关闭人"] != "") {
                                    $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                                    $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
                                    $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                                }
                                else {
                                    $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);

                                    if (d.data[0]["审核人"] != "") {
                                        $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                                    }
                                    else {
                                        $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
                                    }
                                }
                            }
                        }
                    })
                }
            }

            //非空验证
@@ -783,10 +1048,10 @@
                    return false;
                }

                if ($("#BomName").val() == "") {
                    layer.msg("BOM没有选择");
                    return false;
                }
                //if ($("#BomName").val() == "") {
                //    layer.msg("BOM没有选择");
                //    return false;
                //}
              

                return true;

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -704,7 +704,7 @@
                    , area: ['100%', '100%']
                    , title: '生产订单新增'
                    , shift: 0//弹出动画
                    , content: '../生产任务单/Sc_ICMOBillEdit_NoTable.html?OperationType=1&linterid='
                    , content: '../生产任务单/Sc_ICMOBillEdit_NoTable.html?OperationType=1&linterid=&HEntryID=1'
                    , end: function () {
                        //刷新页面,
                        location.reload();
@@ -718,13 +718,14 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;
                    var HEntryID = data[0].hsubid;

                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产订单编辑'
                        , shift: 0//弹出动画
                        , content: '../生产任务单/Sc_ICMOBillEdit_NoTable.html?OperationType=3&linterid=' + linterid + ''
                        , content: '../生产任务单/Sc_ICMOBillEdit_NoTable.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + HEntryID
                        , end: function () {
                            //刷新页面,
                            location.reload();

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

@@ -465,7 +465,8 @@
                , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
                , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                , "HProcWorkNum": ""
                , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                , "HWHID": 0,"HWHName":""
            }];
            var HModName = "Sc_MouldDotCheckBillList";
            //#endregion
@@ -532,6 +533,12 @@
                    , { field: 'HPicNum', title: '图纸编号', edit: 'text' }
                    , { field: 'HProcCheckNote', title: '本工序确认记录', edit: 'text' }
                    , { field: 'HProcWorkNum', title: '程序号', edit: 'text' }
                    , { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
                    , { field: 'HBadWHName', title: '不良品仓', edit: 'text', event: "HBadWHID" }//f7
                    , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
                    , { field: 'HWasterWHName', title: '报废品仓', edit: 'text', event: "HWasterWHID" }//f7
                    , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
                    , { field: 'HWHName', title: '良品仓', edit: 'text', event: "HWHID" }//f7
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
                //, done: function (res, curr, count) {
@@ -761,7 +768,8 @@
                    , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
                    , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                    , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    , "HProcWorkNum": ""
                    , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                    , "HWHID": 0, "HWHName": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -1390,6 +1398,99 @@
                                }
                            })
                        }
                        //不良品仓  
                        if (obj.event == "HBadWHID") {
                            //打开人员表  å°çª—体
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //加上边框
                                , title: "仓库列表"  //标题
                                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ["../../Baseset/基础资料/Gy_WarehouseList.html?Type=0&HOtherOrgID=" + sessionStorage["OrganizationID"], "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HBadWHID": checkStatus.data[0].HItemID
                                        , "HBadWHName": checkStatus.data[0].HName
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            })
                        }

                        //良品仓  
                        if (obj.event == "HWHID") {
                            //打开人员表  å°çª—体
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //加上边框
                                , title: "仓库列表"  //标题
                                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ["../../Baseset/基础资料/Gy_WarehouseList.html?Type=0&HOtherOrgID=" + sessionStorage["OrganizationID"], "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HWHID": checkStatus.data[0].HItemID
                                        , "HWHName": checkStatus.data[0].HName
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            })
                        }

                        //报废品仓
                        if (obj.event == "HWasterWHID") {
                            //打开人员表  å°çª—体
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //加上边框
                                , title: "仓库列表"  //标题
                                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ["../../Baseset/基础资料/Gy_WarehouseList.html?Type=0&HOtherOrgID=" + sessionStorage["OrganizationID"], "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HWasterWHID": checkStatus.data[0].HItemID
                                        , "HWasterWHName": checkStatus.data[0].HName
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            })
                        }

                        obj.event = "";
                        return false;
                    }
@@ -1477,7 +1578,8 @@
                                    , "HFixPrice": d.data[i].班产定额, "HProcPrice": d.data[i].加工单价, "HBadPrice": d.data[i].不合格单价, "HWasterPrice": d.data[i].报废单价, "HStdFlag": d.data[i].标准定额
                                    , "HBeginDayQty": d.data[i].开工余量天数, "HBeginFixQty": d.data[i].开工余量固数, "HFixWorkDays": d.data[i].上道固定天数, "HTrunWorkDays": d.data[i].上道循环周期, "HReadyTimes": d.data[i].本道准备时间
                                    , "HICMOReadyTimes": d.data[i].换单准备时间, "HAutoTrunFlag": d.data[i].自动移转, "HTechnologyParameter": d.data[i].工艺参数, "HPicNum": d.data[i].图纸编号, "HProcCheckNote": d.data[i].本工序确认记录
                                    , "HProcWorkNum": d.data[i].程序号
                                    , "HProcWorkNum": d.data[i].程序号, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
                                    , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName
                                }
                            )
                        }
@@ -1580,12 +1682,39 @@
                //}
                var num = [];
                for (var i = 0; i < option.data.length; i++) {
                    //流水号
                    if ($.inArray(option.data[i]["HProcNo"], num) == -1) {
                        num.push(option.data[i]["HProcNo"]);
                    } else {
                        layer.msg("流水号:" + option.data[i]["HProcNo"] + "重复!");
                        layer.msg("第" + (i + 1) + "行,流水号:" + option.data[i]["HProcNo"] + "重复!");
                        return false;
                    }
                    //流水号不为空
                    if (option.data[i]["HProcNo"] == "") {
                        layer.msg("第" + (i + 1) + "行:流水号不能为空!");
                        return false;
                    }
                    //仓库重复
                    if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWasterWHID"] != 0) {

                        if (option.data[i]["HBadWHID"] == option.data[i]["HWasterWHID"]) {
                            layer.msg("第" + (i + 1) + "行:不良品仓和报废品仓重复!");
                            return false;
                        }
                    }
                    if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWHID"] != 0) {
                        if (option.data[i]["HBadWHID"] == option.data[i]["HWHID"]) {
                            layer.msg("第" + (i + 1) + "行:不良品仓和良品仓重复!");
                            return false;
                        }
                    }
                    if (option.data[i]["HWasterWHID"] != 0 && option.data[i]["HWHID"] != 0) {
                        if (option.data[i]["HWasterWHID"] == option.data[i]["HWHID"]) {
                            layer.msg("第" + (i + 1) + "行:报废品仓和良品仓重复!");
                            return false;
                        }
                    }

                }

                return true;

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

@@ -279,6 +279,9 @@
                    , { field: '版本', title: '版本', width: 120 }
                    , { field: '模具编号', title: '模具编号', width: 120 }
                    , { field: '程序号', title: '程序号', width: 120 }
                    , { field: '不良品仓', title: '不良品仓', width: 120 }
                    , { field: '报废品仓', title: '报废品仓', width: 120 }
                    , { field: '良品仓', title: '良品仓', width: 120 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -224,6 +224,7 @@
                                            <label class="layui-form-label">工艺路线</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="RoutingBill" id="RoutingBill" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HRoutingBillID" id="HRoutingBillID" >
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingBill" id="btnRoutingBill" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -1504,6 +1505,7 @@
                        var Tablerow = [];

                        $("#RoutingBill").val(data[0].单据号)
                        $("#HRoutingBillID").val(data[0].hmainid)

                        for (var i = 0; i < data.length; i++) {
                            Tablerow.push({