Merge remote-tracking branch 'origin/dev' into test

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

@@ -216,6 +216,7 @@ public class BasicBussinessTypeController extends BaseController {
             } else {
                 result.addAll(bussinessTypeEntities);
             }
+            System.out.println("result:" + result.toArray());
 
             PageInfo<BasicBussinessTypeEntity> pageInfo;
             pageInfo = new PageInfo<>(result);
@@ -228,6 +229,9 @@ public class BasicBussinessTypeController extends BaseController {
             List<BasicBussinessTypeResponse> bussinessTypeEntities;
             //判断是否是医院用户
             if (isHosUser()) {
+                if (bussinessTypeFilterRequest.getSpUse() == null) {
+                    bussinessTypeFilterRequest.setSpUse(3);
+                }
                 bussinessTypeFilterRequest.setUserId(getUserId());
                 bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
                         bussinessTypeFilterRequest);

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

@@ -33,6 +33,7 @@ import com.glxp.api.service.thrsys.ThrSystemService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.udi.UdiInfoUtil;
 import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -173,20 +174,24 @@ public class UdiContrastController {
     /**
      * 切换耗材字典版本号
      */
+    @Transactional(rollbackFor = Exception.class)
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/syncOnline")
     @Log(title = "耗材字典", businessType = BusinessType.UPDATE)
     public BaseResponse syncOnline(@RequestBody UdiCombineRequest udiCombineRequest) {
-        List<UdiProductEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getOriginUuid());
+        List<UdiProductEntity> udiInfoEntities = udiProductService.findByOriginUuid(udiCombineRequest.getOriginUuid());
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
+            String newUuid = null;
             BaseResponse<List<ProductInfoEntity>> listBaseResponse = asyncDiDlHelper.dlLastVersionByDi(udiInfoEntities.get(0).getNameCode());
             if (listBaseResponse.getCode() == 20000) {
                 List<ProductInfoEntity> productInfoEntityList = listBaseResponse.getData();
                 if (CollUtil.isNotEmpty(productInfoEntityList)) {
                     productInfoService.insertProductInfos(productInfoEntityList);
+                    newUuid = productInfoEntityList.get(0).getUuid();
                 }
             }
-            udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getOriginUuid());
+
+            udiInfoEntities = udiDlHttpClient.getUdiByUuid(newUuid);
             udiProductService.deleteByUuid(udiCombineRequest.getUuid());
             for (UdiProductEntity udiProductEntity : udiInfoEntities) {
                 udiProductEntity.setUuid(udiCombineRequest.getUuid());

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);
@@ -1203,5 +1204,18 @@ public class IoCodeTempController extends BaseController {
         else return ResultVOUtils.error(500, "修改失败!");
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("warehouse/inout/checkTempCode")
+    public BaseResponse checkTempCode(@RequestBody IoCodeTempEntity codeTempEntity) {
+
+        Boolean falg=codeTempService.checkTempCode(codeTempEntity);
+        if(!falg){
+            return ResultVOUtils.error(999,"该产品已存在，请勿重复录入");
+        }
+
+        return ResultVOUtils.success();
+
+    }
+
 
 }

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

@@ -289,6 +289,9 @@ public class IoOrderController extends BaseController {
     public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
 
         IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+        if (StringUtils.isNotBlank(addOrderRequest.getRemark())) {
+            orderEntity.setRemark(addOrderRequest.getRemark());
+        }
         BaseResponse tempResponse = checkSubmitEnable(orderEntity);
         if (tempResponse != null)
             return tempResponse;

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 dispatch;           //是否可配送
-    private boolean groupBuy;           //是否集采产品
+    private Boolean groupBuy;           //是否集采产品
-    private boolean needCert;           //是否需要资质材料
+    private Boolean needCert;           //是否需要资质材料
     private String certIdFk;
 }

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

@@ -46,7 +46,7 @@ public class BasicBussinessTypeResponse {
     private Boolean changeEnable;
     private Boolean genUnit;
     private String defaultUnit;
-    private int spUse;
+    private Integer spUse;
     private Boolean secCheckEnable;
     private int checkUdims;
     private int checkPdaEd;

src/main/java/com/glxp/api/service/inout/IoCodeTempService.java

@@ -38,4 +38,6 @@ public interface IoCodeTempService {
      * @return
      */
     List<IoCodeTempResponse> findCodeList(FilterCodeRequest filterCodeRequest);
+
+    Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity);
 }

src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java

@@ -61,7 +61,7 @@ public class IoOrderUtilsService {
         Boolean checkUdi = false; //判断是不是有错误
 
         //根据供应商id查询用户id
-        AuthAdmin authAdmins = authAdminDao.findByCustomerld(platformLinkRespons.getUnitId()).get(0);
+        AuthAdmin authAdmins = authAdminDao.findByCustomerld(platformLinkRespons.getCustomerId()).get(0);
 
         //单据表生成
         String billNO = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"));

src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java

@@ -86,4 +86,21 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
         return ioCodeTempDao.selectCodeList(filterCodeRequest);
     }
 
+    @Override
+    public Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity) {
+
+        QueryWrapper<IoCodeTempEntity> ew=new QueryWrapper<>();
+        ew.eq("code",ioCodeTempEntity.getCode());
+        ew.eq("corpOrderId",ioCodeTempEntity.getCorpOrderId());
+        ew.eq("batchNo",ioCodeTempEntity.getBatchNo());
+        ew.eq("produceDate",ioCodeTempEntity.getProduceDate());
+        ew.eq("expireDate",ioCodeTempEntity.getExpireDate());
+        ew.eq("serialNo",ioCodeTempEntity.getSerialNo());
+        Long count = ioCodeTempDao.selectCount(ew);
+        if(count>0){
+            return false;
+        }
+        return true;
+    }
+
 }

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -222,7 +222,7 @@
                 AND subInvCode = #{code}
             </if>
             <if test="invCode != ''and invCode != null">
-                AND subInvCode = #{code}
+                AND subInvCode = #{invCode}
             </if>
             <if test="userId != ''and userId != null">
                 AND auth_user_bustype.`userId` = #{userId}

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -141,7 +141,7 @@
                 AND basic_products.nameCode = #{nameCode}
             </if>
         </where>
-
+        LIMIT 1
     </select>
 
 

src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml

@@ -136,7 +136,7 @@
                 AND ic.invoiceEncode = #{invoiceEncode}
             </if>
         </where>
-        GROUP BY io.orderIdFk
+        group by io.id
         order by ic.updateTime desc
     </select>
 

src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml

@@ -4,7 +4,7 @@
     <select id="selectSupRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.companyName                                                                   `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk limit 1) certName
         from sup_cert_remind_msg m
                  left join sup_company c on m.idFk = c.customerId
         left join sup_cert bc on bc.code = m.code
@@ -36,9 +36,9 @@
     <select id="selectManufactureRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.companyName                                                                   `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName
         from sup_cert_remind_msg m
-                 left join sup_manufacturer c on m.idFk = c.customerId
+                 left join sup_manufacturer c on m.idFk = c.manufacturerId
                                                      left join sup_cert bc on bc.code = m.code
         <where>
             <if test="supId != null and supId != ''">