yusijie
2023-03-17 cb6832f2a5a8f577b2aab829498761b401ed530a
工序进出站
5个文件已修改
92 ■■■■■ 已修改文件
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_Detail.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html
@@ -747,6 +747,7 @@
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.code == 1) {
                        var data = result.data[0];
                        txtHBarCode_KeyDown(data.HBarCode);
                        txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
@@ -790,6 +791,10 @@
                        }
                        PicUpload();
                        layer.close(index);
                        }
                        else {
                            layer.close(index);
                        }
                    }
                    , error: function () {
                        layer.close(index);
@@ -864,7 +869,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                    type: "GET",
                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];
@@ -913,7 +918,11 @@
                                case "PRO":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcID": data.HItemID,
                                        "HProcName": data.工序名称
                                        "HProcName": data.工序名称,
                                        "HProcNo": data.流水号,
                                        "lngBillSubKey": data.hsubid,
                                        "HCenterName": data.工作中心,
                                        "HCenterID": data.HCenterID
                                    });
                                    break;
                                case "WLM":
@@ -941,8 +950,8 @@
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrgID": data.组织
                                    });
                                    $("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    $("#HBarCode").css("background-color", "#efefef4d");
                                    //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    //$("#HBarCode").css("background-color", "#efefef4d");
                                    HProcExchBillNoFlag = true;
                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
@@ -951,7 +960,7 @@
                                    $.ajax({
                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                        type: "GET",
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = data1.data[0];
@@ -1298,6 +1307,10 @@
            //提交
            form.on('submit(Saver)', function (data) {//提交
                if ($("#lngBillSubKey").val() == 0) {
                    layer.msg("流水号没有选择!请输入流水号后回车!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var tableData = data.field;
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                var index = layer.load();
@@ -1326,7 +1339,7 @@
                                    }
                                }
                            }
                            if (result.Verify == "Y") {
                            if (data.Verify == "Y") {
                                location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                            }
                            else {
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationInBill_PDA.html
@@ -897,7 +897,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                    type: "GET",
                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In"},
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];
@@ -946,7 +946,11 @@
                                case "PRO":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcID": data.HItemID,
                                        "HProcName": data.工序名称
                                        "HProcName": data.工序名称,
                                        "HProcNo": data.流水号,
                                        "lngBillSubKey": data.hsubid,
                                        "HCenterName": data.工作中心,
                                        "HCenterID": data.HCenterID
                                    });
                                    break;
                                case "WLM":
@@ -987,7 +991,7 @@
                                    $.ajax({
                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                        type: "GET",
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "In" },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = data1.data[0];
@@ -1172,7 +1176,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                    type: "GET",
                    data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                    data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In" },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html
@@ -583,6 +583,7 @@
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.code == 1) {
                        var data = result.data[0];
                        txtHBarCode_KeyDown(data.HBarCode);
                        txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
@@ -626,6 +627,9 @@
                        }
                        PicUpload();
                        layer.close(index);
                        } else {
                            layer.close(index);
                        }
                    }
                    , error: function () {
                        layer.close(index);
@@ -700,7 +704,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                    type: "GET",
                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];
@@ -749,7 +753,11 @@
                                case "PRO":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcID": data.HItemID,
                                        "HProcName": data.工序名称
                                        "HProcName": data.工序名称,
                                        "HProcNo": data.流水号,
                                        "lngBillSubKey": data.hsubid,
                                        "HCenterName": data.工作中心,
                                        "HCenterID": data.HCenterID
                                    });
                                    break;
                                case "WLM":
@@ -777,8 +785,8 @@
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrgID": data.组织
                                    });
                                    $("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    $("#HBarCode").css("background-color", "#efefef4d");
                                    //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    //$("#HBarCode").css("background-color", "#efefef4d");
                                    HProcExchBillNoFlag = true;
                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
@@ -787,7 +795,7 @@
                                    $.ajax({
                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                        type: "GET",
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = data1.data[0];
@@ -923,7 +931,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                    type: "GET",
                    data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                    data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];
@@ -1287,6 +1295,11 @@
            //提交
            form.on('submit(Saver)', function (data) {//提交
                if ($("#lngBillSubKey").val() == 0) {
                    layer.msg("流水号没有选择!请输入流水号后回车!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var tableData = data.field;
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                var index = layer.load();
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA_Detail.html
@@ -64,19 +64,20 @@
                                <tr>
                                    <th>流水号</th>
                                    <td class="bz_td">
                                        <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="请选择流水号" style="border-radius:50px;">
                                        <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="流水号" style="border-radius:50px;background-color:#efefef4d;" readonly>
                                    </td>
                                </tr>
                                <tr>
                                    <th>工序</th>
                                    <td class="bz_td">
                                        <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="请输入合量" style="border-radius:50px;">
                                        <input type="text" name="HWorkProcName" class="layui-input" id="HWorkProcName" placeholder="工序" style="border-radius:50px;background-color:#efefef4d;" readonly>
                                        <input type="hidden" name="HWorkProcID" id="HWorkProcID" autocomplete="off" value="0" class="layui-input">
                                    </td>
                                </tr>
                                <tr>
                                    <th>数量</th>
                                    <td class="bz_td">
                                        <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="请输入合量" style="border-radius:50px;">
                                        <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" placeholder="数量" style="border-radius:50px;background-color:#efefef4d;" readonly>
                                    </td>
                                </tr>
                            </tbody>
@@ -176,11 +177,8 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
                    "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": "", "HPlanEndDate": "",
                    "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
                    "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
                    "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
                    "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": "",
                    "HQty": 0, "HRate": 0, "HProcPrice": 0, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
                };
                switch (obj.event) {
@@ -292,11 +290,8 @@
                    }
                };
                option.data = [{
                    "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
                    "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
                    "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
                    "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
                    "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
                    "HWorkEmpID": 0, "HWorkEmpNumber": "", "HWorkName": "", "HWorkSourceID ": 0, "HWorkSourceNumber": "", "HWorkSourceName": "",
                    "HQty": 0, "HRate": 0, "HProcPrice": 0, "HMoney": 0, "HWorkProcID": 0, "HWorkProcNumber": "", "HWorkProcName": ""
                }];
                table.render(option);
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html
@@ -904,7 +904,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                    type: "GET",
                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In" },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];                            
@@ -954,7 +954,10 @@
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcID": data.HItemID,
                                        "HProcName": data.工序名称,
                                        "HProcNo": data.流水号
                                        "HProcNo": data.流水号,
                                        "lngBillSubKey": data.hsubid,
                                        "HCenterName": data.工作中心,
                                        "HCenterID": data.HCenterID
                                    });
                                    break;
                                case "WLM":
@@ -995,7 +998,7 @@
                                    $.ajax({
                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                        type: "GET",
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType":"In" },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = data1.data[0];