优化单品过站

yangle

2023-11-19 e0fa6f63fc5c4148895c6d035e2e3275aaed166a

优化单品过站

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

@@ -693,9 +693,9 @@
                if (!isNaN(HDeptID) && HDeptName == 0) {
                    HDeptName = HDeptID;
                }
                if (!isNaN(HDeptID)) {
                    HStatus = "开工";
                }
                //if (!isNaN(HDeptID)) {
                //    HStatus = "开工";
                //}

                if (HSF) {//判断打印状态
                    if (HSF == "全部") {

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

@@ -751,7 +751,7 @@
            columns.push({ field: '订单交货期', title: '订单交货期', width: 150, templet: "<div>{{d.订单交货期 =='1900-01-01' ?'':layui.util.toDateString(d.订单交货期, 'yyyy-MM-dd')}}</div>", sort: true });
            columns.push({ field: '订单需求数量', title: '订单需求数量', width: 150, sort: true });
            columns.push({ field: '开工余量', title: '开工余量', width: 150, sort: true });
            columns.push({ field: '小时产能', title: '小时产能', width: 150, sort: true });
            columns.push({ field: '小时产能', title: '小时产能', width: 150, sort: true, edit: 'text' });
            columns.push({ field: '生产周期', title: '生产周期', width: 150, sort: true });
            columns.push({ field: '最迟开工日期', title: '最迟开工日期', width: 150, templet: "<div>{{d.最迟开工日期 =='' ?'':layui.util.toDateString(d.最迟开工日期, 'yyyy-MM-dd')}}</div>", sort: true });
            columns.push({ field: '最迟完工日期', title: '最迟完工日期', width: 150, templet: "<div>{{d.最迟完工日期 =='' ?'':layui.util.toDateString(d.最迟完工日期, 'yyyy-MM-dd')}}</div>", sort: true });

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html

@@ -168,6 +168,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" value="" style="background-color:#efefef4d;">
                                                <input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
                                                <input type="hidden" class="layui-input" name="HProdOrgID" lay-verify="HProdOrgID" id="HProdOrgID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -315,10 +316,12 @@
        var params = getUrlVars();
        var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑 4添加子工艺路线
        var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
        var HProcExchBillNo = params[params[2]]; //从参数中获取 å•æ®å†…码

        //制单人
        $("#HMaker").val(sessionStorage["HUserName"]);
        $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
        $("#HProdOrgID").val(sessionStorage["OrganizationID"]);
     
        //判断是否新增
        if (OperationType == 1) {
@@ -455,40 +458,65 @@
        //条码回车查询
        function txtHBarCode_KeyDown(HBarCode) {

            var index = layer.load();
            var indexs = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                async: true,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
                url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
                async: false,
                data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        $("#HICMOBillNo").val(data1.data[0]["生产订单"]);
                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                        $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                        $("#HProcExchBillNo").val(data1.data[0]["工序流转卡"]);
                        $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                        $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
                        $("#HMaterNumber").val(data1.data[0]["物料编码"]);
                        $("#HMaterID").val(data1.data[0]["HMaterID"]);
                        $("#HMaterName").val(data1.data[0]["物料名称"]);
                        $("#HModel").val(data1.data[0]["规格型号"]);
                        $("#HBarCode").val(data1.data[0]["条码"]);
                      
                        layer.close(indexs);
                        var index = layer.load();

                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                            async: false,
                            data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                            dataType: "json",
                            success: function (data1) {
                                if (data1.count == 1) {
                                    layer.close(index);
                                    $("#HICMOBillNo").val(data1.data[0]["生产订单"]);
                                    $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                                    $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                                    $("#HProcExchBillNo").val(data1.data[0]["工序流转卡"]);
                                    $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                                    $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
                                    $("#HMaterNumber").val(data1.data[0]["物料编码"]);
                                    $("#HMaterID").val(data1.data[0]["HMaterID"]);
                                    $("#HMaterName").val(data1.data[0]["物料名称"]);
                                    $("#HModel").val(data1.data[0]["规格型号"]);
                                    $("#HBarCode").val(data1.data[0]["条码"]);

                                }
                                else {
                                    layer.close(index);
                                    layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                                $("#HBarCodeSN").val("");
                            },
                            error: function (err) {
                                layer.close(index);
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        });
                    }
                    else {
                        layer.close(index);
                        layer.close(indexs);
                        layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.close(indexs);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });

          
        }

         //不良原因选择页面

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA.html

@@ -371,12 +371,17 @@

            // NG保存
            form.on('submit(NGSave)', function (data) {
                get_Save(data,"NG");
                if (AllowLoadData()) {
                    get_Save(data, "NG");
                }
              
            });

            // OK保存
            form.on('submit(OKSave)', function (data) {
                get_Save(data,"OK");
                if (AllowLoadData()) {
                    get_Save(data, "OK");
                }
            });

            //#endregion
@@ -760,6 +765,8 @@
                var HSourceBillNo = $("#HSourceBillNo").val();
                var HSourceBillType = $("#HSourceBillType").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HProcExchInterID = $("#HProcExchInterID").val();
                var HProcExchEntryID = $("#HProcExchEntryID").val();
                var HProcess = $("#HProcess").val();
                var HICMOInterID = $("#HICMOInterID").val();
                var HICMOBillNo = $("#HICMOBillNo").val();
@@ -778,6 +785,8 @@
                    , 'HSourceBillType': HSourceBillType
                    , 'HBarCode': HBarCode
                    , 'HProcExchBillNo': HProcExchBillNo
                    , 'HProcExchInterID': HProcExchInterID
                    , 'HProcExchEntryID': HProcExchEntryID
                    , 'HProcess': HProcess
                    , 'HICMOInterID': HICMOInterID
                    , 'HICMOBillNo': HICMOBillNo
@@ -808,7 +817,7 @@
            function get_Save(data, HResult) {
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache["mainTable"]);
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sSubStr+ ";" + sessionStorage["HUserName"] + ";" + HResult;
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;

                var index = layer.load();
                $.ajax({
@@ -841,6 +850,23 @@
                });
            }

            //非空验证
            function AllowLoadData(data) {

                //var HBarCode = $("#HBarCode").val();
                //if (HBarCode == "") {
                //    layer.msg("产品SN不能为空!")
                //    return false;
                //}

                var HBadReasonID = $("#HBadReasonID").val();
                if (HBadReasonID == 0) {
                    layer.msg("不良原因不能为空!")
                    return false;
                }
                return true;
            }

            //#endregion

        });

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA_PJGH.html

