wtt
2024-09-20 057b24c160c4a25c4fce265c369d313b046df9f8
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
5个文件已修改
158 ■■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBinding.html 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /* var WEBURL = "http://localhost:8082/API/"; */   //杜贺本地配置
     var WEBURL = "http://localhost/API/";   //潘浙游本地配置  */
     //var WEBURL = "http://localhost/API/";   //潘浙游本地配置  */
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBill_PDA.html
@@ -70,6 +70,7 @@
                                                    <option value="3720">生产用料清单</option>
                                                    <option value="3721">生产备料单</option>
                                                    <option value="1214">生产发料通知单</option>
                                                    <option value="3710">生产订单</option>
                                                    <option value="-1">手工录入</option>
                                                </select>
                                            </div>
@@ -655,6 +656,14 @@
                            $("#HMainSourceBillType").empty();
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '生产发料通知单' + "</option>";
                            $("#HMainSourceBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HMainSourceBillType").attr("disabled", "disabled");
                        }
                        else if (d.data[0].HSourceBillType == "3710") {
                            $("#HMainSourceBillType").empty();
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '生产订单' + "</option>";
                            $("#HMainSourceBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HMainSourceBillType").attr("disabled", "disabled");
@@ -1347,6 +1356,9 @@
                else if (HSourceBillType == '1214') {
                    HSourceTitle = "生产发料通知单";
                }
                else if (HSourceBillType == '3710') {
                    HSourceTitle = "生产订单";
                }
                layer.open({
                    type: 2
@@ -1622,6 +1634,14 @@
                                        layui.form.render('select');
                                        $("#HMainSourceBillType").attr("disabled", "disabled");
                                    }
                                    else if (result.data.hSourceBillTypeField == "3710") {
                                        $("#HMainSourceBillType").empty();
                                        var optionHtml = '';
                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '生产订单' + "</option>";
                                        $("#HMainSourceBillType").append(optionHtml);
                                        layui.form.render('select');
                                        $("#HMainSourceBillType").attr("disabled", "disabled");
                                    }
                                    else {
                                        $("#HMainSourceBillType").empty();
                                        var optionHtml = '';
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -56,18 +56,19 @@
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">是否下推生成流转卡</label>
                                        <div class="layui-input-block" style="margin-top:10px">
                                        <div class="layui-input-block" style="margin-top:10px;width:183px;">
                                            <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
                                                <!--  <option value="全部">全部</option>-->
                                                <option value="全部" selected="selected">全部</option>
                                                <option value="已下推">已下推</option>
                                                <option value="部分下推">部分下推</option>
                                                <option value="未下推">未下推</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <label class="layui-form-label" style="width: 80px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 110px; width: 183px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </select>
@@ -96,18 +97,16 @@
                                            <input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" style="display:none;" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px;display:none;">重置</button>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">销售订单</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo" id="HSeOrderBillNo">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" style="display:none;" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px;display:none;">重置</button>
                                    <!--显示当前过滤方案-->
                                    <div class="layui-inline" style="margin-left:5px;">
@@ -1135,6 +1134,9 @@
                    if (HSF == "已下推") {
                        sWhere += " and æ˜¯å¦ä¸‹æŽ¨ç”Ÿæˆæµè½¬å¡ like '%" + HSF + "%' ";
                    }
                    if (HSF == "部分下推") {
                        sWhere += " and æ˜¯å¦ä¸‹æŽ¨ç”Ÿæˆæµè½¬å¡ like '%" + HSF + "%' ";
                    }
                    if (HSF == "未下推") {
                        sWhere += " and æ˜¯å¦ä¸‹æŽ¨ç”Ÿæˆæµè½¬å¡ like '%" + HSF + "%' ";
                    }
@@ -1206,6 +1208,7 @@
                $("#HMaterName").val("");//单据号
                $("#HStatus").val("开工");//单据号
                $("#HModel").val("");//规格型号
                $("#HSeOrderBillNo").val(""); //销售订单
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
WebTM/views/³µ¼ä¹ÜÀí/¹Ø¼ü¼þ°ó¶¨/Sc_KeyElementBinding.html
@@ -13,7 +13,7 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <!--<script src="../../../layuiadmin/PubCustom.js"></script>-->
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../CreateControl.js"></script>
</head>
<body>
@@ -29,10 +29,10 @@
                    <h1 style="text-align:center;margin-bottom:25px;"><b>关键件绑定</b></h1>
                    <div class="layui-form-item" style="padding-top: 3px;">
                        <div class="layui-row" style="text-align: center;">
                            <div class="layui-col-xs3 layui-inline" style="margin-left:205px;">
                            <div class="layui-col-xs3 layui-inline" style="margin-left:140px;">
                                <label class="layui-form-label">流转卡</label>
                                <div class="layui-input-inline">
                                    <input type="text" class="layui-input" name="HProcessExchangeBillNo" id="HProcessExchangeBillNo" onfocus="this.select();">
                                    <input type="text" class="layui-input" name="HProcessExchangeBillNo" id="HProcessExchangeBillNo" style="width: 300px;" onfocus="this.select();">
                                    <input type="hidden" name="HProcessExchangeInterID" id="HProcessExchangeInterID" value="0">
                                    <input type="hidden" name="HProcessExchangeEntryID" id="HProcessExchangeEntryID" value="0">
                                </div>
@@ -40,18 +40,19 @@
                            <div class="layui-col-xs3 layui-inline">
                                <label class="layui-form-label">产品码</label>
                                <div class="layui-input-inline">
                                    <input type="text" class="layui-input" name="HBarCode_P" id="HBarCode_P" onfocus="this.select();">
                                    <input type="text" class="layui-input" name="HBarCode_P" id="HBarCode_P" style="width: 300px;" onfocus="this.select();">
                                </div>
                            </div>
                            <button class="layui-btn layui-btn-normal" style="float:left;margin-left:-15px;" type="button" lay-submit="" lay-filter="btnNextProc" id="btnNextProc">换产品</button>
                            <div class="layui-col-xs3 layui-inline">
                                <label class="layui-form-label">配件码</label>
                                <div class="layui-input-inline">
                                    <input type="text" class="layui-input" name="HBarCode" id="HBarCode" onfocus="this.select();">
                                    <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width: 300px;" onfocus="this.select();">
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 45%; float: left; height:calc(60vh);background-color:white;">
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 45%; float: left; height:calc(43vh);background-color:white;">
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
@@ -188,8 +189,8 @@
                            </div>
                        </div>
                    </div>
                    <div style="width: 0.2%; float: left; height: calc(60vh);background-color:#2baaca"></div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 54.8%; float: left; height:calc(60vh);background-color:white;">
                    <div style="width: 0.2%; float: left; height: calc(43vh);background-color:#2baaca"></div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 54.8%; float: left; height:calc(43vh);background-color:white;">
                        <div style="width:100px;height:23px; background: linear-gradient(-135deg, transparent 30px, #2baaca 0);"><span style="color:aliceblue;">绑定信息</span></div>
                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    </div>
@@ -336,13 +337,45 @@
            }           
        });
        //退出
        form.on('submit(btnEdit)', function (data) {
            if (params[1] != null) {
                Pub_Close(1);
            } else if (params[1] == null) {
                Pub_Close(2);
        //换产品
        form.on('submit(btnNextProc)', function (data) {
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i].HBindingQty < 1 || option.data[i].HBarCode == "") {
                    layer.alert("第<span style='color: red;'>" + (i + 1) + "</span>行,配件 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> æœªç»‘定齐整!")
                    return;
            }
            }
            //启用输入框,背景色恢复
            $("#HBarCode_P").removeAttr("disabled"); //产品码文本框启用
            $("#HBarCode_P").css('background', '#FFFFFF')//产品码文本框背景色恢复
            //清空文本框内容
            $("#HBarCode_P").val("");//产品码文本框内容清空
            //光标跳转到产品码文本框上
            $("#HBarCode_P").focus();
            //把每个产品的扫码绑定记录迁移到下方历史记录明细网格
            for (var i = 0; i < option.data.length; i++) {
                option_detail.data.push(option.data[i])
            }
            table.render(option_detail);
            //清除绑定信息网格扫码记录
            option.data = [];
            table.render(option);
            //历史绑定记录查询
            //get_Display();
        });
        //刷新按钮
        form.on('submit(btnRefresh)', function () {
            layer.confirm('刷新后页面数据将消失,是否确认刷新?', { icon: 3, title: '提示' }, function (index) {
                location.replace('Sc_KeyElementBinding.html');
            });
        })
        //退出
        form.on('submit(btnExit)', function (data) {
            Pub_Close(2);
        });
        //#endregion
