aps-炉号/批次号跨月之后取数为000bug修复详情testin1710

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportOutputServiceImpl.java

@@ -16,6 +16,7 @@ import com.rongwei.bsentity.vo.InsertMyReportOutputReq;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
+import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import com.rongwei.safecommon.fegin.CXAdminFeginClient;
 import com.rongwei.safecommon.utils.CXCommonUtils;
@@ -82,7 +83,15 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         vo.setInitValue(0L);
                         Map<String, Object> codeData = cxAdminFeginClient.getSerialNumberCode(vo).getData();
                         String code = codeData.get("code").toString();
-
+                        if (StringUtils.isNotBlank(code)){
+                            //取出批次号后三位
+                            String lastThreeChars = code.substring(code.length() - 3);
+                            //判断如果code最后三位如果为000时再次调用序列号接口/修复跨月流水号问题
+                            if ("000".equals(lastThreeChars)){
+                                codeData = cxAdminFeginClient.getSerialNumberCode(vo).getData();
+                                code = codeData.get("code").toString();
+                            }
+                        }
                         apsReportOutputDo.setOutputnumber(code);
                         JSONObject json = new JSONObject();
                         json.put("batchNumber", code);

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -18,6 +18,7 @@ import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
+import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveUpdateVo;
 import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import com.rongwei.safecommon.fegin.CXAdminFeginClient;
@@ -618,6 +619,13 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                 vo.setInitValue(0L);
                 Map<String, Object> codeData = cxAdminFeginClient.getSerialNumberCode(vo).getData();
                 heatNumber = codeData.get("code").toString();
+                if (StringUtils.isNotBlank(heatNumber)){
+                    //判断如果heatNumber如果为000时再次调用序列号接口/修复跨月流水号问题
+                    if ("000".equals(heatNumber)){
+                        codeData = cxAdminFeginClient.getSerialNumberCode(vo).getData();
+                        heatNumber = codeData.get("code").toString();
+                    }
+                }
             }
 
             apsReportRecordsDo.setHeatnumber(heatNumber);