diff --git a/src/WmsWebApi.Application/ProductRecieve/ProductRecieveService.cs b/src/WmsWebApi.Application/ProductRecieve/ProductRecieveService.cs index 7020567..2a2ff4d 100644 --- a/src/WmsWebApi.Application/ProductRecieve/ProductRecieveService.cs +++ b/src/WmsWebApi.Application/ProductRecieve/ProductRecieveService.cs @@ -195,7 +195,7 @@ public class ProductRecieveService : ApplicationService, IProductRecieveService PartCode = item.PartCode, Batch = item.Batch, FromLocCode = "", - //ToLocCode = part.DefaultReceiveLocCode, + ToLocCode = part.DefaultReceiveLocCode, Remark = part.QLevel, Qty = item.Qty, GoodQty = item.Qty, @@ -208,7 +208,7 @@ public class ProductRecieveService : ApplicationService, IProductRecieveService //Unit = tmp.ZDJLX, //单据类型 //TraceBackCode = tmp.MEINS, //基本计量单位 }; - tbRecieve.ToLocCode = _configuration.GetConnectionString("AgvInLoc"); + //tbRecieve.ToLocCode = _configuration.GetConnectionString("AgvInLoc"); _recieveList.Add(tbRecieve); //插入ts_stock_detail diff --git a/src/WmsWebApi.Application/StockMove/StockMoveService.cs b/src/WmsWebApi.Application/StockMove/StockMoveService.cs index 7651f2a..088ed53 100644 --- a/src/WmsWebApi.Application/StockMove/StockMoveService.cs +++ b/src/WmsWebApi.Application/StockMove/StockMoveService.cs @@ -240,13 +240,13 @@ public class StockMoveService : ApplicationService, IStockMoveService if (_SSDto.BillType == "902")//从WMS移库到AGV { - tbStockMove.FromLocCode = wmsloc; - tbStockMove.ToLocCode = agvloc; - } + tbStockMove.FromLocCode = part.DefaultReceiveLocCode;//wmsloc; + tbStockMove.ToLocCode = part.DefaultReceiveLocCode;//agvloc; + } else if (_SSDto.BillType == "903") { - tbStockMove.FromLocCode = agvloc; - tbStockMove.ToLocCode = wmsloc; + tbStockMove.FromLocCode = part.DefaultReceiveLocCode;//agvloc; + tbStockMove.ToLocCode = part.DefaultReceiveLocCode;//wmsloc; } _stockMoveList.Add(tbStockMove); @@ -286,7 +286,7 @@ public class StockMoveService : ApplicationService, IStockMoveService if (_SSDto.BillType == "902")//AGV库位增加库存,WMS库位减少库存 { #region 出库 - tsStock.LocCode = wmsloc; + tsStock.LocCode = part.DefaultReceiveLocCode;//wmsloc; if (stockwms == null || stockwms.Qty - item.Qty < 0) { bErr = true; @@ -323,7 +323,7 @@ public class StockMoveService : ApplicationService, IStockMoveService else//WMS库位增加库存 { #region 出库 - tsStock.LocCode = agvloc; + tsStock.LocCode = part.DefaultReceiveLocCode;//agvloc; if (stockagv == null || stockagv.Qty - item.Qty < 0) { bErr = true; @@ -372,7 +372,7 @@ public class StockMoveService : ApplicationService, IStockMoveService Batch = item.Batch, Qty = item.Qty, BarCode = _barcode, - LocCode = agvloc, + LocCode = part.DefaultReceiveLocCode,//agvloc, EqptCode = "", Remark = "In", State = 2, @@ -389,7 +389,7 @@ public class StockMoveService : ApplicationService, IStockMoveService Batch = item.Batch, Qty = 0 - item.Qty, BarCode = _barcode, - LocCode = wmsloc, + LocCode = part.DefaultReceiveLocCode,//wmsloc, EqptCode = "", Remark = "Out", State = 2, @@ -411,7 +411,7 @@ public class StockMoveService : ApplicationService, IStockMoveService Batch = item.Batch, Qty = item.Qty, BarCode = _barcode, - LocCode = wmsloc, + LocCode = part.DefaultReceiveLocCode,//wmsloc, EqptCode = "", Remark = "In", State = 2, @@ -428,7 +428,7 @@ public class StockMoveService : ApplicationService, IStockMoveService Batch = item.Batch, Qty = 0 - item.Qty, BarCode = _barcode, - LocCode = agvloc, + LocCode = part.DefaultReceiveLocCode,//agvloc, EqptCode = "", Remark = "Out", State = 2,