质量异常修改

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java

@@ -135,7 +135,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
                 }
             }
             List<String> ncGroups =new ArrayList<>();
-            if(!StringUtil.isBlank(ncGroup.toString().toString())){
+            if(!StringUtil.isBlank(ncGroup.toString())){
                 ncGroup = new StringBuilder(ncGroup.substring(0, ncGroup.length() - 1));
                 List<String> ncGroupList = Arrays.asList(ncGroup.toString().split(","));
                 ncGroups.add(ncGroupList.get(0));

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -225,7 +225,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             abnormalBill.setNcCode(ncCodes.substring(0,ncCodes.length() - 1));
         }
         //判断是否是用户自报
-        if(!StringUtil.isBlank(abnormalBill.getInspector())){
+        if(!StringUtil.isBlank(abnormalBill.getInspector()) && Constants.NEW.equals(abnormalBill.getStatus())){
             abnormalBill.setObjectBo(HandleEnum.SELF_REPORT.getHandle(abnormalBill.getSite(),abnormalBill.getObjectBo()));
             selfReportService.updateState(abnormalBill.getObjectBo(),Constants.STATE_CONFIRM);
         }

anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml

@@ -624,7 +624,7 @@
                PRODUCTCATEGORY.VALUE PRODUCT_CATEGORY,listagg(NG.DESCRIPTION || '/'||NCT.DESCRIPTION || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION,
                ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.NC_QTY NC_QTY,
 	   ZAB.PB_GRADE PB_GRADE ,NWA.FULL_NAME PB_USER ,ZAB.PB_QTY PB_QTY ,ZAB.DISCOVER DISCOVER ,
-	   ZAB.INSPECTOR INSPECTOR ,ZAB.ENTITY_LOCATION ENTITY_LOCATION ,ZAB.REPORT_FROM REPORT_FROM ,ZAB.OBJECT_BO OBJECT_BO ,
+	   ZAB.INSPECTOR INSPECTOR ,ZAB.ENTITY_LOCATION ENTITY_LOCATION ,ZAB.REPORT_FROM REPORT_FROM ,SUBSTR(ZAB.OBJECT_BO,INSTR(ZAB.OBJECT_BO,',')+1) OBJECT_BO,
 	   ZAB.PB_PHOTOSHOP PB_PHOTOSHOP,ZABD.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,ZABD.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,ZABD.DUTY_DEPART DUTY_DEPART,
 	   ZABD.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,ZABD.DUTY_TYPE DUTY_TYPE,ZABD.PRINCIPAL_USER PRINCIPAL_USER,ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,
 	   R.ROUTER ROUTER,ZABD.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZABD.RESOLVE_SEND_USER RESOLVE_SEND_USER,
@@ -660,7 +660,7 @@
             ZAB.WORK_CENTER ,ZAB.RESRCE , WORKORDER.VALUE ,ITEMNUMBER.VALUE ,
             PRODUCTCATEGORY.VALUE, ZAB.PB_DESCRIPTION  ,ZAB.NC_QTY ,
             ZAB.PB_GRADE  ,NWA.FULL_NAME  ,ZAB.PB_QTY  ,ZAB.DISCOVER  ,
-            ZAB.INSPECTOR  ,ZAB.ENTITY_LOCATION  ,ZAB.REPORT_FROM  ,ZAB.OBJECT_BO  ,
+            ZAB.INSPECTOR  ,ZAB.ENTITY_LOCATION  ,ZAB.REPORT_FROM  ,SUBSTR(ZAB.OBJECT_BO,INSTR(ZAB.OBJECT_BO,',')+1),
             ZAB.PB_PHOTOSHOP ,ZABD.DUTY_CAUSE_DESCRIPTION ,ZABD.DUTY_CAUSE_TYPE ,ZABD.DUTY_DEPART ,
             ZABD.DUTY_SEND_USER_GROUP ,ZABD.DUTY_TYPE ,ZABD.PRINCIPAL_USER ,ZABD.ABNORMAL_METHOD ,
             R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER ,