涂装抛光流程变更

ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs

@@ -10,7 +10,7 @@ using ZR.Service.mes.wms.IService;
 namespace ZR.Service.mes.wms
 {
     /// <summary>
-    /// 抛光管理后道检验-质量统计Service业务层处理
+    /// 抛光管理后道检验-质量统计Service业务层处理（后道）
     /// </summary>
     [AppService(
         ServiceType = typeof(IWmPolishQualityStatisticsService),
@@ -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()
@@ -119,7 +123,15 @@ namespace ZR.Service.mes.wms
                     throw new Exception("投入数与合格数，抛光总数，打磨数，报废数不符合，请检查");
                 }
                 model.Id = SnowFlakeSingle.instance.NextId().ToString();
-                model.Type = 0;
+                if (model.IsOver)
+                {
+                    model.Type = 1;
+                }
+                else
+                {
+                    model.Type = 0;
+                }
+
                 decimal qualifiedRate = 0.0m;
                 if (model.QualifiedNumber != 0)
                 {
@@ -136,8 +148,9 @@ namespace ZR.Service.mes.wms
                 WmPolishInventoryService inventoryService = new();
                 WmOneTimeInventoryService oneTimeService = new();
                 // 合格品检查是否是门把手，是进入成品库(仅出库)，不是进入一次合格品库
-                bool isDoorknob = CheckIsDoorknob(model.Partnumber);
-                if (!isDoorknob && model.QualifiedNumber > 0)
+                // TODO 20241018调整，门把手可入GP12
+                //bool isDoorknob = CheckIsDoorknob(model.Partnumber);
+                if (!model.IsOver && model.QualifiedNumber > 0)
                 {
                     WmOneTimeInventory wmOneTimeInventoryWarehousing =
                         new()
@@ -148,7 +161,7 @@ namespace ZR.Service.mes.wms
                             CreatedBy = model.CreatedBy,
                             ActionTime = DateTime.Now.ToLocalTime(),
                             Remark =
-                                "抛光合格品入库,合格数:"
+                                "后道抛光合格品入一次合格库,合格数:"
                                 + model.QualifiedNumber
                                 + "。记录时间:"
                                 + model.CreatedTime.Value.ToLocalTime().ToString()
@@ -160,7 +173,7 @@ namespace ZR.Service.mes.wms
                     if (res1 == 0)
                     {
                         Context.Ado.RollbackTran();
-                        throw new Exception("抛光合格品入库失败");
+                        throw new Exception("抛光合格品GP12入库失败");
                     }
                 }
 
@@ -276,7 +289,7 @@ namespace ZR.Service.mes.wms
         /// <returns></returns>
         public bool CheckIsDoorknob(string partnumber)
         {
-            string[] checkStrArray = { "门把手", "面盖", "T22", "T26", "A58", "A60", "C01", "B02", "V71", "T1EJ" };
+            string[] checkStrArray = { "门把手", "面盖", "T22", "T26", "A58", "A60", "C01", "B02", "V71", "T1EJ", "倒车雷达" };
             var isDoorknobCheck = Expressionable.Create<WmMaterial>();
             foreach (string checkStr in checkStrArray)
             {