修改异常单据的BUG

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProWorkorderVo.java

@@ -298,4 +298,23 @@ public class ProWorkorderVo extends BaseEntity {
     @ApiModelProperty("生产版本名称")
     private String productionSolutionName;
 
+    @ApiModelProperty("订单单别")
+    private String orderType;
+
+    @ApiModelProperty("订单单号")
+    private String orderCode;
+
+    @ApiModelProperty("订单序号")
+    private String orderSerial;
+
+    @ApiModelProperty("内部图号")
+    private String inDrawingNo;
+
+    @ApiModelProperty("客户图号")
+    private String customerDrawingNo;
+
+    @ApiModelProperty("客户项目号")
+    private String customerProjectNo;
+
+
 }

mes/src/main/java/com/ximai/mes/qc/service/impl/QcAbnormalReportServiceImpl.java

@@ -173,9 +173,18 @@ public class QcAbnormalReportServiceImpl implements IQcAbnormalReportService {
     @Override
     public void updateQcAbnormalReportAbmornalStatud(QcAbnormalReport qcAbnormalReportInput) {
         QcAbnormalReport qcAbnormalReport = qcAbnormalReportMapper.selectQcAbnormalReportByAbnormalReportId(qcAbnormalReportInput.getAbnormalReportId());
-        if (!qcAbnormalReport.getAbnormalStatus().equals("SUBMIT")) {
-            throw new ServiceException(MessageUtils.message("车间异常单不处于处理中状态无法完成"));
+        if(qcAbnormalReportInput.getAbnormalStatus().equals("CLOSE")){
+            //CLOSE
+            if (!qcAbnormalReport.getAbnormalStatus().equals("SUBMIT") && !qcAbnormalReport.getAbnormalStatus().equals("NOT")) {
+                throw new ServiceException(MessageUtils.message("车间异常单不处于处理中或者待处理状态无法关闭"));
+            }
+        }else{
+            //FINISH
+            if (!qcAbnormalReport.getAbnormalStatus().equals("SUBMIT")) {
+                throw new ServiceException(MessageUtils.message("车间异常单不处于处理中状态无法完成"));
+            }
         }
+
         //修改关联名称的工作单元的故障状态
         MdWorkunitVo mdWorkunitVo = iMdWorkunitService.selectMdWorkunitByWorkunitId(qcAbnormalReport.getWorkstationId());
         if (mdWorkunitVo.getFaultFlag().equals("Y")) {