@@ -380,8 +413,6 @@
            //初始化绑定信息表格
            set_InitGrid();
            //历史绑定记录查询
            //get_Display();
        }
        //#endregion
@@ -391,7 +422,7 @@
            option = {
                elem: '#mainTable'
                , page: false
                , height: 'full-358'
                , height: 'full-500'
                , loading: false
                , limit: 200
                , cols: [[ //绑定信息表
@@ -404,7 +435,7 @@
                    , { field: 'HMaterNumber', title: '物料代码', width: 160 }
                    , { field: 'HMaterName', title: '物料名称', width: 160 }
                    , { field: 'HMaterModel', title: '规格型号', width: 160, hide: true }
                    , { field: 'HBatchNo', title: '批次', width: 160 }
                    , { field: 'HBatchNo', title: '批次', width: 160, hide: true }
                    , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
                    , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
                    , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
@@ -436,12 +467,13 @@
                    { type: 'numbers', title: '序号', width: 50 }
                    , { field: 'HBarCode_P', title: '产品码', width: 400 }
                    , { field: 'HBarCode', title: '配件码', width: 400 }
                    , { field: 'HPartsQty', title: '配件数量', width: 90 }
                    , { field: 'HPartsQty', title: '配件数', width: 90 }
                    , { field: 'HBindingQty', title: '已绑数', width: 72 }
                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                    , { field: 'HMaterNumber', title: '物料代码', width: 260 }
                    , { field: 'HMaterName', title: '物料名称', width: 260 }
                    , { field: 'HMaterModel', title: '规格型号', width: 160, hide: true }
                    , { field: 'HBatchNo', title: '批次', width: 200 }
                    , { field: 'HBatchNo', title: '批次', width: 200, hide: true }
                    , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
                    , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
                    , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
@@ -460,9 +492,14 @@
        //#region ä¿å­˜æ–¹æ³•
        function set_SaveBill(data) {
            //把最后一个产品的绑定信息写入到历史记录明细网格
            for (var i = 0; i < option.data.length; i++) {
                option_detail.data.push(option.data[i])
            }
            //序列化表头信息和子表信息
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(option.data);
            var sSubStr = JSON.stringify(option_detail.data);
            //拼接参数
            var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
@@ -495,31 +532,17 @@
        //查询
        function get_Display() {
            var sWhere = " and ç¼–码='" + sessionStorage["Czybm"] + "'";
            var HBillNo = $("#HBillNo").val();
            var ajaxLoad = layer.load();
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList',
                url: GetWEBURL() + '/Sc_KeyElementBinding/HistoryInfo_Temp',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                data: { "HBillNo": HBillNo, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        $("#HDeptID").val(data1.data[0]["HDeptID"]);
                        $("#HDeptName").val(data1.data[0]["车间"]);
                        $("#HProcName").val(data1.data[0]["工序"]);
                        $("#HProcID").val(data1.data[0]["HProcID"]);
                        $("#HSourceID").val(data1.data[0]["HSourceID"]);
                        $("#HSourceName").val(data1.data[0]["生产资源"]);
                        $("#HCheckEmpID").val(data1.data[0]["HCheckEmpID"]);
                        $("#HCheckEmpName").val(data1.data[0]["质检员"]);
                        $("#HEmpID").val(data1.data[0]["HCheckEmpID"]);
                        $("#HEmpName").val(data1.data[0]["质检员"]);
                        $("#HGroupID").val(data1.data[0]["HGroupID"]);
                        $("#HGroupName").val(data1.data[0]["生产班组"]);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -604,7 +627,7 @@
                        for (var i = 0; i < data.length; i++) {
                            rowarr.push({
                                "HBarCode_P": data[i].产品码, "HPartsBarCode": "", "HPartsQty": data[i].分子子项用量, "HBindingQty": 0
                                , "HMaterID": data[i].子项物料ID, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HBatchNo": ""
                                , "HMaterID": data[i].子项物料ID, "HMaterNumber": data[i].子项物料代码, "HMaterName": data[i].子项物料名称, "HMaterModel": data[i].子项规格型号, "HBatchNo": ""
                                , "HSourceID": $("#HSourceID").val(), "HEquipID": 0, "HGroupID": $("#HGroupID").val(), "HWorkerID": $("#HEmpID").val()
                                , "HScanDate": new Date(), "HSourceInterID": $("#HICMOInterID").val()
                                , "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val()
@@ -903,7 +926,7 @@
                sSubStr = JSON.parse(sSubStr);
                for (var i = 0; i < sSubStr.length; i++) {
                    if (sSubStr[i].HBarCode == "" || sSubStr[i].HBarCode == undefined || sSubStr[i].HBarCode == null) {
                        layer.msg("明细记录第" + (i + 1) + "行,配件码未绑定!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        layer.msg("绑定信息第" + (i + 1) + "行,配件码未绑定!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                }
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_BatchSplit.html
@@ -277,6 +277,8 @@
                        , { field: 'HUsableQty', title: '剩余可用数量', width: 130 }
                        , { field: 'HProQty', title: '流转卡数量', width: 110, edit: 'text' }
                        , { field: 'HBatchNo', title: '批号', width: 110, edit: 'text' }
                        , { field: 'HGroupNumber', title: '班组', width: 110, edit: 'text' }
                        , { field: 'HBatchManager', title: '启用批次', width: 110, hide: true }
                        , { field: 'HRoutingInterID', title: '工艺路线内码', width: 150, hide: true }
                        , { field: 'HRoutingName', title: '工艺路线', width: 170, edit: 'text', event: "HRoutingName" }
                        , { field: 'HSheetQty', title: '拆分流转卡张数', width: 130 }
@@ -292,7 +294,7 @@
                    "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "物料代码": ""
                    , "物料名称": "", "规格型号": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
                    , "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
                    , "HInterID": 0, "HBillNo": "", "HBatchNo": ""
                    , "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HBatchManager": "", "HGroupNumber": ""
                }];
                option.data = rowdata;
@@ -334,7 +336,7 @@
                                        , "规格型号": subdata[i].规格型号, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
                                        , "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
                                        , "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
                                        , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": ""
                                        , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": "", "HBatchManager": subdata[i].是否启用批次, "HGroupNumber": ""
                                    }
                                )
                            }
@@ -359,6 +361,8 @@
                                    , { field: 'HUsableQty', title: '剩余可用数量', width: 130 }
                                    , { field: 'HProQty', title: '流转卡数量', width: 110, edit: 'text' }
                                    , { field: 'HBatchNo', title: '批号', width: 110, edit: 'text' }
                                    , { field: 'HGroupNumber', title: '班组', width: 110, edit: 'text' }
                                    , { field: 'HBatchManager', title: '启用批次', width: 110, hide: true }
                                    , { field: 'HRoutingInterID', title: '工艺路线内码', width: 150, hide: true }
                                    , { field: 'HRoutingName', title: '工艺路线', width: 170, edit: 'text', event: "HRoutingName" }
                                    , { field: 'HSheetQty', title: '拆分流转卡张数', width: 130 }
@@ -570,6 +574,10 @@
                            layer.msg("明细记录第" + (i + 1) + "行,生产订单主内码获取异常,请联系管理员处理!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HBatchManager == "是" && sSubStr[i].HBatchNo == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,物料启用批次管理,请输入批号信息!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                    }
                }