Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-qualitycheck-qinghai into dev

src/main/java/com/chinaitop/depot/qualityControl/service/impl/QualityInspectionServiceImpl.java

@@ -52,28 +52,8 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int save(BusinessQcQualityInspection saveParam) {
-        // 查询最后一个顺序号
-        Map<String, Object> map = new HashMap<>();
-        map.put("orgId", saveParam.getOrgId());
-        map.put("basicStorehouseId", saveParam.getBasicStorehouseId());
-        map.put("warehouseId", saveParam.getWarehouseId());
-        String xh = qualityInspectionMapper.selectOnly(map);
-        // 初始化
-        int num = 1;
-        if (!StringUtils.isEmpty(xh)) {
-            String substring = xh.substring(xh.length() - 4);
-            int i = Integer.parseInt(substring);
-            if (i < 9999)
-                num += i;
-        }
         // 生成质检报告单(检验类别+检验日期(yyyyMMdd)+4位顺序号组成)
-        saveParam.setZjbgdh(
-                String.format(
-                        "%s%s%s", saveParam.getJylb(),
-                        DateUtil.getYMD(saveParam.getJysj()),
-                        GenerateNumberUtil.integerToString(4, num)
-                )
-        );
+        saveParam.setZjbgdh(this.GetZjbgdh(saveParam));
         Date date = new Date();
         saveParam.setCreatedate(date);
         saveParam.setUpdatedate(date);
@@ -98,6 +78,29 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
         return insert;
     }
 
+    // // 生成质检报告单(检验类别+检验日期(yyyyMMdd)+4位顺序号组成)
+    private synchronized String GetZjbgdh(BusinessQcQualityInspection saveParam) {
+        // 查询最后一个顺序号
+        Map<String, Object> map = new HashMap<>();
+        map.put("orgId", saveParam.getOrgId());
+        map.put("basicStorehouseId", saveParam.getBasicStorehouseId());
+        map.put("warehouseId", saveParam.getWarehouseId());
+        String xh = qualityInspectionMapper.selectOnly(map);
+        // 初始化
+        int num = 1;
+        if (!StringUtils.isEmpty(xh)) {
+            String substring = xh.substring(xh.length() - 4);
+            int i = Integer.parseInt(substring);
+            if (i < 9999)
+                num += i;
+        }
+        return String.format(
+                "%s%s%s", saveParam.getJylb(),
+                DateUtil.getYMD(saveParam.getJysj()),
+                GenerateNumberUtil.integerToString(4, num)
+        );
+    }
+
     @Override
     public PageInfo<BusinessQcQualityInspection> getPageList(BusinessQcQualityInspectionPage pageParam) {
         PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());

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

@@ -320,8 +320,8 @@
 	a.ch,
 	a.hwh
 	FROM
-		crk_qh.data_kcgl_fcbgz_default a
-	LEFT JOIN crk_qh.data_kcgl_xckc_default b ON a.DataID = b.DataID
+		data_kcgl_fcbgz_default a
+	LEFT JOIN data_kcgl_xckc_default b ON a.DataID = b.DataID
 	LEFT JOIN depot_qh.business_delivery_storage_notice c ON b.tzdh = c.bill_number
 	LEFT JOIN depot_qh.business_plan d ON  c.plan_number = d.plan_number
 	<where>

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

@@ -370,7 +370,7 @@
         'OFF' nhlstatus,
         '1' remark
         from
-        crk_qh.data_kcgl_fcbgz_default fcbgz inner join basic_storehouse bs on fcbgz.ch = bs.storehouse_id
+        data_kcgl_fcbgz_default fcbgz inner join basic_storehouse bs on fcbgz.ch = bs.storehouse_id
         <if test="byId == 1">
           WHERE 1=1 AND NOT EXISTS(
               SELECT 1 FROM storage_storehouse_business ssb WHERE ssb.storehouse_id = fcbgz.ch AND ssb.warehouse_id = fcbgz.hwh