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

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.java

@@ -33,7 +33,7 @@ public interface BusinessQcQualityInspectionMapper {
 
     int updateByPrimaryKey(BusinessQcQualityInspection record);
 
-    String selectOnly(Map<String, Object> map);
+    String selectOnly();
 
     List<BusinessQcQualityInspection> getPageList(BusinessQcQualityInspectionPage pageParam);
 

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.xml

@@ -760,17 +760,6 @@
         zjbgdh
     FROM
         business_qc_quality_inspection
-    <where>
-      <if test="orgId != null and orgId != ''">
-        org_id = #{orgId}
-      </if>
-      <if test="basicStorehouseId != null and basicStorehouseId != ''">
-        and basic_storehouse_id = #{basicStorehouseId}
-      </if>
-      <if test="warehouseId != null and warehouseId != ''">
-        and warehouse_id = #{warehouseId}
-      </if>
-    </where>
     ORDER BY createdate DESC
     LIMIT 1
   </select>

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

@@ -81,11 +81,11 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
     // // 生成质检报告单(检验类别+检验日期(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);
+//        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();
         // 初始化
         int num = 1;
         if (!StringUtils.isEmpty(xh)) {