Przeglądaj źródła

修改质检报告单号生成规则

hanqingsong 1 rok temu
rodzic
commit
3e7176eb23

+ 1 - 1
src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.java

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

+ 0 - 11
src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.xml

@@ -760,17 +760,6 @@
760
         zjbgdh
760
         zjbgdh
761
     FROM
761
     FROM
762
         business_qc_quality_inspection
762
         business_qc_quality_inspection
763
-    <where>
764
-      <if test="orgId != null and orgId != ''">
765
-        org_id = #{orgId}
766
-      </if>
767
-      <if test="basicStorehouseId != null and basicStorehouseId != ''">
768
-        and basic_storehouse_id = #{basicStorehouseId}
769
-      </if>
770
-      <if test="warehouseId != null and warehouseId != ''">
771
-        and warehouse_id = #{warehouseId}
772
-      </if>
773
-    </where>
774
     ORDER BY createdate DESC
763
     ORDER BY createdate DESC
775
     LIMIT 1
764
     LIMIT 1
776
   </select>
765
   </select>

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

@@ -81,11 +81,11 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
81
     // // 生成质检报告单(检验类别+检验日期(yyyyMMdd)+4位顺序号组成)
81
     // // 生成质检报告单(检验类别+检验日期(yyyyMMdd)+4位顺序号组成)
82
     private synchronized String GetZjbgdh(BusinessQcQualityInspection saveParam) {
82
     private synchronized String GetZjbgdh(BusinessQcQualityInspection saveParam) {
83
         // 查询最后一个顺序号
83
         // 查询最后一个顺序号
84
-        Map<String, Object> map = new HashMap<>();
85
-        map.put("orgId", saveParam.getOrgId());
86
-        map.put("basicStorehouseId", saveParam.getBasicStorehouseId());
87
-        map.put("warehouseId", saveParam.getWarehouseId());
88
-        String xh = qualityInspectionMapper.selectOnly(map);
84
+//        Map<String, Object> map = new HashMap<>();
85
+//        map.put("orgId", saveParam.getOrgId());
86
+//        map.put("basicStorehouseId", saveParam.getBasicStorehouseId());
87
+//        map.put("warehouseId", saveParam.getWarehouseId());
88
+        String xh = qualityInspectionMapper.selectOnly();
89
         // 初始化
89
         // 初始化
90
         int num = 1;
90
         int num = 1;
91
         if (!StringUtils.isEmpty(xh)) {
91
         if (!StringUtils.isEmpty(xh)) {