@@ -102,6 +102,8 @@
                                                <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
                                                <input type="hidden" name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo">
                                                <input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="HProcExchBillNo">
                                                <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID">
                                                <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID">
                                                <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess">
                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID">
                                                <input type="hidden" name="HICMOBillNo" id="HICMOBillNo" lay-verify="HICMOBillNo">
@@ -198,6 +200,8 @@
            $("#HBillNo").val(datajson.HBillNo);
            $("#HBillNo_bak").val(datajson.HBillNo);
            $("#HProcExchBillNo").val(datajson.HProcExchBillNo);
            $("#HProcExchInterID").val(datajson.HProcExchInterID);
            $("#HProcExchEntryID").val(datajson.HProcExchEntryID);
            $("#HICMOInterID").val(datajson.HICMOInterID);
            $("#HICMOBillNo").val(datajson.HICMOBillNo);
            $("#HICMOEntryID").val(datajson.HICMOEntryID);
@@ -270,7 +274,7 @@
            //查询条码绑定的返修记录
            get_RepairRecord();
            //查询物料清单数据
            get_BomList($("#HProcExchBillNo").val());
            get_BomList();
        }

        //查询
@@ -508,13 +512,13 @@
        }

        //流转卡查询关键件清单
        function get_BomList(HBarCode) {
        function get_BomList() {
            var index = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
                url: GetWEBURL() + "/Cj_SingleStation/AssemHBardCodeBomList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                data: { "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HMaterSN": $("#HMaterSN").val(), "user": sessionStorage["HUserName"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
@@ -549,9 +553,8 @@
                                , { field: '配件名称', title: '配件名称' }
                                , { field: '配件规格', title: '配件规格' }
                                , { field: '配件数量', title: '配件数量' }
                                , { field: 'HBarCode', title: '当前配件码' }
                                , { field: 'HBatchNo', title: '当前批次' }
                                , { field: 'BomHInterID', title: 'BomHInterID', hide: true }
                                , { field: 'BomHEntryID', title: 'BomHEntryID', hide: true }
                                , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                                , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                                , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
@@ -559,7 +562,7 @@
                                , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
                                , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
                                , { field: 'HMaterID', title: 'HMaterID', hide: true }
                                , { field: 'HBarCode', title: 'HBarCode', hide: true }
                                //, { field: 'HBarCode', title: 'HBarCode', hide: true }
                                , { fixed: 'right', title: '操作', toolbar: '#barDemo2' }
                            ]]
                        }
