zhangyuewww 3 роки тому
батько
коміт
47e7ffce96

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

@@ -21,5 +21,12 @@ public interface WarehouseBaseInfoMapper extends BaseMapper<WarehouseBaseInfo> {
      * @return
      */
     Integer getCountByCondition(Map<String, Object> pageView);
+    /**
+     * 仓库数量包括已删除的
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getWareHouseCountByCondition(Map<String, Object> pageView);
 
 }

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

@@ -281,6 +281,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     public String addWarehouse(WarehouseBaseInfo warehouseBaseInfo) {
         //新增主键id
         warehouseBaseInfo.setId(IdGenerator.generateUUID());
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("compId", warehouseBaseInfo.getCompId());
+        // 查询本公司仓库包括已删除的
+        Integer dataCount = baseMapper.getWareHouseCountByCondition(pageView);
+        //插入仓库编号
+        Integer warehouseNum=dataCount+1;
+        //一位数
+        if (warehouseNum<10){
+            warehouseBaseInfo.setCommonWarehouseNo("00"+warehouseNum);
+        }
+        //两位数
+        else if (warehouseNum<100){
+            warehouseBaseInfo.setCommonWarehouseNo("0"+warehouseNum);
+        }
+        //三位数
+        else if (warehouseNum<1000){
+            warehouseBaseInfo.setCommonWarehouseNo(String.valueOf(warehouseNum));
+        }
         List<WarehousePositionInfo> warehousePositionInfoList = warehouseBaseInfo.getWarehousePositionInfoList();
         if (!CollectionUtils.isEmpty(warehousePositionInfoList)) {
             for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfoList) {

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

@@ -10,4 +10,12 @@
         q.comp_id = #{compId}
         AND q.warehouse_name = #{warehouseName}
     </select>
+    <!-- 仓库数量包括已删除的 -->
+    <select id="getWareHouseCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+            COUNT(w.id)
+        FROM warehouse_base_info w
+        WHERE
+            w.comp_id = #{compId}
+    </select>
 </mapper>