生产任务单维护界面进去默认业务状态为开工  界面增加唯一ID  跟是否下推生成流转卡过滤
3个文件已修改
192 ■■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul_RYQ.html 154 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,7 +4,7 @@
    var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -80,11 +80,13 @@
                                        <label class="layui-form-label">业务状态</label>
                                        <div class="layui-input-block">
                                            <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
                                                <option value="0" selected>全部</option>
                                                <!--  <option value="全部">全部</option>-->
                                                <option value="开工">开工</option>
                                                <option value="计划">计划</option>
                                                <option value="计划确认">计划确认</option>
                                                <option value="下达">下达</option>
                                                <option value="开工">开工</option>
                                                <option value="0">全部</option>
                                                <option value="完工">完工</option>
                                                <option value="结案">结案</option>
                                            </select>
@@ -101,6 +103,23 @@
                                        <label class="layui-form-label">物料编码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">唯一ID</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HERPID" id="HERPID">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">是否下推生成流转卡</label>
                                        <div class="layui-input-block">
                                            <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
                                                <!--  <option value="全部">全部</option>-->
                                                <option value="已下推">已下推</option>
                                                <option value="未下推">未下推</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
@@ -322,6 +341,9 @@
                        , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
                        , { field: '单据号', title: '单据号', sort: true, width: 170 }
                        , { field: '状态', title: '状态', sort: true, width: 170 }
                        , { field: '唯一ID', title: '唯一ID', sort: true, width: 170 }
                        , { field: '是否下推生成流转卡', title: '是否下推生成流转卡', sort: true, width: 170 }
                        , { field: '日期', title: '日期' }
                        , { field: '产品代码', title: '产品代码', width: 160 }
                        , { field: '产品名称', title: '产品名称', width: 160 }
@@ -423,9 +445,11 @@
                var HOrderProcNO = $("#HOrderProcNO").val();//订单跟踪号
                var WorkCenter = $("#WorkCenter").val();//单据号
                var HMaterName = $("#HMaterName").val();//单据号
                var HErpID = $("#HERPID").val();//唯一标识
                var HDeptName = $("#HDeptName").val();//单据号
                var HStatus = $("#HStatus").val();//单据号
                var HBillType = $("#HBillType").val();//单据类型
                var HSF = $("#HSF").val();//单据类型
                if (HDate) {
                    sWhere += " and æ—¥æœŸ >= '" + HDate + "'";
                }
