生产处置单推送ERP逻辑修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java

@@ -132,23 +132,23 @@ public interface ReviewSheetConst {
         /**
          * ERP暂存
          */
-        Integer T_ERP_TEMP = 21;
+        Integer T_ERP_TEMP = -1;
         /**
          * ERP提交质保
          */
-        Integer T_ERP_QA = 22;
+        Integer T_ERP_QA = 1;
         /**
          * ERP提交工艺
          */
-        Integer T_ERP_CRAFT = 23;
+        Integer T_ERP_CRAFT = 2;
         /**
          * ERP提交设计
          */
-        Integer T_ERP_DES = 24;
+        Integer T_ERP_DES = 3;
         /**
          * ERP提交设计变更
          */
-        Integer T_ERP_DES_CHANGE = 25;
+        Integer T_ERP_DES_CHANGE = 4;
     }
 
     interface SELF_REVIEW_FLAG {

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

@@ -712,7 +712,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
             dutyService.saveOrUpdateBatch(listD);
         }
 
-        if (ReviewSheetConst.BizType.T_ERP.equals(rs.getBizType())) {
+        if (ReviewSheetConst.BizType.T_ERP.equals(rs.getBizType()) && !ReviewSheetConst.SUBMIT_TYPE.T_ERP_TEMP.equals(submitType)) {
             try {
                 JSONObject responseBody = saveReviewData(rs, listD, listF, bladeUser);
                 rs.setErpId(responseBody.getString("trialId"));
@@ -782,7 +782,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
             int index = 1;
             for (ReviewFault rf : rfList) {
                 vofs.add(new ReviewFaultDTO(null, index + "", rf.getNgType2Id() == null ? "" : rf.getNgType2Id().toString(), rf.getNgType3Id() == null ? "" : rf.getNgType3Id().toString(),
-                        rf.getNgType4Id() == null ? "" : rf.getNgType4Id().toString(), rf.getScale() == null ? "" : rf.getScale().toString(), rf.getQty() == null ? 0 :rf.getQty().intValue(), rf.getMemo()));
+                        rf.getNgType4Id() == null ? "" : rf.getNgType4Id().toString(), rf.getScale() == null ? "" : rf.getScale().toString(), rf.getQty() == null ? 0 : rf.getQty().intValue(), rf.getMemo()));
                 index++;
             }
         }