@@ -597,8 +600,7 @@
            var HResult = "配件";
            var sMainStr = JSON.stringify(data1.field);
            var sSubStr = JSON.stringify(table.cache["mainTable2"][KNum]);
            var sSubStr2 = JSON.stringify(table.cache["mainTable2"]);
            var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ";" + sessionStorage["HUserName"] + ";" + HResult;
            var sMainSub = sMainStr + ';' + sSubStr  + ";" + sessionStorage["HUserName"] + ";" + HResult;

            var index = layer.load();
            $.ajax({

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html

@@ -603,6 +603,7 @@
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BadRecordsList',
                type: "GET",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -631,6 +632,7 @@
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/HGRecordsList',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -651,37 +653,52 @@
        
        //条码回车查询
        function txtHBarCode_KeyDown(HBarCode) {

            var index = layer.load();
            var HProcExchBillNo = $("#HProcExchBillNo").val();
            var indexs = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
                url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
                data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        var HProcExchBillNo = $("#HProcExchBillNo").val();
                        //if (data1.data[0]["HSourceBillNo"] != HProcExchBillNo) {
                        //    return layer.msg("扫码错误,请重新扫!");
                        //} else {
                        //    $("#HBarCode_P").val(HBarCode);
                        //    layer.msg("扫码成功!");
                        //}
                        layer.close(indexs);
                        var index = layer.load();

                        $("#HBarCode_P").val(HBarCode);
                        //保存数据
                        set_AddAssemblyBill();
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
                            async: false,
                            data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                            dataType: "json",
                            success: function (data1) {
                                if (data1.count == 1) {
                                    layer.close(index);
                                    $("#HBarCode_P").val(HBarCode);
                                    //保存数据
                                    set_AddAssemblyBill();
                                }
                                else {
                                    layer.close(index);
                                    layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                                $("#HBarCodeSN").val("");
                            },
                            error: function (err) {
                                layer.close(index);
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        });
                    }
                    else {
                        layer.close(index);
                        layer.close(indexs);
                        layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.close(indexs);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
@@ -822,6 +839,7 @@
                                layer.confirm('是否要把当前批次:' + option.data[i]["HBatchNo"] + '替换成批次:' + data1.data[0]["HBatchNo"], function (index) {
                                    layer.close(index);
                                    option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                    option.data[i]["配件数量"] = data1.data[0]["HQty"];
                                    option.data[i]["HBarCode"] = HBarCode;
                                    table.render(option);
                                });
@@ -829,6 +847,7 @@
                            }
                            if (data1.data[0]["HMaterNumber"] == option.data[i]["配件代码"]) {
                                option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                option.data[i]["配件数量"] = data1.data[0]["HQty"];
                                option.data[i]["HBarCode"] = HBarCode;
                                KNum += 1;
                                table.render(option);
@@ -1049,7 +1068,7 @@
                    , area: ['100%', '100%']//大小
                    , title: '工序不良汇报'//标题
                    , shift: 2//弹出动画
                    , content: ['../../车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val(), 'yes']
                    , content: ['../../车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val() + '&HProcExchBillNo=' + $("#HProcExchBillNo").val(), 'yes']
                    , end: function () {
                        get_BadRecords($("#HBardCodeProcExchBillNo").val());
                    }
@@ -1084,7 +1103,6 @@
                        get_AddBomTempList();
                        var HBardCodeProcExchBillNo = $("#HBardCodeProcExchBillNo").val();
                        get_BomList(HBardCodeProcExchBillNo);
                        get_BadRecords(HBardCodeProcExchBillNo);
                        //查询合格记录
                        get_HGRecords();
                        //查询不良记录