bpm数据不同步错误

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java

@@ -459,7 +459,6 @@ public class AbnormalBillController {
 
         try{
             abnormalBill.setHandle(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo()));
-            abnormalBill.setBpmSubmit("true");
             abnormalBill.setItemBo(HandleEnum.ITEM.getHandle(site,abnormalBill.getItemBo(),"A"));
             abnormalBillService.programConfirm(abnormalBill,abnormalBillDispose);
             return new ResultVo(ResultCode.SUCCESS,"BPM方案确认回传成功");
@@ -480,14 +479,16 @@ public class AbnormalBillController {
         }else if (StringUtils.isBlank(abnormalBill.getAbnormalNo())){
             return new ResultVo(ResultCode.FAILED,"响应处理失败:异常单号为空");
         }
-        com.foreverwin.modular.core.util.CommonMethods.setSite("1000");
+        com.foreverwin.modular.core.util.CommonMethods.setValue("SITE","1000");
+        String site = com.foreverwin.modular.core.util.CommonMethods.getSite();
         com.foreverwin.modular.core.util.CommonMethods.setUser(abnormalBill.getResponseUser());
-        AbnormalBill bill = new AbnormalBill();
-        bill.setAbnormalNo(abnormalBill.getAbnormalNo());
-        List<AbnormalBill> abnormalBills = abnormalBillService.selectList(bill);
-        abnormalBills.get(0).setBpmSubmit("true");
         try{
-            abnormalBillService.resProcessing(abnormalBills.get(0));
+            AbnormalBill abnormalBillOld = abnormalBillService.getById(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo()));
+            if ("N".equals(abnormalBillOld.getStatus())){
+                abnormalBillService.resProcessing(abnormalBillOld);
+            }else {
+                return new ResultVo(ResultCode.FAILED,"响应处理失败，该异常单号MES中已响应处理:" + abnormalBill.getAbnormalNo());
+            }
             return new ResultVo(ResultCode.SUCCESS,"BPM响应处理成功");
         }catch(Exception e){
             return new ResultVo(ResultCode.FAILED,"响应处理失败:" + e.getMessage());

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

@@ -595,9 +595,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             }
             return ;
         }
-        /*if(abnormalBill.getBpmSubmit().equals("false")) {
-            this.anomalyCreatedAndSendMessage(abnormalBillMapper.selectById(abnormalBill.getHandle()), null);
-        }*/
+
+//        this.anomalyCreatedAndSendMessage(abnormalBillMapper.selectById(abnormalBill.getHandle()), null);
     }
 
     @Override
@@ -744,7 +743,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
             }
         }
-        if (StringUtil.isBlank(abnormalBill.getBpmSubmit())){
+        if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")){
             this.anomalyCreatedAndSendMessage(abnormalBill2,abnormalBillDispose);
         }
     }
@@ -798,7 +797,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
-        if (abnormalBill.getBpmSubmit().equals("false")) {
+
+        if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")) {
             this.anomalyCreatedAndSendMessage(abnormalBillMapper.selectById(abnormalBill.getHandle()), abnormalBillDispose);
         }
     }

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

@@ -707,7 +707,7 @@
         <if test="et.workCenter!=null">WORK_CENTER=#{et.workCenter},</if>
         <if test="et.shopOrder!=null">SHOP_ORDER=#{et.shopOrder},</if>
         <if test="et.messageType!=null">MESSAGE_TYPE=#{et.messageType},</if>
-        <if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
+        <if test="et.resrce!=null and et.resrce != '' ">RESRCE=#{et.resrce},</if>
         <if test="et.ncCode!=null">NC_CODE=#{et.ncCode},</if>
         <if test="et.shutDown!=null">SHUT_DOWN=#{et.shutDown},</if>
         <if test="et.responseUser!=null">RESPONSE_USER=#{et.responseUser},</if>
@@ -735,7 +735,7 @@
         <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
         <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
         <if test="et.productCategory!=null">PRODUCT_CATEGORY=#{et.productCategory},</if>
-        <if test="et.stepId!=null">STEP_ID=#{et.stepId},</if>
+        <if test="et.stepId!=null and et.stepId != ''">STEP_ID=#{et.stepId},</if>
         <if test="et.workOrder!=null">WORK_ORDER=#{et.workOrder},</if>
         <if test="et.itemNumber!=null">ITEM_NUMBER=#{et.itemNumber},</if>
         <if test="et.bpmFlowId != null">BPM_FLOW_ID=#{et.bpmFlowId},</if>