1.修改新增盘点相关接口

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountCodesController.java

@@ -49,7 +49,7 @@ public class InvCountCodesController {
      * @return
      */
     @PostMapping("/invCount/codes/deleteCode")
-    public BaseResponse deleteCode(FilterInvCountCodesRequest codesRequest) {
+    public BaseResponse deleteCode(@RequestBody FilterInvCountCodesRequest codesRequest) {
         if (null == codesRequest || StrUtil.isBlank(codesRequest.getOrderIdFk()) || StrUtil.isBlank(codesRequest.getProductId()) || StrUtil.isBlank(codesRequest.getCode())) {
             return ResultVOUtils.success(ResultEnum.PARAM_VERIFY_FALL);
         }

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderDetailController.java

@@ -51,7 +51,7 @@ public class InvCountOrderDetailController {
      * @return
      */
     @PostMapping("/invCount/order/detail/deleteOrderDetail")
-    public BaseResponse deleteOrderDetail(FilterInvCountOrderDetailRequest detailRequest) {
+    public BaseResponse deleteOrderDetail(@RequestBody FilterInvCountOrderDetailRequest detailRequest) {
         if (null == detailRequest || null == detailRequest.getId()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDetailDao.java

@@ -59,19 +59,19 @@ public interface InvCountOrderDetailDao {
     List<InvCountOrderDetailResponse> filterCountDetail(FilterInvCountOrderDetailRequest detailRequest);
 
     /**
-     * 查询盘点单据详情
+     * 根据产品ID和盘点单号删除条码
      *
      * @param orderIdFk
      * @param productId
-     * @return
      */
-    InvCountOrderDetail selectByOrderIdAndProductId(@Param("orderIdFk") String orderIdFk, @Param("productId") String productId);
+    void deleteByOrderIdAndProductId(@Param("orderIdFk") String orderIdFk, @Param("productId") String productId);
 
     /**
-     * 根据产品ID和盘点单号删除条码
+     * 根据单据号和产品DI查询单据详情
      *
      * @param orderIdFk
-     * @param productId
+     * @param nameCode
+     * @return
      */
-    void deleteByOrderIdAndProductId(@Param("orderIdFk") String orderIdFk, @Param("productId") String productId);
+    InvCountOrderDetail selectByOrderIdAndNameCode(@Param("orderIdFk") String orderIdFk, @Param("nameCode") String nameCode);
 }

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountOrderDetail.java

@@ -20,6 +20,11 @@ public class InvCountOrderDetail {
      */
     private String productId;
 
+    /**
+     * 产品DI
+     */
+    private String nameCode;
+
     /**
      * 批次号
      */

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java

@@ -53,7 +53,8 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
             return ResultVOUtils.error(ResultEnum.DATA_NOT);
         }
 
-        InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndProductId(list.get(0).getOrderIdFk(), list.get(0).getProductId());
+        UdiEntity udi = FilterUdiUtils.getUdi(list.get(0).getCode());
+        InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndNameCode(list.get(0).getOrderIdFk(), udi.getUdi());
         if (list.size() == 1) {
             //条码数量为1，删除此产品的盘点单据详情
             invCountOrderDetailDao.deleteByPrimaryKey(invCountOrderDetail.getId());
@@ -76,11 +77,14 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
         }
         //解析条码
         UdiEntity udi = FilterUdiUtils.getUdi(invCountCodes.getCode());
-        String productId = udiRelevanceDao.selectProductId(udi.getUdi(), invCountCodes.getOrderIdFk());
         //查询单据详情，单据详情添加
-        InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndProductId(invCountCodes.getOrderIdFk(), productId);
+        InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndNameCode(invCountCodes.getOrderIdFk(), udi.getUdi());
+        if (null == invCountOrderDetail) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT, "当前仓库不存在此产品");
+        }
+
         invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() + 1);
-        invCountCodes.setProductId(productId);
+        invCountCodes.setProductId(invCountOrderDetail.getProductId());
         invCountOrderDetailDao.updateByPrimaryKey(invCountOrderDetail);
         invCountCodesDao.insert(invCountCodes);
         return ResultVOUtils.success();

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -820,6 +820,6 @@
     <select id="selectProductId" resultType="java.lang.String">
         select id
         from basic_udirel
-        where uuid = (select uuid from basic_products where nameCode = #{nameCode})
+        where uuid = (select uuid from basic_products where nameCode = #{nameCode} limit 1)
     </select>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml

@@ -5,6 +5,7 @@
         <id column="id" jdbcType="INTEGER" property="id"/>
         <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk"/>
         <result column="productId" jdbcType="VARCHAR" property="productId"/>
+        <result column="nameCode" jdbcType="VARCHAR" property="nameCode"/>
         <result column="batchNo" jdbcType="VARCHAR" property="batchNo"/>
         <result column="produceDate" jdbcType="VARCHAR" property="produceDate"/>
         <result column="expireDate" jdbcType="VARCHAR" property="expireDate"/>
@@ -20,6 +21,7 @@
         id,
         orderIdFk,
         productId,
+        nameCode,
         batchNo,
         produceDate,
         expireDate,
@@ -46,11 +48,12 @@
 
     <insert id="insert" keyColumn="id" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.inventory.InvCountOrderDetail" useGeneratedKeys="true">
-        insert into inv_count_order_detail (orderIdFk, productId, batchNo,
+        insert into inv_count_order_detail (orderIdFk, productId, nameCode, batchNo,
                                             produceDate, expireDate, serialNo,
                                             countNum, invNum, profitNum,
                                             lossNum, `status`)
-        values (#{orderIdFk,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR},
+        values (#{orderIdFk,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{nameCode,jdbcType=VARCHAR},
+                #{batchNo,jdbcType=VARCHAR},
                 #{produceDate,jdbcType=VARCHAR}, #{expireDate,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR},
                 #{countNum,jdbcType=INTEGER}, #{invNum,jdbcType=INTEGER}, #{profitNum,jdbcType=INTEGER},
                 #{lossNum,jdbcType=INTEGER}, #{status,jdbcType=INTEGER})
@@ -66,6 +69,9 @@
             <if test="productId != null">
                 productId,
             </if>
+            <if test="nameCode != null">
+                nameCode,
+            </if>
             <if test="batchNo != null">
                 batchNo,
             </if>
@@ -101,6 +107,9 @@
             <if test="productId != null">
                 #{productId,jdbcType=VARCHAR},
             </if>
+            <if test="nameCode != null">
+                #{nameCode,jdbcType=VARCHAR},
+            </if>
             <if test="batchNo != null">
                 #{batchNo,jdbcType=VARCHAR},
             </if>
@@ -140,6 +149,9 @@
             <if test="productId != null">
                 productId = #{productId,jdbcType=VARCHAR},
             </if>
+            <if test="nameCode != null">
+                nameCode = #{nameCode,jdbcType=VARCHAR},
+            </if>
             <if test="batchNo != null">
                 batchNo = #{batchNo,jdbcType=VARCHAR},
             </if>
@@ -175,6 +187,7 @@
         update inv_count_order_detail
         set orderIdFk   = #{orderIdFk,jdbcType=VARCHAR},
             productId   = #{productId,jdbcType=VARCHAR},
+            nameCode    = #{nameCode,jdbcType=VARCHAR},
             batchNo     = #{batchNo,jdbcType=VARCHAR},
             produceDate = #{produceDate,jdbcType=VARCHAR},
             expireDate  = #{expireDate,jdbcType=VARCHAR},
@@ -200,6 +213,11 @@
                     when id = #{item.id,jdbcType=INTEGER} then #{item.productId,jdbcType=VARCHAR}
                 </foreach>
             </trim>
+            <trim prefix="nameCode = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.nameCode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
             <trim prefix="batchNo = case" suffix="end,">
                 <foreach collection="list" index="index" item="item">
                     when id = #{item.id,jdbcType=INTEGER} then #{item.batchNo,jdbcType=VARCHAR}
@@ -254,11 +272,12 @@
 
     <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
         insert into inv_count_order_detail
-        (orderIdFk, productId, batchNo, produceDate, expireDate, serialNo, countNum, invNum,
+        (orderIdFk, productId, nameCode, batchNo, produceDate, expireDate, serialNo, countNum, invNum,
          profitNum, lossNum, `status`)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.orderIdFk,jdbcType=VARCHAR}, #{item.productId,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR},
+            (#{item.orderIdFk,jdbcType=VARCHAR}, #{item.productId,jdbcType=VARCHAR}, #{item.nameCode,jdbcType=VARCHAR},
+             #{item.batchNo,jdbcType=VARCHAR},
              #{item.produceDate,jdbcType=VARCHAR}, #{item.expireDate,jdbcType=VARCHAR},
              #{item.serialNo,jdbcType=VARCHAR}, #{item.countNum,jdbcType=INTEGER}, #{item.invNum,jdbcType=INTEGER},
              #{item.profitNum,jdbcType=INTEGER}, #{item.lossNum,jdbcType=INTEGER}, #{item.status,jdbcType=INTEGER})
@@ -295,17 +314,14 @@
         group by od.id
     </select>
 
-    <select id="selectByOrderIdAndProductId" resultMap="BaseResultMap">
-        select *
-        from inv_count_order_detail
-        where orderIdFk = #{orderIdFk}
-          and productId = #{productId}
-    </select>
-
     <delete id="deleteByOrderIdAndProductId">
         delete
         from inv_count_codes
         where orderIdFk = #{orderIdFk}
           and productId = #{productId}
     </delete>
+
+    <select id="selectByOrderIdAndNameCode" resultMap="BaseResultMap">
+        select * from inv_count_order_detail where orderIdFk = #{orderIdFk} and nameCode = #{nameCode}
+    </select>
 </mapper>

scripts/盘点功能表.sql

@@ -33,9 +33,10 @@ CREATE TABLE `inv_count_order_detail`  (
                                            `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
                                            `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '盘点单号',
                                            `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID',
+                                           `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品DI',
                                            `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
-                                           `produceDate` varchar(255) NULL DEFAULT NULL COMMENT '生产日期',
+                                           `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
-                                           `expireDate` varchar(255) NULL DEFAULT NULL COMMENT '失效日期',
+                                           `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
                                            `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号',
                                            `countNum` int(0) NULL DEFAULT NULL COMMENT '盘点数量',
                                            `invNum` int(0) NULL DEFAULT NULL COMMENT '账面数量',
@@ -43,7 +44,7 @@ CREATE TABLE `inv_count_order_detail`  (
                                            `lossNum` int(0) NULL DEFAULT NULL COMMENT '盘亏数量',
                                            `status` tinyint(1) NULL DEFAULT NULL COMMENT '盈亏状态  0：亏损 1：盈利',
                                            PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '盘点单详情' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '盘点单详情' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;