生产订单列表取消排序；PDA出站汇报单添加出站记录明细表格；生成流转卡替换物料特殊字符；收料通知单列表隐藏列设置拆分前判断

yusijie

2024-10-04 4665b8670a98e21c253acd3a241478d3e431500b

生产订单列表取消排序；PDA出站汇报单添加出站记录明细表格；生成流转卡替换物料特殊字符；收料通知单列表隐藏列设置拆分前判断

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -10,7 +10,7 @@
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/";   //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/   //余思杰本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://localhost/API/";             //潘浙游本地配置
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦

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

@@ -919,17 +919,17 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 200 });
                                    }
                                }
                            }
@@ -969,17 +969,17 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 200, event: '单据号' });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', templet: "<div>{{d." + (data[i].name == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 200 });
                                    }
                                }
                            }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html

@@ -377,6 +377,7 @@
                                        </tbody>
                                    </table>
                                </div>
                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <ul class="layui-tab-title">
                                <li class="layui-this">单据信息</li>
@@ -1464,6 +1465,9 @@
                    return;
                }

                //把流转卡号赋值给条形码
                $("#HBarCode").val($("#HProcExchBillNo").val());

                var tableData = data.field;
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";"+OperationType;
                var index = layer.load();
@@ -1475,6 +1479,8 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //清空条形码输入框内容
                            $("#HBarCode").val("");
                            layer.close(index);
                            layer.msg("提交成功");
                            $("#Add").attr("style", "display:inline;");//显示新增按钮
@@ -1539,6 +1545,8 @@
                            //}
                        }
                        else {
                            //清空条形码输入框内容
                            $("#HBarCode").val("");
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -2047,7 +2047,7 @@
                    if (table.cache["mainTable"][i] != "") {
                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                        sSubTable.push(table.cache["mainTable"][i])
                    }
                    }                    
                }
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].HProcNo) {
@@ -2079,6 +2079,12 @@
                    }
                }
                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织

                data.field.HMaterNumber2 = data.field.HMaterNumber2.replace("\"", "”").replace(";", "；");
                data.field.HMaterName2 = data.field.HMaterName2.replace("\"", "”").replace(";", "；");
                data.field.HMaterNumber = data.field.HMaterNumber.replace("\"", "”").replace(";", "；");
                data.field.HMaterName = data.field.HMaterName.replace("\"", "”").replace(";", "；");
              
                //var HBLFlag = data.field.HBLFlag;
                //HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//将数组合并成字符串
                var sMainStr = JSON.stringify(data.field);

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_BatchSplit.html

@@ -437,6 +437,12 @@
                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                        sSubTable.push(table.cache["mainTable"][i])
                    }
                    if (table.cache["mainTable"][i].物料名称.indexOf("\"") != -1 || table.cache["mainTable"][i].物料名称.indexOf(";") != -1) {
                        table.cache["mainTable"][i].物料名称 = table.cache["mainTable"][i].物料名称.replace("\"", "”").replace(";","；")
                    }
                    if (table.cache["mainTable"][i].规格型号.indexOf("\"") != -1 || table.cache["mainTable"][i].规格型号.indexOf(";") != -1) {
                        table.cache["mainTable"][i].规格型号 = table.cache["mainTable"][i].规格型号.replace("\"", "”").replace(";", "；")
                    }
                }
                var sSubStr = JSON.stringify(sSubTable);
                var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Cg_POInStockBillList.html

@@ -1416,7 +1416,10 @@
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                               
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;