修改问题

chengsc

2025-05-23 225d1bcc777149a5cad91e1376473e00fec9ff4c

修改问题

 Pda/View/SoSetting/ExNoticeOut.html

@@ -221,22 +221,22 @@
                            
                            if (i == 0) {
                                if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '-' + i + ' selected>' + res.data[i]
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i]
                                        .SkuName +
                                        '</option>');
                                } else {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '-' + i + ' selected>' + res.data[i]
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i]
                                        .SkuName + "-" + res.data[i].LotNo +
                                        '</option>');
                                }

                            } else {
                                if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
                                    $("#goodSelect").append('<option value =' + res.data[i].ISoDetailIdd + '-' + i + '>' + res.data[i]
                                    $("#goodSelect").append('<option value =' + res.data[i].ISoDetailIdd+ i + '>' + res.data[i]
                                        .SkuName +
                                        '</option>');
                                } else {
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId + '-' + i + '>' + res.data[i]
                                    $("#goodSelect").append('<option value =' + res.data[i].SoDetailId+ '>' + res.data[i]
                                        .SkuName + "-" + res.data[i].LotNo +
                                        '</option>');
                                }
@@ -265,37 +265,32 @@
 
            form.on('submit(formBind)', function (data) {

                if (!$("#PalletNo").val()) {
                    layer.msg('请扫描托盘条码', {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    });
                    return;
                }

                var param = {
                    SoNo: $("#bar").val(),
                    PalletNo: $("#PalletNo").val(),
                    soDetailId: $("#goodSelect").val(),
                    outMode:$("#endSelect").val(),
                }
                // sendData(IP + "/PdaSo/PlaneExportSuccess", param, 'get', function (res) {
                //     if (res.code == 0) { //成功 
                //         layer.msg(res.msg, {
                //             icon: 1,
                //             time: 1000 //2秒关闭（如果不配置，默认是3秒）
                //         }, function () {
                console.log(param);
				
                sendData(IP + "/DownApi/PDAIssueOut", param, 'get', function (res) {
                    if (res.Success == "0") { //成功 
                        layer.msg(res.Message, {
                            icon: 1,
                            time: 1000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {

                //             clearTable()
                //             $("#PalletNo").val('')
                //         });
                //     } else { //不成功
                //         layer.msg(res.msg, {
                //             icon: 2,
                //             time: 2000 //2秒关闭（如果不配置，默认是3秒）
                //         }, function () {
                //             //回调
                //         });
                //     }
                // });
                        });
                    } else { //不成功
                        layer.msg(res.Message, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {
                            //回调
                        });
                    }
                });
                return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
            }); 
            //-------------------------------------------------------------------------------------------------

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -611,6 +611,8 @@
                                IsBelt = detailModel.IsBelt,
                                SupplierLot = detailModel.SupplierLot,
                                Status = "0",
                                IsSampling = "0",
                                InspectStatus = "0",
                                Lot1 = detailModel.Lot1,
                                Lot2 = detailModel.Lot2,
                                UDF1 = detailModel.UDF1,

 Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs

@@ -359,7 +359,14 @@
                        .Where(m => m.LocatNo == pallet.LocatNo && m.WareHouseNo == pallet.WareHouseNo 
                        && m.IsDel == "0").ToList().FirstOrDefault();
                    var Locats2 = Db.Queryable<SysStorageLocat>().Where(m => m.LocatNo == model.Code && m.IsDel == "0").ToList().FirstOrDefault();
                    
                    if (Locats2 == null)
                    {
                        throw new Exception("目标储位错误");
                    }
                    if (Locats2.Status != "0")
                    {
                        throw new Exception("目标储位状态不是空储位，请核实");
                    }
                    var taskNo2 = new Common().GetMaxNo("TK");
                    var exTask2 = new LogTask();    //出库任务
                    exTask2.TaskNo = taskNo2;

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -1014,10 +1014,11 @@
                    skuList = skuList.Where(m => m.SkuNo == "100088").ToList();
                }
                skuStrList = skuList.Select(m => m.SkuNo).ToList();
                var areaStr = new List<string>() { "B02", "B05", "B08" };
                var stockRst = new StockServer();
                var stockDetailRst = new StockDetailServer();
                Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
                    .And(it => it.WareHouseNo == house || string.IsNullOrWhiteSpace(it.LocatNo))
                    .And(it => it.WareHouseNo == house || string.IsNullOrWhiteSpace(it.LocatNo) || (it.WareHouseNo == "W04" && !areaStr.Contains(it.AreaNo)))
                    .AndIF(!string.IsNullOrWhiteSpace(inspectStatus), it => inspectStatus.Contains(it.InspectStatus))
                    .And(m => skuStrList.Contains(m.SkuNo))
                    .AndIF(type == "6", m => m.OwnerNo == ownerNo)//代储出库需要关联货主

 Wms/WMS.BLL/HttpServer.cs

@@ -1463,7 +1463,22 @@
                        str = "储位损坏不能出库";
                        return outDto1;
                    }

                    if (locate.WareHouseNo != "W02")
                    {
                        str = "托盘不在货架库上";
                        return outDto1;
                    }
                    var locate2 = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == outModeLocate && m.IsDel == "0");//当前出库的目标储位信息
                    if (locate2 == null)
                    {
                        str = "出库的托盘储位信息错误(在储位表中未查询到)";
                        return outDto1;
                    }
                    else if (locate2.Status != "0")
                    {
                        str = "目标储位状态不是空储位";
                        return outDto1;
                    }
                    #endregion

                    if (locate.Status == "1") //有物品
@@ -1614,7 +1629,7 @@

                            //解析返回数据 
                            var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
                            if (wcsModel.code == 0)
                            if (wcsModel.code == 200)
                            {
                                //更改任务的发送返回时间//
                                new TaskServer().EditTaskIssueOk(list2, time1, time2);

 Wms/Wms/Controllers/DownApiController.cs

@@ -188,7 +188,7 @@
                }
                else if (house == "W02")
                {
                    var list = _exNoticeSvc.IssueOutHouseLk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
                    var list = _http.IssueOutHouseLk(soNo,soDetailId, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);

                    return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list});
                }