н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_DTO/SquareCabin/TowcsDto.cs
@@ -326,8 +326,8 @@ { public string customerCode { get; set; } public string materialCode { get; set; } public string externalOrderNo { get; set; } public string orderNo { get; set; } public string externalOrderNo { get; set; }//wmsåºåºåå· public string orderNo { get; set; }//ç«æ¹ä» public string orderType { get; set; } public List<EdiOrderDetailDto> details { get; set; } н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs
@@ -619,10 +619,15 @@ List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList(); //è·åç«åºçç¹å·®å¼æ° var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First(); var LkQty = Math.Abs(inventoryLK.SupplyQuantity); //var LkQty = Math.Abs(inventoryLK.SupplyQuantity); var LkQty = inventoryLK.SupplyQuantity; //è·å大件åºçç¹å·®å¼æ° var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList(); var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity)); //var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity)); var DJQty = inventoryDJ.Sum(x => x.SupplyQuantity); if (LkQty + DJQty != Qty) throw new Exception($"ã{order.order_no}ãç©æç¼å·ã{item.goods_no}ãç©ææ¹æ¬¡ã{item.batch_num}ãçç©æä¿¡æ¯ä¸ç©ææ¹æ¬¡ä¿¡æ¯ççæ°éä¸ç¬¦"); if (LkQty == 0)//ç«åºæ å·®å¼ { @@ -780,7 +785,7 @@ Details = order.details.Select(d => new Dt_CabinOrderDetail { Goods_no = d.goods_no, Order_qty = LkQty, Order_qty =Math.Abs( LkQty), Batch_num = d.batch_num, Exp_date = d.exp_date, Reservoirarea = WareCodeLK, н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs
@@ -617,11 +617,14 @@ List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList(); //è·åç«åºçç¹å·®å¼æ°.ãããããããããããã var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First(); var LkQty = Math.Abs(inventoryLK.SupplyQuantity); //var LkQty = Math.Abs(inventoryLK.SupplyQuantity); var LkQty = inventoryLK.SupplyQuantity; //è·å大件åºçç¹å·®å¼æ° var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList(); var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity)); if (LkQty + DJQty != Qty) throw new Exception($"ã{order.order_no}ãç©æç¼å·ã{item.goods_no}ãç©ææ¹æ¬¡ã{item.batch_num}ãçç©æä¿¡æ¯ä¸ç©ææ¹æ¬¡ä¿¡æ¯ççæ°éä¸ç¬¦"); //var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity)); var DJQty = inventoryDJ.Sum(x => x.SupplyQuantity); var count = Math.Abs(LkQty + DJQty); if (count != Qty) throw new Exception($"ã{order.order_no}ãç©æç¼å·ã{item.goods_no}ãç©ææ¹æ¬¡ã{item.batch_num}ãçç©æä¿¡æ¯ä¸ç©ææ¹æ¬¡ä¿¡æ¯çäºæ°éä¸ç¬¦"); if (LkQty == 0)//ç«åºæ å·®å¼ { #region åºåãåºåæ¹æ¬¡å¹³è´¦ @@ -764,7 +767,7 @@ deliveryOrdersAdd.Add(cabinOrder); } #endregion //è¿é #region å建ç«åºçç¹å var entityOrder = new Dt_DeliveryOrder { @@ -778,7 +781,7 @@ Details = order.details.Select(d => new Dt_DeliveryOrderDetail { Goods_no = d.goods_no, Order_qty = LkQty, Order_qty = Math.Abs(LkQty), //ç»ä¸æ¸¸WCSçæ¯è¦æ´æ° Batch_num = d.batch_num, Exp_date = d.exp_date, Reservoirarea = WareCodeLK,