质检编号

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -121,6 +121,11 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
     private String allowEdit;
     @TableField(exist = false)
     private List<WarehousePositionInfo> warehousePositionInfoList;
+    /**
+     * 质检信息数量包括已删除的
+     */
+    @TableField(exist = false)
+    private Integer count;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehouseBaseInfoMapper.java

@@ -3,6 +3,8 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.Map;
+
 /**
  * <p>
  * 记录仓库信息 Mapper 接口
@@ -12,5 +14,12 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @since 2021-05-21
  */
 public interface WarehouseBaseInfoMapper extends BaseMapper<WarehouseBaseInfo> {
+    /**
+     * 质检信息数量包括已删除的
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -133,6 +133,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         weighingManagement.setRelationId(relationId);
         weighingManagement.setNumber(qualityInspectionManagement.getQualityNo());
         weighingManagement.setCustomer(qualityInspectionManagement.getCustomerName());
+        weighingManagement.setCustomerPhone(qualityInspectionManagement.getCustomerPhone());
         weighingManagement.setCarNumber(qualityInspectionManagement.getCarNumber());
         weighingManagement.setCompId(qualityInspectionManagement.getCompId());
         weighingManagement.setGoodsName(qualityInspectionManagement.getGoodsName());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -21,9 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -698,6 +696,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 .eq("warehouse_type","1")
                 .eq("person_charge", personCharge)
                 .eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)){
+            for (WarehouseBaseInfo warehouseBaseInfo:warehouseBaseInfoList) {
+                Map<String, Object> pageView = new HashMap<>();
+                pageView.put("warehouseName", warehouseBaseInfo.getWarehouseName());
+                pageView.put("compId", warehouseBaseInfo.getCompId());
+                // 查询质检信息包括已删除的
+                Integer dataCount = baseMapper.getCountByCondition(pageView);
+                warehouseBaseInfo.setCount(dataCount);
+            }
+        }
         return warehouseBaseInfoList;
     }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -396,7 +396,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             // 查询货物库存量
                             WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                                     .eq("position_id", warehouseInOutInfo.getPositionId())
-                                    .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey())
+                                    .eq("goods_name", warehouseInOutInfo.getGoodsName())
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {
@@ -410,7 +410,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 warehousePositionStorageInfo1.setId(IdGenerator.generateUUID());
                                 warehousePositionStorageInfo1.setPositionId(warehouseInOutInfo.getPositionId());
                                 warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
-                                warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                                 warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
                                 warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
@@ -545,7 +544,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             // 查询货物库存量
                             WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                                     .eq("position_id", warehouseInOutInfo.getPositionId())
-                                    .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey())
+                                    .eq("goods_name", warehouseInOutInfo.getGoodsName())
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -1,5 +1,13 @@
 <?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.yh.saas.plugin.yiliangyiyun.mapper.WarehouseBaseInfoMapper">
-
+    <!-- 质检信息数量包括已删除的 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(q.id)
+        FROM quality_inspection_management q
+        WHERE
+        q.comp_id = #{compId}
+        AND q.warehouse_name = #{warehouseName}
+    </select>
 </mapper>