焊接材料修改

SGGL/BLL/CLGL/TwOutputmasterService.cs

@@ -78,7 +78,8 @@ namespace BLL
                     AuditDate2 = x.AuditDate2,
                     WarehouseMan = x.WarehouseMan,
                     WarehouseDate = x.WarehouseDate,
-                    WarehouseManName = warehouseperson.PersonName
+                    WarehouseManName = warehouseperson.PersonName,
+                    Remark=y.Remark
                 };
 
             return q;
@@ -281,7 +282,7 @@ namespace BLL
                 Id = Guid.NewGuid().ToString(),
                 InOutPlanMasterId = plan.Id,
                 ProjectId = plan.ProjectId,
-                CusBillCode = GetCusBillCodeByTaskCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt, (BLL.TwConst.Category)plan.Category),
+                CusBillCode = GetCusBillCode(plan.WeldTaskCode, (TwConst.TypeInt)plan.TypeInt, (BLL.TwConst.Category)plan.Category,plan.CusBillCode),
                 WarehouseCode = plan.WarehouseCode,
                 Category = plan.Category,
                 Source = plan.Source,
@@ -295,7 +296,8 @@ namespace BLL
                 AuditMan2 = plan.AuditMan2,
                 AuditDate2 = plan.AuditDate2,
                 WarehouseMan = plan.WarehouseMan,
-                WarehouseDate = plan.WarehouseDate
+                WarehouseDate = plan.WarehouseDate,
+                
             }; 
             Add(master);
             //生成出库单明细 
@@ -350,7 +352,15 @@ namespace BLL
             return result;
         }
 
-        public static string GetCusBillCodeByTaskCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category)
+        /// <summary>
+        /// 获取出库单编号
+        /// </summary>
+        /// <param name="taskCode"></param>
+        /// <param name="typeInt"></param>
+        /// <param name="category"></param>
+        /// <returns></returns>
+        /// <param name="planCusBillCode"></param>
+        public static string GetCusBillCode(string taskCode, TwConst.TypeInt typeInt, TwConst.Category category, string planCusBillCode = "")
         {
             string cusBillCode = "";
             switch (typeInt)
@@ -377,7 +387,13 @@ namespace BLL
                     }
 
                     break;
-                
+                case TwConst.TypeInt.散件出库:
+                    cusBillCode = planCusBillCode.Replace("-AP-", "-GI-");
+                    break;
+                case TwConst.TypeInt.其他出库:
+                    cusBillCode = planCusBillCode.Replace("-AP-", "-GI-");
+                    break;
+
             }
             return cusBillCode;
         }