@@ -445,11 +469,17 @@
                    sWhere += " and HDeptID = " + HDeptName ;
                }
                if (HStatus && HStatus != 0) {
                    sWhere += " and ä¸šåŠ¡çŠ¶æ€  like '%" + HStatus + "%'";
                    sWhere += " and çŠ¶æ€  like '%" + HStatus + "%'";
                }
                if (HBillType) {
                    sWhere += " and å•据类型 like '%" + HBillType + "%'";
                }
                if (HErpID) {
                    sWhere += " and å”¯ä¸€ID like '%" + HErpID + "%'";
                }
                if (HSF) {
                    sWhere += " and æ˜¯å¦ä¸‹æŽ¨ç”Ÿæˆæµè½¬å¡ like '%" + HSF + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Sc_StationOutBill_Mul_RYQ.html
@@ -246,6 +246,10 @@
                    , { field: 'HMakeDate', title: 'HMakeDate', hide: true }
                    , { field: 'HBarCodeMakeDate', title: 'HBarCodeMakeDate', hide: true }
                    , { field: 'HStationOutTime', title: 'HStationOutTime', hide: true }
                    , { field: 'HProcID', title: 'HProcID', hide: true }
                    , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
                    , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
                    , { field: 'HQty', title: 'HQty', hide: true }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo1' }
                ]]
                , text: {
@@ -372,6 +376,29 @@
                            option1.data = table.cache["mainTable1"];//将数据绑定到data上
                            table.reload(option1);
                            layer.close(index);
                    });
                }
                if (obj.event === 'edit') {
                    var HBillNo = data.单据号;
                    var HProcName = data.工序名称;
                    $.ajax({
                        url: GetWEBURL() + '/LEMS/Mul_RYQ_DisPlayBillList',
                        type: "GET",
                        data: { "HBillNo": HBillNo, "HProcName": HBillNo },
                        success: function (data1) {
                            if (data1.count == 1) {
                                option2.data = data1.data;
                                table.render(option2);
                                layer.close(ajaxLoad);
                                //layer.alert("查询成功", { icon: 1 });
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(data1.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
            })
@@ -584,10 +611,46 @@
            //#region æäº¤æŒ‰é’®(保存)
            form.on('submit(set_SaveBarCode)', function (data) {//提交
                var HEmpName1 = $("#HEmpName1").val();
                var HEmpName2 = $("#HEmpName2").val();
                var HEmpName3 = $("#HEmpName3").val();
                var HEmpName4 = $("#HEmpName4").val();
                var HEmpName5 = $("#HEmpName5").val();
                var HEmpName6 = $("#HEmpName6").val();
                var HEmpName7 = $("#HEmpName7").val();
                var HEmpName8 = $("#HEmpName8").val();
                var HMaker = "";
                if (HEmpName1 != "")
                {
                    HMaker = HMaker + ";" + HEmpName1;
                }
                if (HEmpName2 != "") {
                    HMaker = HMaker + "," + HEmpName2;
                }
                if (HEmpName3 != "") {
                    HMaker = HMaker + "," + HEmpName3;
                }
                if (HEmpName4 != "") {
                    HMaker = HMaker + "," + HEmpName4;
                }
                if (HEmpName5 != "") {
                    HMaker = HMaker + "," + HEmpName5;
                }
                if (HEmpName6 != "") {
                    HMaker = HMaker + "," + HEmpName6;
                }
                if (HEmpName7 != "") {
                    HMaker = HMaker + "," + HEmpName7;
                }
                if (HEmpName8 != "") {
                    HMaker = HMaker + "," + HEmpName8;
                }
                var HBillNo = $("#HMainBillNo").val();
                sSubStr = table.cache["mainTable1"];
                var sSubStr = JSON.stringify(sSubStr);
                var sSubStr = sSubStr + ';' + HBillNo;
                var sSubStr = sSubStr + ';' + HBillNo + HMaker;
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Cj_StationOutBill/AddBill_Mul",
@@ -598,8 +661,7 @@
                    {
                        if (result.count == 1)
                        {
                            layer.close(index);
                            layer.msg("扫码出站成功!", { icon: 6 });
                            layer.msg("扫码出站成功!");
                        }
                        else
                        {
@@ -629,37 +691,7 @@
            //#endregion
            //#region è¡Œå†…事件
            //table.on('tool(mainTable1)', function (obj) {
            //    var rowData = obj.data;
            //    //删除单据
            //    if (obj.event === 'del') {
            //        layer.confirm('确定删除' + rowData.HBillNo + '吗?', function (index) {
            //            var ajaxLoad = layer.load();
            //            //逻辑删除方法
            //            $.ajax({
            //                url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
            //                type: "GET",
            //                data: { "HInterID": rowData.HInterID, "HDeleteMan": sessionStorage["HUserName"] },
            //                success: function (result) {
            //                    if (result.count == 1) {
            //                        get_BarCodeDetail();
            //                        HqtyBill--;
            //                        $("#HqtyBill").val(HqtyBill);
            //                        layer.close(ajaxLoad);
            //                        layer.alert(result.Message, { icon: 6 });
            //                    } else {
            //                        layer.close(ajaxLoad);
            //                        layer.alert(result.Message, { icon: 5 });
            //                    }
            //                }, error: function () {
            //                    layer.close(ajaxLoad);
            //                    layer.alert("接口请求失败!", { icon: 5 });
            //                }
            //            });
            //            layer.close(index);
            //        });
            //    }
            //});
            //#endregion
            //#region æµæ°´å·å›žè½¦æ–¹æ³•
@@ -891,33 +923,33 @@
            table.on('tool(mainTable1)', function (obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'edit') {
                    var HBillNo = data.单据号;
                    var HProcName = data.工序名称;
                    $.ajax({
                        url: GetWEBURL() + '/LEMS/Mul_RYQ_DisPlayBillList',
                        type: "GET",
                        data: { "HBillNo": HBillNo, "HProcName": HBillNo},
                        success: function (data1) {
                            if (data1.count == 1) {
                                option2.data = data1.data;
                                table.render(option2);
                                layer.close(ajaxLoad);
                                //layer.alert("查询成功", { icon: 1 });
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(data1.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
            })
            //table.on('tool(mainTable1)', function (obj) {
            //    var data = obj.data;
            //    var rowIndex = $(obj.tr).attr("data-index");
            //    if (obj.event === 'edit') {
            //        var HBillNo = data.单据号;
            //        var HProcName = data.工序名称;
            //        $.ajax({
            //            url: GetWEBURL() + '/LEMS/Mul_RYQ_DisPlayBillList',
            //            type: "GET",
            //            data: { "HBillNo": HBillNo, "HProcName": HBillNo},
            //            success: function (data1) {
            //                if (data1.count == 1) {
            //                    option2.data = data1.data;
            //                    table.render(option2);
            //                    layer.close(ajaxLoad);
            //                    //layer.alert("查询成功", { icon: 1 });
            //                } else {
            //                    layer.close(ajaxLoad);
            //                    layer.alert(data1.Message, { icon: 5 });
            //                }
            //            }, error: function () {
            //                layer.close(ajaxLoad);
            //                layer.alert("接口请求失败!", { icon: 5 });
            //            }
            //        });
            //    }
            //})
            //#region èŽ·å–æµæ°´å·ä¿¡æ¯
            function txtHProcNo_KeyDown(sBillNo, sProcNo) {