yangle
2024-05-21 a321be71a8a443fdbff239a44cf627535ca8e23c
流转卡生成条码
进站单增加配件条码
4个文件已修改
100 ■■■■■ 已修改文件
WebTM/views/PublicPage/HSourceReportHtml.html 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/HSourceReportHtml.html
@@ -290,6 +290,9 @@
                    case '生产退料':
                        HModName = "MateOutBackBill_1244";
                        break;
                    case '工序流转卡':
                        HModName = "ProcessExchangeBill_3772";
                        break;
                }
                //初始查询
                get_Display(sWhere, HSouceBillType);
@@ -521,6 +524,20 @@
                        break;
                    case '组装拆卸单':
                        return sWhere;
                    case '工序流转卡':
                        if (HBillNo) {
                            sWhere += " and å•据号 like '%" + HBillNo + "%'";
                        }
                        if (PartNumber) {
                            sWhere += " and ç‰©æ–™ä»£ç  like '%" + PartNumber + "%'";
                        }
                        if (PartName) {
                            sWhere += " and ç‰©æ–™åç§° like '%" + PartName + "%'";
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        return sWhere;
                        break;
                }
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html
@@ -91,6 +91,7 @@
                                                        <option value="7">采购入库单</option>
                                                        <option value="8">销售退货单</option>
                                                        <option value="9">生产退料单</option>
                                                        <option value="10">工序流转卡</option>
                                                    </select>
                                                </div>
                                            </div>
@@ -466,6 +467,9 @@
                    case '9':
                        return "生产退料单";
                        break;
                    case '10':
                        return "工序流转卡";
                        break;
                }
            }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html
@@ -414,7 +414,6 @@
                         , { field: '条码状态', title: '条码状态', width: 200, sort: true }
                         , { field: '厂商', title: '厂商', width: 200, sort: true }
                         , { field: '捆包号', title: '捆包号', width: 200, sort: true }
                         , { field: '生产日期', title: '生产日期', width: 200, templet: "<div>{{d.生产日期 ==null ?'':layui.util.toDateString(d.生产日期, 'yyyy-MM-dd HH:mm:ss}}</div>", sort: true }
                         , { field: '生产日期', title: '生产日期', width: 200, templet: "<div>{{d.生产日期 ==null ?'':layui.util.toDateString(d.生产日期, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                         , { field: '保质期至', title: '保质期至', width: 200, templet: "<div>{{d.保质期至 ==null ?'':layui.util.toDateString(d.保质期至, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                         , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html
@@ -55,6 +55,12 @@
                                    <input type="text" name="HBarCode" id="HBarCode" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label"><span style="color:red;">*</span>配件条形码</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HBarCode_Mater" id="HBarCode_Mater" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -1100,6 +1106,49 @@
                });
            }
            //配件条形码回车方法
            $('#HBarCode_Mater').on('keydown', function (event) {
                var HBarCode_Mater = $('#HBarCode_Mater').val();
                if (event.keyCode == 13) {
                    if (!HBarCode_Mater) {
                        layer.msg("配件条形码不能为空!")
                        return;
                    }
                    txtHBarCode_Mater_KeyDown(HBarCode_Mater);
                }
            });
            function txtHBarCode_Mater_KeyDown(HBarCode_Mater) {
                var barNo = HBarCode_Mater.substr(0, 3);
                if ($('#HProcExchHinteID').val() == '') {
                    layer.msg("请扫完流转卡后再扫配件码")
                    layer.close(index);
                    return;
                }
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_Mater_KeyDown",
                    type: "GET",
                    data: { "HBarCode": HBarCode_Mater, "HInterID": $('#HInterID').val()},
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message);
                            layer.close(index);
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.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: "温馨提示" });
                    }
                });
            }
            //流水号(工序号)回车方法
            $('#HProcNo').on('keydown', function (event) {
                var sProcNo = $('#HProcNo').val();
@@ -1129,6 +1178,10 @@
                                "HCenterName": data.工作中心,
                                "HCenterID": data.HCenterID
                            });
                            //进站单绑定配件清单
                            MES_StationInBillSubBindSource();
                            $("#HProcNo").attr("readonly", "readonly");
                            $("#HProcNo").css("background-color", "#efefef4d");
                            layer.close(index);
@@ -1145,6 +1198,31 @@
                });
            }
            //进站单绑定配件清单
            function MES_StationInBillSubBindSource() {
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationInBill/MES_StationInBillSubBindSource",
                    type: "GET",
                    async: false,
                    data: { "HInterID": $("#HInterID").val(), "HProcExchInterID": $("#lngBillKey").val(), "HProcExchEntryID": $("#lngBillSubKey").val() },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message);
                            layer.close(index);
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.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: "温馨提示" });
                    }
                });
            }
            //#region é¡µé¢å¿«æ·é”®å¼¹çª——工序流转卡关联数量
            $('body').on('keydown', function (e) {
                var HinteID = $("#HProcExchHinteID").val();