bug修改 耗材字典字段修改

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

@@ -1192,7 +1192,8 @@ public class IoCodeTempController extends BaseController {
             //扫码数量-1
             int orderCount = orderDetailCodeEntity.getCount();
             orderDetailCodeEntity.setCount(orderCount - count);
-            orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+            int reCount = count * udiCalCountUtil.getActCount(codeTempEntity.getNameCode());
+            orderDetailCodeEntity.setReCount(IntUtil.value(orderDetailCodeEntity.getReCount()) - reCount);
             ioOrderDetailCodeService.update(orderDetailCodeEntity);
         }
         int b = codeTempService.updateById(codeTempEntity);

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -160,14 +160,14 @@ public class UdiRelevanceEntity {
     @TableField(value = "useExpireTime")
     private Integer useExpireTime;
     @TableField(value = "dispatch")
-    private boolean dispatch;
+    private Boolean dispatch;
     @TableField(value = "groupBuy")        //是否可配送
-    private boolean groupBuy;
+    private Boolean groupBuy;
     //是否集采产品
     @TableField(value = "isDateBy")
     private Integer isDateBy;
     @TableField(value = "needCert")
-    private boolean needCert;           //是否需要资质材料
+    private Boolean needCert;           //是否需要资质材料
 
     @TableField(value = "certIdFk")
     private String certIdFk;

src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
@@ -38,5 +39,13 @@ public class UdiRelevanceRequest {
     private Boolean useMuti;      //是否多次使用
     private Integer useNum;     //最小包装单元可使用次数
 
+    private Boolean dispatch;
+    private Boolean groupBuy;
+    //是否集采产品
+    private Integer isDateBy;
+    private Boolean needCert;           //是否需要资质材料
+
+    private String certIdFk;
+
 
 }

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -22,7 +22,7 @@ public class UdiRelevanceSaveRequest {
     private Boolean isLock;
     private Integer lockStatus;
     private Boolean isAdavence;
-    private boolean useMuti;
+    private Boolean useMuti;
     private Integer useNum;
     private String supName;
     private Date createTime;
@@ -96,8 +96,8 @@ public class UdiRelevanceSaveRequest {
     private Boolean relSubmit;
 
 
-    private boolean dispatch;           //是否可配送
-    private boolean groupBuy;           //是否集采产品
-    private boolean needCert;           //是否需要资质材料
+    private Boolean dispatch;           //是否可配送
+    private Boolean groupBuy;           //是否集采产品
+    private Boolean needCert;           //是否需要资质材料
     private String certIdFk;
 }