Pārlūkot izejas kodu

交货单逻辑调整:添加缺料数量记录

heteng 2 gadi atpakaļ
vecāks
revīzija
077f89ed9d

+ 11 - 6
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -6855,6 +6855,7 @@ namespace Business.Replenishment
                     info.ItemNum = demandplans[i].itemnum;
                     info.CreateTime = DateTime.Now;
                     info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]没有可占用的采购明细,无法转交货单";
+                    info.NeedQty = demandplans[i].tosechedqty;
                     info.OptTime = optime;
                     exceptions.Add(info);
                     continue;
@@ -6883,7 +6884,8 @@ namespace Business.Replenishment
                     info.Icdsid = demandplans[i].Id;
                     info.ItemNum = demandplans[i].itemnum;
                     info.CreateTime = DateTime.Now;
-                    info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]的采购明细缺"+(demandplans[i].tosechedqty - restQty) +",无法转交货单";
+                    info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]的采购明细不足,无法转交货单";
+                    info.NeedQty = demandplans[i].tosechedqty - restQty;
                     info.OptTime = optime;
                     exceptions.Add(info);
                     continue;
@@ -6932,6 +6934,7 @@ namespace Business.Replenishment
                         info.ItemNum = demandplans[i].itemnum;
                         info.CreateTime = DateTime.Now;
                         info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]对应供应商[" + curChaes[j].supplier_name + "]没有可用采购明细,无法转交货单";
+                        info.NeedQty = needQty;
                         info.OptTime = optime;
                         exceptions.Add(info);
 
@@ -6948,6 +6951,7 @@ namespace Business.Replenishment
                         info.ItemNum = demandplans[i].itemnum;
                         info.CreateTime = DateTime.Now;
                         info.Remark = "物料[" + demandplans[i].itemnum + "]对应供应商[" + curChaes[j].supplier_name + "]没有可用采购明细,无法转交货单";
+                        info.NeedQty = needQty;
                         info.OptTime = optime;
                         exceptions.Add(info);
 
@@ -6974,7 +6978,8 @@ namespace Business.Replenishment
                         info.Icdsid = demandplans[i].Id;
                         info.ItemNum = demandplans[i].itemnum;
                         info.CreateTime = DateTime.Now;
-                        info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]对应供应商[" + curChaes[j].supplier_name + "]采购明细缺"+ (needQty-restQty) + ",无法转交货单";
+                        info.Remark = "物料需求计划[" + demandplans[i].itemnum + ":" + demandplans[i].requestdate.ToString("yyyy-MM-dd") + "]对应供应商[" + curChaes[j].supplier_name + "]采购明细不足,无法转交货单";
+                        info.NeedQty = needQty - restQty;
                         info.OptTime = optime;
                         exceptions.Add(info);
 
@@ -7128,13 +7133,13 @@ namespace Business.Replenishment
             var doLists = details.Where(p => p.PurOrd.StartsWith("DO")).OrderBy(p=>p.DueDate).ToList();
             //获取PO
             var poLists = details.Where(p => !doLists.Select(m => m.PurOrd).Contains(p.PurOrd)).OrderBy(p => p.DueDate).ToList();
-            foreach (var item in poLists)
+            for (int i = 0; i < poLists.Count; i++)
             {
-                newDetails.Add(item);
+                newDetails.Add(poLists[i]);
             }
-            foreach (var item in doLists)
+            for (int i = 0; i < doLists.Count; i++)
             {
-                newDetails.Add(item);
+                newDetails.Add(doLists[i]);
             }
             return newDetails;
         }

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/Production/DeliveryExceptionMaster.cs

@@ -56,5 +56,11 @@ namespace Business.StructuredDB.Production
         /// </summary>
         [Comment("操作时间")]
         public string OptTime { get; set; }
+
+        /// <summary>
+        /// 缺料数量
+        /// </summary>
+        [Comment("操作时间")]
+        public decimal NeedQty { get; set; }
     }
 }