Merge branch 'dev' of depot-qinghai/depot-qualitycheck-qinghai into master

src/main/java/com/chinaitop/depot/storage/controller/ClearanceConfirmationController.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.controller;
 
 
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.github.pagehelper.PageHelper;
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
 import com.chinaitop.depot.storage.service.ClearanceConfirmationService;
@@ -161,6 +162,44 @@ public class ClearanceConfirmationController {
     }
 
 
+    /**
+     * 查询当前库区库存实物为空仓的仓房
+     *
+     * @param orgId
+     * @return
+     */
+    @RequestMapping(value = "/findStorehouse",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
+        List<StorageStorehouseBusiness> storageStorehouseBusinessList = null;
+        try {
+
+            storageStorehouseBusinessList = clearanceConfirmationService.findStorehouse(orgId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return storageStorehouseBusinessList;
+    }
+
+    /**
+     * 查询当前库区库存实物为空仓的仓房
+     *
+     * @param storehouseId
+     * @return
+     */
+    @RequestMapping(value = "/findByWarehouse",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    public List<StorageStorehouseBusiness> findByWarehouse(Integer storehouseId) {
+        List<StorageStorehouseBusiness> storageStorehouseBusinessList = null;
+        try {
+
+            storageStorehouseBusinessList = clearanceConfirmationService.findByWarehouse(storehouseId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return storageStorehouseBusinessList;
+    }
+
     
 
 }

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.java

@@ -1,6 +1,9 @@
 package com.chinaitop.depot.storage.mapper;
 
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
+import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
@@ -28,5 +31,12 @@ public interface ClearanceConfirmationMapper {
 
     Map<String, BigDecimal> getexcessLossQuantity(Integer warehouseId);
 
-    Map<String, Object> getStoreHouse(Integer warehouseId);
+    Map<String, Object> getStoreHouse(@Param("warehouseId")Integer warehouseId);
+
+
+    List<StorageStorehouseBusiness> findStorehouseList(@Param("orgId") Integer orgId);
+
+    List<StorageStorehouseBusiness> findByWarehouseList(@Param("storehouseId")Integer storehouseId);
+
+    ClearanceConfirmation selectByCqqrd(String warehouseId);
 }

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.xml

@@ -231,4 +231,31 @@ cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id
     warehouse_id = #{warehouseId,jdbcType=INTEGER}
   where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="findStorehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+    SELECT DISTINCT
+      bs.storehouse_id storehouseId,
+      bs.storehouse_name storehouseName
+    FROM
+      depot_qh.basic_storehouse bs
+        LEFT JOIN data_kcgl_kcsw_default dkkd ON bs.storehouse_id = dkkd.ch
+        LEFT JOIN 	depot_qh.basic_warehouse bw on bw.storehouse_id =bs.storehouse_id
+
+    where bs.org_id=#{orgId} and dkkd.ch is null and bw.storehouse_id is not null
+  </select>
+  <select id="findByWarehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+
+    select DISTINCT bw.warehouse_id warehouseId,bw.warehouse_name warehouseName
+    from
+      depot_qh.basic_warehouse bw
+
+    where bw.storehouse_id=#{storehouseId}
+
+  </select>
+
+  <select id="selectByCqqrd" resultType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
+    select cqqrdh from warehouse_sealing_record
+    where warehouse_id=#{warehouseId}
+    order by id desc
+      limit 1
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/storage/mapper/WarehouseSealingRecordMapper.xml

@@ -219,10 +219,12 @@
       bw.warehouse_id warehouseId,
       bw.aisle_id ajid,
       bua.ajmc
-    from data_kcgl_kcsw_default kc
-           LEFT JOIN  basic_warehouse bw on kc.hwh = bw.warehouse_id and  bw.del_flag=1
-           LEFT JOIN basic_unit_aisle bua ON bw.aisle_id = bua.id
-    WHERE
+    from 	depot_qh.business_qc_quality_inspection bqqi
+              LEFT JOIN  depot_qh.basic_warehouse bw on bqqi.warehouse_id = bw.warehouse_id and  bw.del_flag=1
+              LEFT JOIN depot_qh.data_kcgl_kcsw_default kc on bqqi.warehouse_id= kc.hwh
+              LEFT JOIN depot_qh.basic_unit_aisle bua ON bw.aisle_id = bua.id
+
+    WHERE bqqi.jylb='01' and
      bw.storehouse_id=#{storehouseId}
   </select>
   <select id="findkcsw"  parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.vo.kcswVO">

src/main/java/com/chinaitop/depot/storage/service/ClearanceConfirmationService.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.storage.service;
 
 
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -35,4 +36,7 @@ public interface ClearanceConfirmationService {
     public void updateBasicStorehouse(ClearanceConfirmation ClearanceConfirmation);
 
 
+    List<StorageStorehouseBusiness> findStorehouse(Integer orgId);
+
+    List<StorageStorehouseBusiness> findByWarehouse(Integer storehouseId);
 }

src/main/java/com/chinaitop/depot/storage/service/impl/ClearanceConfirmationServiceImpl.java

@@ -3,7 +3,11 @@ package com.chinaitop.depot.storage.service.impl;
 import com.alibaba.fastjson.JSONObject;
 
 import com.chinaitop.depot.storage.mapper.ClearanceConfirmationMapper;
+import com.chinaitop.depot.storage.mapper.WarehouseSealingRecordMapper;
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
+import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
+import com.chinaitop.depot.storage.model.vo.WareHouseVO;
 import com.chinaitop.depot.storage.service.ClearanceConfirmationService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
@@ -12,6 +16,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -25,8 +31,8 @@ public class ClearanceConfirmationServiceImpl implements ClearanceConfirmationSe
     @Resource
     private ClearanceConfirmationMapper ClearanceConfirmationMapper;
 
-//    @Resource
-//    private BasicStorehouseService basicStorehouseService;
+    @Resource
+    private WarehouseSealingRecordMapper WarehouseSealingRecordMapper;
 
 
 
@@ -66,17 +72,80 @@ public class ClearanceConfirmationServiceImpl implements ClearanceConfirmationSe
             dwbm = org.get("creditCode") == null?"":org.get("creditCode").toString();
         }
 
+        LocalDate currentDate = LocalDate.now();
+        DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyyMMdd");
+        String formattedDate = currentDate.format(formatter1);
         Date date = new Date();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
         ClearanceConfirmation ClearanceConfirmation = (ClearanceConfirmation) mapper.readValue(clearanceConfirmationJson, ClearanceConfirmation.class);
         if (ClearanceConfirmation.getId() == null) {
+            //根据货位查询同一货位编码
+            WareHouseVO wareHouseVO= WarehouseSealingRecordMapper.selectTyhwbm(Integer.parseInt(ClearanceConfirmation.getWarehouseId()));
+
             modelMap1.put("cqqrdh",ClearanceConfirmation.getCqqrdh());
             List<ClearanceConfirmation> clearanceConfirmation = ClearanceConfirmationMapper.findByCleConList(modelMap1);
             if(clearanceConfirmation.size()>0){
                 modelMap.put("message", "出清确认单号已经存在");
                 return modelMap;
             }
+            ClearanceConfirmation clearanceConfirmation1=  ClearanceConfirmationMapper.selectByCqqrd(ClearanceConfirmation.getWarehouseId());
+            if(clearanceConfirmation1!=null){
+
+                String fcqrd =clearanceConfirmation1.getCqqrdh();
+
+                int startIndex =fcqrd.length() - 11; // 假设20240909开始的位置是从字符串末尾数第15个字符开始
+                // 要截取的结束位置
+                int endIndex = fcqrd.length() - 3; // 假设20240909结束的位置是从字符串末尾数第9个字符结束
+
+                // 使用substring方法进行截取
+                String extractedDate = fcqrd.substring(startIndex, endIndex);
+                // 当前时间
+
+                // 将字符串转换为日期对象
+                String specificDateStr = extractedDate;
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+                LocalDate specificDateObj = LocalDate.parse(specificDateStr, formatter);
+                LocalDate today = LocalDate.now();
+
+                if (formattedDate.equals(extractedDate)){
+                    // 使用正则表达式提取后三位数字
+                    Pattern pattern = Pattern.compile("(\\d{3})$");
+                    Matcher matcher = pattern.matcher(fcqrd);
+                    if (matcher.find()) {
+                        String lastThreeDigits = matcher.group(1);
+
+                        // 将后三位数字转换为整数并加1
+                        int incrementedValue = Integer.parseInt(lastThreeDigits) + 1;
+
+                        // 将加1后的整数转换回三位数字字符串，保持前导零
+                        String incrementedDigits = String.format("%03d", incrementedValue);
+
+                        // 将原字符串的后三位替换为加1后的三位数字
+                        fcqrd = fcqrd.replaceFirst(pattern.pattern(), incrementedDigits);
+                        ClearanceConfirmation.setCqqrdh(fcqrd);
+                    }
+                }else{
+                    StringBuffer sbf = new StringBuffer();
+                    sbf.append(wareHouseVO.getTyhwbm());
+                    sbf.append(specificDateObj);
+                    sbf.append("001");
+                    ClearanceConfirmation.setCqqrdh(sbf.toString().trim());
+                }
+
+            }else{
+                StringBuffer sbf = new StringBuffer();
+                sbf.append(wareHouseVO.getTyhwbm());
+                sbf.append(formattedDate);
+                sbf.append("001");
+                ClearanceConfirmation.setCqqrdh(sbf.toString().trim());
+            }
+
+
+
+
+
+
             ClearanceConfirmation.setCreatename(userName);
             ClearanceConfirmation.setCreatedate(date);
             ClearanceConfirmation.setUpdatename(userName);
@@ -100,4 +169,15 @@ public class ClearanceConfirmationServiceImpl implements ClearanceConfirmationSe
     public void updateBasicStorehouse(ClearanceConfirmation ClearanceConfirmation){
         ClearanceConfirmationMapper.updateByPrimaryKey(ClearanceConfirmation);
     }
+
+    @Override
+    public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
+        System.out.print(ClearanceConfirmationMapper.findStorehouseList(orgId));
+        return ClearanceConfirmationMapper.findStorehouseList(orgId);
+    }
+
+    @Override
+    public List<StorageStorehouseBusiness> findByWarehouse(Integer storehouseId) {
+        return ClearanceConfirmationMapper.findByWarehouseList(storehouseId);
+    }
 }

src/main/resources/bootstrap-dev.yml

@@ -39,6 +39,9 @@ spring:
 #  jackson:
 #    date-format: yyyy-MM-dd
 #    time-zone: GMT+8
+logging:
+  level:
+    org.hibernate.SQL: DEBUG
 web:
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
 cxf: