内部码打印问题，启用使用单元数量问题，申购系统繁忙问题

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -281,7 +281,7 @@ public class BasicOrderPrintController {
                 bizData.put("index", i);
                 bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode());
                 String udiCode = "#" + obj.getNameCode() + "#" + obj.getProduceDate() + "#" + obj.getExpireDate() +
-                        "#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + obj.getWarehouseCode() + "#" + obj.getDeptCode();
+                        "#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#"  + "#" ;
                 udiCode = udiCode.replaceAll("#null", "#");
                 bizData.put("udiCode", udiCode);
                 bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc());

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -352,7 +352,7 @@ public class IoOrderReviewController extends BaseController {
                 checkCode = checkCode.replace("\u001D", "");
             }
             if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) {
-                if (checkOrderCodesBean.getStatus() == Constant.DB_CHECK_ED
+                if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED
                         && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) {
                     return Constant.CHECK_REPEAT;
                 }

src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java

@@ -6,7 +6,7 @@ import lombok.Data;
 public class CompanyProductRelevanceResponse {
 
     private Long id;
-    private Integer rlId;
+    private Long  rlId;
     private String thirdId;
     private String thirdName;
     private String uuid;

src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java

@@ -6,7 +6,7 @@ import lombok.Data;
 public class UdiRlSupResponse {
 
     private Long id;
-    private Integer rlId;
+    private Long rlId;
     private String thirdId;
     private String thirdName;
     private String uuid;

src/main/java/com/glxp/api/res/inv/InvRemindMsgResponse.java

@@ -15,7 +15,7 @@ public class InvRemindMsgResponse {
     /**
      * 关联主键ID
      */
-    private Integer relId;
+    private Long relId;
 
     /**
      * 批次号

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java

@@ -119,7 +119,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
 
             String udiCode = "#" + udiProductEntity.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
-                    "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
+                    "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + "#";
             udiCode = udiCode.replaceAll("#null", "#");
             innerOrderPrintEntity.setUdiCode(udiCode);
             invInnerOrderPrintDao.insert(innerOrderPrintEntity);
@@ -288,7 +288,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
 
             String udiCode = "#" + obj.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
-                    "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
+                    "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + "#";
             udiCode = udiCode.replaceAll("#null", "#");
             innerOrderPrintEntity.setUdiCode(udiCode);
             invInnerOrderPrintDao.insert(innerOrderPrintEntity);

src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java

@@ -20,24 +20,36 @@ public class UdiCalCountUtil {
 //    }
 
     public int getActCount(UdiRelevanceResponse udiRelevanceResponse) {
-        int actCount;
+        //启用使用单元
-        if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) {
+        if (udiRelevanceResponse.getUseDy()) {
-            if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
+            if (udiRelevanceResponse.getDiType() == 1) {
-                actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
+                if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) {
-            } else {
+                    udiRelevanceResponse.setZxxsbzbhsydysl(1);
+                }
+                return udiRelevanceResponse.getZxxsbzbhsydysl();
+            } else if (udiRelevanceResponse.getDiType() == 4) {
                 if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
                     udiRelevanceResponse.setBhzxxsbzsl(1);
                 }
                 if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) {
                     udiRelevanceResponse.setZxxsbzbhsydysl(1);
                 }
-                actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
+                return udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
+            } else {
+                return udiRelevanceResponse.getBhzxxsbzsl();
+            }
+        } else {//不启用使用单元
+            if (udiRelevanceResponse.getDiType() == 1) {
+                return 1;
+            } else if (udiRelevanceResponse.getDiType() == 4) {
+                if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
+                    udiRelevanceResponse.setBhzxxsbzsl(1);
+                }
+                return udiRelevanceResponse.getBhzxxsbzsl();
+            } else {
+                return udiRelevanceResponse.getBhzxxsbzsl();
             }
-        } else {
-            actCount = udiRelevanceResponse.getBhzxxsbzsl();
         }
-
-        return actCount;
     }
 
     public int getActCount(IoCodeTempEntity codeTempEntity) {