盘点问题，service类生成

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -317,9 +317,9 @@ public class InvProductController extends BaseController {
             if (invWarehouseEntity != null) {
                 outInvCode = invWarehouseEntity.getCode();
             }
-            count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, outInvCode, null,true);
+            count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, outInvCode, null, true);
         } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
-            count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(),true);
+            count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), true);
         } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
             //按指定货位出库
             if (StrUtil.isEmpty(codeTempEntity.getWarehouseCode())) {
@@ -336,7 +336,7 @@ public class InvProductController extends BaseController {
                     return ResultVOUtils.error(500, "添加失败，该产品未上架货位!");
                 }
             } else {
-                count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(),true);
+                count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), true);
             }
         }
         if (count <= 0) {

src/main/java/com/glxp/api/dao/thrsys/ThrConsumeMaterialCategoryMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.thrsys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.thrsys.ThrConsumeMaterialCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ThrConsumeMaterialCategoryMapper extends BaseMapper<ThrConsumeMaterialCategory> {
+}

src/main/java/com/glxp/api/entity/thrsys/ThrConsumeMaterialCategory.java

@@ -0,0 +1,91 @@
+package com.glxp.api.entity.thrsys;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 医保耗材分类表
+    */
+@ApiModel(value="com-glxp-api-entity-thrsys-ThrConsumeMaterialCategory")
+@Data
+@TableName(value = "thr_consume_material_category")
+public class ThrConsumeMaterialCategory implements Serializable {
+    /**
+     * 分类ID
+     */
+    @TableId(value = "categoryId", type = IdType.INPUT)
+    @ApiModelProperty(value="分类ID")
+    private Long categoryId;
+
+    /**
+     * 父级分类ID，关联自身表
+     */
+    @TableField(value = "parentCategoryId")
+    @ApiModelProperty(value="父级分类ID，关联自身表")
+    private Long parentCategoryId;
+
+    /**
+     * 分类名称
+     */
+    @TableField(value = "categoryName")
+    @ApiModelProperty(value="分类名称")
+    private String categoryName;
+
+    /**
+     * 分类描述
+     */
+    @TableField(value = "description")
+    @ApiModelProperty(value="分类描述")
+    private String description;
+
+    /**
+     * 分类级别
+     */
+    @TableField(value = "`level`")
+    @ApiModelProperty(value="分类级别")
+    private Integer level;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    @ApiModelProperty(value="创建人")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    @ApiModelProperty(value="更新人")
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value="更新时间")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value="备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java

@@ -84,6 +84,9 @@ public class InvCountOrderDetailService extends ServiceImpl<InvCountOrderDetailM
         invCountOrder.setUpdateTime(new Date());
         invCountOrderDetailDao.deleteByOrderId(orderId);
         if (CollUtil.isNotEmpty(countOrderDetailList)) {
+            for (InvCountOrderDetailEntity invCountOrderDetailEntity : countOrderDetailList) {
+                invCountOrderDetailEntity.setOrderIdFk(orderId);
+            }
             invCountOrderDetailDao.insertBatch(countOrderDetailList);
         }
         return ResultVOUtils.success();

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

@@ -46,9 +46,9 @@ public class InvProductService extends ServiceImpl<InvProductDao, InvProductEnti
 
     public InvProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode, BigDecimal price) {
         return invProductDao.selectOne(new QueryWrapper<InvProductEntity>().eq("relIdFk", relId)
-                .eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo).isNull(StrUtil.isEmpty(batchNo), "batchNo")
+                .eq(StrUtil.isNotBlank(batchNo), "batchNo", batchNo).isNull(StrUtil.isEmpty(batchNo), "batchNo")
                 .eq("supId", supId)
-                .eq("deptCode", deptCode)
+                .eq(StrUtil.isNotBlank(deptCode),"deptCode", deptCode)
                 .eq("invCode", invCode)
                 .eq(price != null, "price", price).isNull(price == null, "price").last("limit 1")
         );

src/main/java/com/glxp/api/service/thrsys/ThrConsumeMaterialCategoryService.java

@@ -0,0 +1,12 @@
+package com.glxp.api.service.thrsys;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.entity.thrsys.ThrConsumeMaterialCategory;
+import com.glxp.api.dao.thrsys.ThrConsumeMaterialCategoryMapper;
+@Service
+public class ThrConsumeMaterialCategoryService extends ServiceImpl<ThrConsumeMaterialCategoryMapper, ThrConsumeMaterialCategory> {
+
+}

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/thrsys/ThrConsumeMaterialCategoryMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.thrsys.ThrConsumeMaterialCategoryMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrConsumeMaterialCategory">
+    <!--@mbg.generated-->
+    <!--@Table thr_consume_material_category-->
+    <id column="categoryId" jdbcType="BIGINT" property="categoryId" />
+    <result column="parentCategoryId" jdbcType="BIGINT" property="parentCategoryId" />
+    <result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="level" jdbcType="INTEGER" property="level" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    categoryId, parentCategoryId, categoryName, description, `level`, `createUser`, createTime, 
+    updateUser, updateTime, remark
+  </sql>
+</mapper>