流转卡派工单排序重置；生产汇报单添加生产日期；车间定位库存查询添加批号字段，仓位代码加宽；小车锁定添加必填控制

yusijie

4 天以前 1ed3a8d72dff60d472ece399084e2b33f3e98cdf

流转卡派工单排序重置；生产汇报单添加生产日期；车间定位库存查询添加批号字段，仓位代码加宽；小车锁定添加必填控制

 WebTM/views/WMSɨÂëÄ£¿é/С³µËø¶¨/Kf_TrolleyPositionBill_PDA.html

@@ -667,7 +667,7 @@
                        }
                    });

                    $("#HEquipBarCode").val("");
                    //$("#HEquipBarCode").val("");
                }
            });

@@ -916,7 +916,7 @@
                });                              

                if (sBarCode != "") {
                    $('#HCarBarCode').val("");
                    //$('#HCarBarCode').val("");
                }
                //调转到第二个页签
                element.tabChange('tab-Kf_TrolleyPositionBill_PDA', '2');
@@ -998,8 +998,46 @@
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
            }

            //#endregion

            //单据上传前判断
            function AllowLoadData(sSubStr) {
                if (HInterID == 0) {
                    layer.msg("单据内码获取失败，错误的单据内码！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (HBillNo == '') {
                    layer.msg("单据号获取失败，错误的单据号！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (sSubStr.length == 0) {
                    layer.msg("没有扫码信息，请先扫描条码，确认无误后再提交！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }

                if (table.cache['wl-table'].length >= 1) {
                    var sSubStr = JSON.stringify(table.cache['wl-table']);

                    if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                        sSubStr = JSON.parse(sSubStr);
                        for (var i = 0; i < sSubStr.length; i++) {
                            if (sSubStr[i].HCarBarCode == "" || sSubStr[i].HCarBarCode == undefined || sSubStr[i].HCarBarCode == null) {
                                layer.msg("明细记录第" + (i + 1) + "行,小车编号不允许为空!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                return Result = false;
                            }
                            if ((sSubStr[i].HSPID == 0 || sSubStr[i].HSPID == undefined || sSubStr[i].HSPID == null) && (sSubStr[i].HEquipID == 0 || sSubStr[i].HEquipID == undefined || sSubStr[i].HEquipID == null)) {
                                layer.msg("明细记录第" + (i + 1) + "行,需扫码绑定仓位或机台，不允许仓位和机台信息都为空!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                return Result = false;
                            }
                        }
                    }
                } else {
                    layer.msg("明细记录为空，不允许提交!请扫小车条码", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }

                return true;
            }           
            
        });

@@ -1034,23 +1072,6 @@

                HSPObj = obj;
            }
        }

        //单据上传前判断
        function AllowLoadData(sSubStr) {
            if (HInterID == 0) {
                layer.msg("单据内码获取失败，错误的单据内码！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (HBillNo == '') {
                layer.msg("单据号获取失败，错误的单据号！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (sSubStr.length == 0) {
                layer.msg("没有扫码信息，请先扫描条码，确认无误后再提交！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            return true;
        }
    </script>


 WebTM/views/WMSɨÂëÄ£¿é/¿â´æ²éѯ/KF_ICInventory_WorkShopByCLD_PDA.html

@@ -428,9 +428,9 @@
                                            break;
                                        default:

                                            if (data[i].name == '仓库') {
                                            if (data[i].name == '仓库' || data[i].name == '批号') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
                                            } else if (data[i].name == '物料代码' || data[i].name == '物料名称' || data[i].name == '规格型号' || data[i].name == '组织') {
                                            } else if (data[i].name == '物料代码' || data[i].name == '物料名称' || data[i].name == '规格型号' || data[i].name == '组织' || data[i].name == '仓位代码' ) {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center' });

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -1620,6 +1620,7 @@
                                , "HSourceBillType": dataArray[i].单据类型
                                , 'HICMOTempID': "0"
                                , 'HRemark': ""
                                , 'HPRODUCEDATE': dataArray[i].生产日期
                            }
                        );
                    }

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

@@ -273,6 +273,30 @@
                        break;
                };
            });

            table.on('sort(mainTable)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });

            table.on('sort(mainTable2)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable2', {
                    initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option2.data = layui.table.cache["mainTable2"];
                table.render(option);
            });
            //#endregion

            //#region é‡ç½®æŒ‰é’®