1.修改盘点单据相关接口

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

@@ -64,10 +64,25 @@ public class InvCountCodesController {
      */
     @PostMapping("/invCount/codes/addCode")
     public BaseResponse addCode(@RequestBody InvCountCodes invCountCodes) {
-        if (null != invCountCodes || StrUtil.isBlank(invCountCodes.getProductId()) || StrUtil.isBlank(invCountCodes.getProductId())) {
+        if (null == invCountCodes || StrUtil.isBlank(invCountCodes.getCode())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
         return invCountCodesService.addCode(invCountCodes);
     }
 
+    /**
+     * 根据此盘点单据号统计条码数量
+     *
+     * @param orderIdFk
+     * @return
+     */
+    @GetMapping("/invCount/codes/getCountOrderCodesNum")
+    public BaseResponse getCountOrderCodesNum(String orderIdFk) {
+        if (StrUtil.isBlank(orderIdFk)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        Long codesNum = invCountCodesService.getCountOrderCodesNum(orderIdFk);
+        return ResultVOUtils.success(codesNum);
+    }
+
 }

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

@@ -71,8 +71,7 @@ public class InvCountOrderController {
         if (null == invCountOrder) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        String orderId = invCountOrderService.saveCountOrder(invCountOrder);
-        return ResultVOUtils.success(orderId);
+        return invCountOrderService.saveCountOrder(invCountOrder);
     }
 
     /**

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

@@ -48,4 +48,21 @@ public interface InvCountCodesDao {
      * @return
      */
     Long countByOrderIdFk(@Param("orderIdFk") Integer orderIdFk);
+
+    /**
+     * 根据单据号统计条码数量
+     *
+     * @param orderIdFk
+     * @return
+     */
+    Long countByOrderId(@Param("orderIdFk") String orderIdFk);
+
+    /**
+     * 根据条码和盘点单号统计数量
+     *
+     * @param code
+     * @param orderIdFk
+     * @return
+     */
+    Long selectCountByCodeAndOrderId(@Param("code") String code, @Param("orderIdFk") String orderIdFk);
 }

api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountOrderDetailResponse.java

@@ -14,4 +14,19 @@ public class InvCountOrderDetailResponse extends InvCountOrderDetail {
      */
     private String productName;
 
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 注册/备案凭证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产厂家
+     */
+    private String ylqxzcrbarmc;
+
 }

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

@@ -34,4 +34,12 @@ public interface InvCountCodesService {
      * @return
      */
     BaseResponse addCode(InvCountCodes invCountCodes);
+
+    /**
+     * 根据盘点单号统计条码数量
+     *
+     * @param orderIdFk
+     * @return
+     */
+    Long getCountOrderCodesNum(String orderIdFk);
 }

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

@@ -32,7 +32,7 @@ public interface InvCountOrderService {
      *
      * @param invCountOrder
      */
-    String saveCountOrder(InvCountOrder invCountOrder);
+    BaseResponse saveCountOrder(InvCountOrder invCountOrder);
 
     /**
      * 盘点单据提交审核

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

@@ -69,6 +69,11 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
 
     @Override
     public BaseResponse addCode(InvCountCodes invCountCodes) {
+        //查询此条码是否重复
+        Long count = invCountCodesDao.selectCountByCodeAndOrderId(invCountCodes.getCode(), invCountCodes.getOrderIdFk());
+        if (count > 0) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复！");
+        }
         //解析条码
         UdiEntity udi = FilterUdiUtils.getUdi(invCountCodes.getCode());
         String productId = udiRelevanceDao.selectProductId(udi.getUdi(), invCountCodes.getOrderIdFk());
@@ -78,7 +83,12 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
         invCountCodes.setProductId(productId);
         invCountOrderDetailDao.updateByPrimaryKey(invCountOrderDetail);
         invCountCodesDao.insert(invCountCodes);
-        return ResultVOUtils.success(invCountOrderDetail);
+        return ResultVOUtils.success();
+    }
+
+    @Override
+    public Long getCountOrderCodesNum(String orderIdFk) {
+        return invCountCodesDao.countByOrderId(orderIdFk);
     }
 
 }

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

@@ -63,22 +63,24 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
     }
 
     @Override
-    public String saveCountOrder(InvCountOrder invCountOrder) {
+    public BaseResponse saveCountOrder(InvCountOrder invCountOrder) {
         //封装相关数据
         invCountOrder.setStatus(0); //未提交
 
-        String orderId = null;
         if (StrUtil.isBlank(invCountOrder.getOrderId())) {
             //生成单据号
-            orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.COUNT_ORDER, "yyyyMMdd"));
+            String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.COUNT_ORDER, "yyyyMMdd"));
             invCountOrder.setOrderId(orderId); //盘点单号
             AuthAdmin user = customerService.getUserBean();
             invCountOrder.setCreateUser(user.getUserName());
+            invCountOrder.setCreateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
             invCountOrderDao.insert(invCountOrder);
         } else {
-            invCountOrderDao.updateByOrderId(invCountOrder);
+            InvCountOrder oldData = invCountOrderDao.selectByOrderId(invCountOrder.getOrderId());
+            oldData.setUpdateTime(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
+            invCountOrderDao.updateByOrderId(oldData);
         }
-        return orderId;
+        return ResultVOUtils.success(invCountOrder);
     }
 
     @Override

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

@@ -165,4 +165,12 @@
     <select id="countByOrderIdFk" resultType="java.lang.Long">
         select count(*) from inv_count_codes where orderIdFk = #{orderIdFk}
     </select>
+
+    <select id="countByOrderId" resultType="java.lang.Long">
+        select count(*) from inv_count_codes where orderIdFk = #{orderIdFk}
+    </select>
+
+    <select id="selectCountByCodeAndOrderId" resultType="java.lang.Long">
+        select count(*) from inv_count_codes where orderIdFk = #{orderIdFk} and code = #{code}
+    </select>
 </mapper>

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

@@ -285,21 +285,14 @@
     </select>
 
     <select id="filterCountDetail" resultType="com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse">
-        select od.id,
-               orderIdFk,
-               productId,
-               batchNo,
-               produceDate,
-               expireDate,
-               serialNo,
-               countNum,
-               invNum,
-               profitNum,
-               lossNum,
-               status,
-               p.cpmctymc productName
+        select od.*, ip.productsName productName, ip.ggxh, ip.ylqxzcrbarmc, ip.zczbhhzbapzbh
         from inv_count_order_detail od
-                 left join basic_products p on od.productId = p.id
+                 left join inv_count_order ico on od.orderIdFk = ico.orderId
+                 left join inv_product ip on od.productId = ip.relIdFk
+        where od.orderIdFk = #{orderIdFk}
+          and ip.invStorageCode = ico.invStorageCode
+          and ip.invWarehouseCode = ico.invWarehouseCode
+        group by od.id
     </select>
 
     <select id="selectByOrderIdAndProductId" resultMap="BaseResultMap">