涂装抛光流程变更

ZR.Service/mes/wms/WmPolishWorkQualityStatisticsService.cs

@@ -10,7 +10,7 @@ using ZR.Service.mes.wms.IService;
 namespace ZR.Service.mes.wms
 {
     /// <summary>
-    /// 抛光管理-抛光操作Service业务层处理
+    /// 抛光管理-抛光操作Service业务层处理(抛光)
     /// </summary>
     [AppService(
         ServiceType = typeof(IWmPolishWorkQualityStatisticsService),
@@ -44,6 +44,10 @@ namespace ZR.Service.mes.wms
                     !string.IsNullOrEmpty(parm.CreatedBy),
                     it => it.CreatedBy.Contains(parm.CreatedBy)
                 )
+                .AndIF(
+                    parm.Type != -1,
+                    it => it.Type == parm.Type
+                )
                 .AndIF(
                     parm.StartTime != null,
                     it => it.StartTime >= parm.StartTime.Value.ToLocalTime()
@@ -131,8 +135,9 @@ namespace ZR.Service.mes.wms
                     throw new Exception("插入抛光操作记录失败");
                 }
                 WmPolishInventoryService inventoryService = new();
-                //合格品重新进入抛光仓库
-                if (model.QualifiedNumber > 0)
+                WmOneTimeInventoryService oneTimeService = new();
+                //抛光品直接出库到GP12
+                if (model.QualifiedNumber > 0 && model.IsOutbound)
                 {
                     WmPolishInventory wmPolishInventory =
                         new()
@@ -143,7 +148,7 @@ namespace ZR.Service.mes.wms
                             CreatedBy = model.CreatedBy,
                             ActionTime = DateTime.Now.ToLocalTime(),
                             Remark =
-                                "抛光操作记录入库,合格数:"
+                                "抛光操作记录跳过后道出库,合格数:"
                                 + model.QualifiedNumber
                                 + "。记录时间:"
                                 + model.CreatedTime.Value.ToLocalTime().ToString()
@@ -151,11 +156,34 @@ namespace ZR.Service.mes.wms
                                 + res0.Id
                                 + "]"
                         };
-                    int res1 = inventoryService.DoWmPolishWarehousing(wmPolishInventory);
+                    int res1 = inventoryService.DoWmPolishRetrieval(wmPolishInventory);
                     if (res1 == 0)
                     {
                         Context.Ado.RollbackTran();
-                        throw new Exception("抛光操作记录入库失败");
+                        throw new Exception("抛光操作记录出库失败");
+                    }
+                    WmOneTimeInventory wmOneTimeInventoryWarehousing =
+                        new()
+                        {
+                            Partnumber = model.Partnumber,
+                            Type = model.IsReturnWorkpiece ? 2 : 1,
+                            Quantity = model.QualifiedNumber,
+                            CreatedBy = model.CreatedBy,
+                            ActionTime = DateTime.Now.ToLocalTime(),
+                            Remark =
+                                "抛光操作合格品入一次合格库,合格数:"
+                                + model.QualifiedNumber
+                                + "。记录时间:"
+                                + model.CreatedTime.Value.ToLocalTime().ToString()
+                                + "[来源记录识别编号:"
+                                + res0.Id
+                                + "]"
+                        };
+                    int res2 = oneTimeService.DoWmOneTimeWarehousing(wmOneTimeInventoryWarehousing);
+                    if (res2 == 0)
+                    {
+                        Context.Ado.RollbackTran();
+                        throw new Exception("抛光合格品一次合格入库失败");
                     }
                 }
                 //报废，打磨品 扣除抛光仓库库存
@@ -170,7 +198,7 @@ namespace ZR.Service.mes.wms
                             CreatedBy = model.CreatedBy,
                             ActionTime = DateTime.Now.ToLocalTime(),
                             Remark =
-                                "抛光操作记录出库:打磨数"
+                                "抛光操作记录打磨报废出库:打磨数"
                                 + model.DamoTotal
                                 + "、报废数"
                                 + model.BaofeiTotal