修改问题

chengsc

2024-09-04 f7309a5a1790d1c06ae4bffdde202d220f0007a2

修改问题

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -1210,7 +1210,9 @@
                                    console.log(field);
                                    //提交 Ajax 成功后，静态更新表格中的数据
                                    //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
                                    +"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
                                    +"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
                                    
                                    layer.open({
                                        type: 2,
@@ -1233,7 +1235,7 @@
                        layer.open({
                            type: 2,
                            title: '生成标签',
                            content: 'LabelPrintSelect.html?Id='+id+'&Type=4',
                            content: 'LabelPrintSelect.html?Id='+id+'&Type=4'+'&SupplierLot='+data.SupplierLot,
                            maxmin: true,
                            area: ['480px', '615px'],
                            btn: ['确定','取消'],
@@ -1247,7 +1249,9 @@
                                    console.log(field);
                                    //提交 Ajax 成功后，静态更新表格中的数据
                                    //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
                                    +"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
                                    +"&StoreTime="+field.storeTime+'&SupplierLot='+field.SupplierLot;
                                    
                                    layer.open({
                                        type: 2,

 HTML/views/ASNSetting/LabelPrint.html

@@ -121,7 +121,7 @@

            var supplierLot=getQueryString('SupplierLot'); //供货批次
            $("#SupplierLot").html(supplierLot);
            
            console.log(supplierLot);
            var doing = true;
            // console.log(productionTime);
            // console.log(expirationTime);

 HTML/views/ASNSetting/LabelPrintSelect.html

@@ -124,6 +124,7 @@
                    var id = getQueryString('Id');
                    var SupplierLot=getQueryString('SupplierLot');//供货批次
                    $('#SupplierLot').val(SupplierLot);
                    console.log(SupplierLot);
                    var asnType = getQueryString('Type');
                    console.log(asnType);
                    console.log(asnType == 4);

 HTML/views/SOSetting/ExportAllot.html

@@ -621,119 +621,6 @@
            var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
            //#endregion
            function refreshTablemx(val) {
                //#region 原始非自定义列
                // var param = {
                //     Id: parseInt(val)
                // };

                // table.render({
                //     elem: '#LAY-app-content-list2',
                //     url: IP + "/BllSo/GetCompleteDetailList",
                //     method: 'POST',
                //     height: 'full-206',
                //     id: 'LAY-app-content-list2',
                //     where: param,
                //     contentType: 'application/json',
                //     headers: { ToKen: $.cookie('token') },
                //     page: true,
                //     limit: pageCnt,
                //     limits: pageLimits,
                //     cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                //     done: function(){ 
                //         initMenu();
                //     }, 
                //     cols: [
                //         [{
                //             title: '序号',
                //             type: 'numbers',
                //             width: 60,
                //             fixed: 'left'
                //         }, {
                //             field: 'SONo',
                //             title: '出库单号',
                //             align: 'center',
                //             fixed: 'left',
                //             width: 180,
                //         }, {
                //             field: 'PalletNo',
                //             title: '托盘号',
                //             align: 'center',
                //             width: 95,
                //         }, {
                //             field: 'BoxNo',
                //             title: '箱号',
                //             align: 'center',
                //             width: 220,
                //         }, {
                //             field: 'BoxNo2',
                //             title: '盒号',
                //             align: 'center',
                //             width: 115,
                //             hide: true,
                //         }, {
                //             field: 'BoxNo3',
                //             title: '支号',
                //             align: 'center',
                //             width: 115,
                //             hide: true,
                //         }, {
                //             field: 'SkuNo',
                //             title: '物料编码',
                //             align: 'center',
                //             width: 120,
                //         }, {
                //             field: 'SkuName',
                //             title: '物料名称',
                //             align: 'center',
                //         }, {
                //             field: 'LotNo',
                //             title: '批次号',
                //             align: 'center',
                //             width: 125,
                //         }, {
                //             field: 'CompleteQty',
                //             title: '拣货数量',
                //             align: 'center',
                //             width: 90,
                //         }, {
                //             field: 'NowPalletNo',
                //             title: '新托盘',
                //             align: 'center',
                //             width: 95,
                //         }, {
                //             field: 'LotText',
                //             title: '批次描述',
                //             align: 'center',
                //             width: 150,
                //         }, {
                //             field: 'SupplierLot',
                //             title: '供货批次',
                //             align: 'center',
                //             width: 110,
                //         }, {
                //             field: 'Standard',
                //             title: '物料规格',
                //             align: 'center',
                //             width: 120,
                //         }, {
                //             field: 'CreateTime',
                //             align: 'center',
                //             title: '创建时间',
                //             width: 165,
                //             templet: function (d) {
                //                 return formatDate(d.CreateTime);
                //             },
                //             hide: true,
                //         }, {
                //             title: '操作',
                //             fixed: 'right',
                //             width: 90,
                //             align: 'center',
                //             toolbar: '#table-content-list2'
                //         }]
                //     ]
                // });
                //#endregion

                //#region 自定义表头
                var colsJson2

 Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs

@@ -26,8 +26,9 @@
            try
            {
                var total = 0;
                var detailInfo = Db.Queryable<BllCompleteDetail>().First(w => string.IsNullOrEmpty(w.BoxNo) || string.IsNullOrEmpty(w.BoxNo3));
                if (detailInfo == null)
                var detailInfo = Db.Queryable<BllCompleteDetail>().Where(w => w.ExportAllotId == id).ToList();
                var num = detailInfo.Count(w=> string.IsNullOrEmpty(w.BoxNo) && !string.IsNullOrEmpty(w.BoxNo3));
                if (detailInfo.Count>0 && num == 0) //箱码和支码都为空的数量等与0 证明是箱码拣货
                {
                    Expression<Func<BllCompleteDetail, bool>> item = Expressionable.Create<BllCompleteDetail>()
                    .And(it => it.ExportAllotId == id)

 Wms/WMS.BLL/Logic/AllotSku.cs

@@ -757,7 +757,7 @@
                    item.Dept = int.Parse(dept);
                }
                //平库
                var locate1 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W02");
                var locate1 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W02").ToList();
                var data2 = new List<StockDetailDto>();
                foreach (var liku in detail2.OrderBy(m => m.Dept).ToList())
                {
@@ -779,7 +779,8 @@
                }

                //立库
                var locate2 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W01");
                var locate2 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W01").ToList();
               
                var data3 = new List<StockDetailDto>();
                foreach (var liku in detail3.OrderBy(m => m.Dept).ToList())
                {

 Wms/Wms/Controllers/DownApiController.cs

@@ -223,7 +223,7 @@
                    new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo.Substring(0, 8),
                        "申请巷道", $"申请巷道托盘号：{model.PalletNo.Substring(0, 8)}的成功信息", 2);

                    return Ok(new { Success = 0, Message = "申请储位成功", TaskList = list });
                    return Ok(new { Success = 0, Message = "申请巷道成功", TaskList = list });
                }
                else
                {
@@ -234,7 +234,7 @@
                    new OperationASNServer().AddLogOperationAsn("入库作业", "入库日志", model.PalletNo.Substring(0, 8),
                        "申请巷道", $"申请巷道托盘号：{model.PalletNo.Substring(0, 8)}的成功信息", 2);

                    return Ok(new { Success = 0, Message = "申请储位成功", TaskList = list });
                    return Ok(new { Success = 0, Message = "申请巷道成功", TaskList = list });
                }

            }