解决问题

zhaowc

2025-03-27 d07f25c163706ac46a83bd2c63db1e3c52715222

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -156,6 +156,7 @@
                            data.ProductionTime = boxInfo.ProductionTime!= null ? ((DateTime)boxInfo.ProductionTime).ToString("yyyy-MM-dd"):"";
                            data.ExpirationTime = boxInfo.ExpirationTime != null ? ((DateTime)boxInfo.ExpirationTime).ToString("yyyy-MM-dd") : "";
                            data.StoreTime = boxInfo.StoreTime != null ? ((DateTime)boxInfo.StoreTime).ToString("yyyy-MM-dd") : "";
                            
                        }
                    }
                }
@@ -163,6 +164,7 @@
                var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty);
                var qty = detail.Qty - labelQty;
                data.Qty = qty.ToString();
                data.SupplierLot = detail.SupplierLot;
                return data;
            }
            catch (Exception e)
@@ -213,7 +215,7 @@
                        break;
                    case "6"://代储入库
                        skuType = "(0,1,2,3,4)";
                        IsPack = 2; //不贴
                        //IsPack = 2; //不贴
                        break;
                    case "7"://寄存入库
                        //skuType = "(3)";
@@ -355,18 +357,18 @@
                            continue;
                        }
                    }
                    if (model.Type != "7")
                    {
                        if (!TypeLot.Contains(model.Type))
                        {
                            if (detailModel.LotNo.Length != 12 && detailModel.LotNo.Length != 11 && detailModel.LotNo.Length != 10)
                            {
                                strMessage = "-1:进厂编号位数长度有误;";
                                continue;
                            }
                        }
                    //if (model.Type != "7")
                    //{
                    //    if (!TypeLot.Contains(model.Type))
                    //    {
                    //        if (detailModel.LotNo.Length != 12 && detailModel.LotNo.Length != 11 && detailModel.LotNo.Length != 10)
                    //        {
                    //            strMessage = "-1:进厂编号位数长度有误;";
                    //            continue;
                    //        }
                    //    }
                        
                    }
                    //}
                    
                    if (model.Type == "1" && string.IsNullOrWhiteSpace(detailModel.SupplierLot)) //采购到货单原厂批号（供货批次）不能为空
                    {
@@ -1071,6 +1073,7 @@
                    CustomerNo = model.Customer,
                    CustomerName = custname,
                    OrderCode = model.OrderCode,
                    Status = "0",
                };

                // 入库明细表信息
@@ -1113,10 +1116,17 @@
                        LotNo = asnDetailModel.LotNo,
                        LotText = "",
                        Qty = (decimal)asnDetailModel.Qty,
                        PackagNo = asnDetailModel.PackagNo,
                        FactQty = 0,
                        CompleteQty = 0,
                        Price = 0,
                        Money = 0,
                        IsBale = "",
                        IsBelt = "",
                        PackagNo = skuModel.PackagNo,
                        SupplierLot = asnDetailModel.SupplierLot,
                        Status = "0",
                        CreateUser = 0

                    };

                    detailModels.Add(detailModel);
@@ -1236,6 +1246,10 @@
                {
                    throw new Exception("复核失败，复核人员和关闭订单人员不能相同！");
                }
                if (date.Id == notice.CreateUser)
                {
                    throw new Exception("复核失败，复核人员和创建订单人员不能相同！");
                }
                //单据类型是 成品入库或采购入库 判断入库物料是否合格
                if (notice.Type == "0" || notice.Type == "1")
                {
@@ -1269,7 +1283,7 @@
                };

                #region 通过接口发送至erp 或 mes
                //系统对接后放开
                ////系统对接后放开
                var jsonData = JsonConvert.SerializeObject(asnInfo);
                var mesList = new List<string>() { "0", "4" };  //0 成品入库 4余料退回入库
                var erpList = new List<string>() { "1", "2", "3" }; //1 采购入库  2中间品入库  3 退货入库
@@ -1286,7 +1300,7 @@
                    var mesData = new FinishAsnModel()
                    {
                        no = asnInfo.OrderCode,
                        qty = asnInfo.AsnDetails.Sum(m=>m.Qty)
                        qty = asnInfo.AsnDetails.Sum(m => m.Qty)
                    };
                    jsonData = JsonConvert.SerializeObject(mesData);
                    //调用接口
@@ -1309,7 +1323,7 @@
                    }
                }

                

                #endregion

                notice.Status = "4";