1.修复盘点部分bug

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

@@ -16,6 +16,7 @@ public class InvProductDetailPlaceResponse {
     private String batchNo;
     private String productionDate;
     private String expireDate;
+    private String nameCode;
 
     /**
      * 注册证，批准文号

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

@@ -55,7 +55,7 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
 
         UdiEntity udi = FilterUdiUtils.getUdi(list.get(0).getCode());
         InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndNameCode(list.get(0).getOrderIdFk(), udi.getUdi());
-        if (list.size() == 1) {
+        if (invCountOrderDetail.getCountNum() == 1) {
             //条码数量为1，删除此产品的盘点单据详情
             invCountOrderDetailDao.deleteByPrimaryKey(invCountOrderDetail.getId());
         } else {

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

@@ -89,6 +89,18 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
 
     @Override
     public BaseResponse saveCountOrder(InvCountOrder invCountOrder) {
+        if (invCountOrder.getCountType() == 0 || invCountOrder.getCountType() == 2) {
+            //整库盘点
+            if (StrUtil.isBlank(invCountOrder.getInvStorageCode()) || StrUtil.isBlank(invCountOrder.getInvWarehouseCode())) {
+                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请选择仓库信息！");
+            }
+        } else if (invCountOrder.getCountType() == 1) {
+            //货位盘点
+            if (StrUtil.isBlank(invCountOrder.getInvStorageCode()) || StrUtil.isBlank(invCountOrder.getInvWarehouseCode()) || StrUtil.isBlank(invCountOrder.getInvSpaceCode())) {
+                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请选择仓库和货位信息！");
+            }
+        }
+
         //封装相关数据
         invCountOrder.setStatus(0); //未提交
 

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

@@ -392,6 +392,6 @@
                 AND inv_product_detail.invSpaceCode = #{invSpaceCode}
             </if>
         </where>
-        group by inv_product_detail.productIdFk, inv_product.batchNo
+        group by inv_product_detail.productIdFk, inv_product_detail.batchNo
     </select>
 </mapper>

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

@@ -349,6 +349,8 @@
                bp.cpmctymc            as procutName,
                bp.zczbhhzbapzbh,
                bp.ylqxzcrbarmc,
+               bp.nameCode,
+               bp.cpmctymc               productName,
                inv_warehouse.name     as invStorageName,
                inv_warehouse_sub.name as invWarehouseName,
                inv_space.name         as invSpaceName
@@ -359,14 +361,15 @@
                  left join inv_warehouse_sub on pd.invWarehouseCode = inv_warehouse_sub.code
                  left join inv_space on pd.invSpaceCode = inv_space.code
         <where>
-            invSpaceCode != null
-              and invSpaceCode != ''
             <if test="invStorageCode != null and invStorageCode != ''">
                 AND pd.invStorageCode = #{invStorageCode}
             </if>
             <if test="invWarehouseCode != null and invWarehouseCode != ''">
                 AND pd.invWarehouseCode = #{invWarehouseCode}
             </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                AND pd.invSpaceCode = #{invSpaceCode}
+            </if>
         </where>
     </select>