临时库编号

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

@@ -67,5 +67,12 @@ public interface WarehouseBaseInfoMapper extends BaseMapper<WarehouseBaseInfo> {
      * @return
      */
     List<WarehouseView> getAllWarehouseListByCondition(Map<String, Object> pageView);
+    /**
+     * 临时仓库数量包括已删除的
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getTemWareHouseCountByCondition(Map<String, Object> pageView);
 
 }

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

@@ -9,6 +9,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -140,4 +141,5 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
 
     String exportPhoneOut(WarehouseBaseInfo warehouseBaseInfo, HttpServletResponse response) throws Exception;
 
+    Integer getTemWareHouseCountByCondition(Map<String, Object> pageView);
 }

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

@@ -15,6 +15,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.ContractManagementInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseBaseInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
@@ -129,6 +130,28 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         if (NumberConstant.CONSTANT1.equals(contractManagementInfo.getGoodsType())&&NumberConstant.CONSTANT2.equals(contractManagementInfo.getContractType()) && NumberConstant.CONSTANT1.equals(contractManagementInfo.getDeliverType())) {
             WarehouseBaseInfo warehouseBaseInfo = new WarehouseBaseInfo();
             warehouseBaseInfo.setId(IdGenerator.generateUUID());
+            Map<String, Object> pageView = new HashMap<>();
+            pageView.put("compId", contractManagementInfo.getCompId());
+            // 查询本公司临时仓库包括已删除的
+            Integer dataCount = warehouseBaseInfoService.getTemWareHouseCountByCondition(pageView);
+            //插入仓库编号
+            Integer warehouseNum = dataCount + 1;
+            //一位数
+            if (warehouseNum < 10) {
+                warehouseBaseInfo.setCommonWarehouseNo("000" + warehouseNum);
+            }
+            //两位数
+            else if (warehouseNum < 100) {
+                warehouseBaseInfo.setCommonWarehouseNo("00" + warehouseNum);
+            }
+            //三位数
+            else if (warehouseNum < 1000) {
+                warehouseBaseInfo.setCommonWarehouseNo("0" + warehouseNum);
+            }
+            //四位数
+            else if (warehouseNum < 10000) {
+                warehouseBaseInfo.setCommonWarehouseNo(String.valueOf(warehouseNum));
+            }
             warehouseBaseInfo.setWarehouseName(contractManagementInfo.getContractNo());
 //            warehouseBaseInfo.setPersonChargeKey(contractManagementInfo.getPersonChargeKey());
             warehouseBaseInfo.setOtherPersonCharge(contractManagementInfo.getPersonCharge());

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

@@ -453,7 +453,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (warehouseNum < 10) {
             warehouseBaseInfo.setCommonWarehouseNo("00" + warehouseNum);
         }
-        //两位数
+        //两位数xibg
         else if (warehouseNum < 100) {
             warehouseBaseInfo.setCommonWarehouseNo("0" + warehouseNum);
         }
@@ -500,6 +500,28 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (StringUtils.isEmpty(warehouseBaseInfo.getId())) {
             warehouseBaseInfo.setId(IdGenerator.generateUUID());
         }
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("compId", warehouseBaseInfo.getCompId());
+        // 查询本公司临时仓库包括已删除的
+        Integer dataCount = baseMapper.getTemWareHouseCountByCondition(pageView);
+        //插入仓库编号
+        Integer warehouseNum = dataCount + 1;
+        //一位数
+        if (warehouseNum < 10) {
+            warehouseBaseInfo.setCommonWarehouseNo("000" + warehouseNum);
+        }
+        //两位数
+        else if (warehouseNum < 100) {
+            warehouseBaseInfo.setCommonWarehouseNo("00" + warehouseNum);
+        }
+        //三位数
+        else if (warehouseNum < 1000) {
+            warehouseBaseInfo.setCommonWarehouseNo("0" + warehouseNum);
+        }
+        //四位数
+        else if (warehouseNum < 10000) {
+            warehouseBaseInfo.setCommonWarehouseNo(String.valueOf(warehouseNum));
+        }
         warehouseBaseInfo.setWarehouseType("2");
         warehouseBaseInfo.setClearStatusFlag(StatusEnum.NOT_CLEARED.getFlag());
         warehouseBaseInfo.setClearStatus(StatusEnum.NOT_CLEARED.getName());
@@ -4891,6 +4913,11 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
     }
 
+    @Override
+    public Integer getTemWareHouseCountByCondition(Map<String, Object> pageView) {
+        return baseMapper.getTemWareHouseCountByCondition(pageView);
+    }
+
 
     private String addDateOneDay(Date date) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -5056,4 +5083,5 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         }
 
     }
+
 }

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

@@ -11,7 +11,7 @@
         AND q.warehouse_name = #{warehouseName}
         AND TO_DAYS(q.create_date) = TO_DAYS(NOW())
     </select>
-    <!-- 仓库数量包括已删除的 -->
+    <!-- 常用仓库数量包括已删除的 -->
     <select id="getWareHouseCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
             COUNT(w.id)
@@ -20,6 +20,15 @@
           w.comp_id = #{compId}
           and w.warehouse_type="1"
     </select>
+    <!-- 临时仓库数量包括已删除的 -->
+    <select id="getTemWareHouseCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+            COUNT(w.id)
+        FROM warehouse_base_info w
+        WHERE
+            w.comp_id = #{compId}
+          and w.warehouse_type="2"
+    </select>
     <!-- 获得入库导出列表 -->
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.view.ExportVView">