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

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

@@ -197,7 +197,7 @@
       FROM
         business_qc_quality_inspection_item itm
           LEFT JOIN depot_qh.basic_enum ee ON ee.enumId = itm.inspection_item_id
-      where itm.qc_quality_inspection_id =14
+      where itm.qc_quality_inspection_id =#{id}
 
 
 

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>
@@ -787,7 +776,8 @@
         qqi.grain_variety_id grainVarietyId,
         be.enumname grainVarietyName,
         qqi.grain_nature_id grainNatureId,
-        be1.enumname grainNatureName
+        be1.enumname grainNatureName,
+        qqi.jylb
     FROM
         business_qc_quality_inspection qqi
     LEFT JOIN org_info oi ON qqi.org_id = oi.org_id

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)) {

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

@@ -60,7 +60,7 @@ public class ClearanceConfirmationController {
     })
     public PageInfo<ClearanceConfirmation> getCleConList(Integer pageNum, Integer pageSize,
                                                      String storeName,
-                                                     String ajmc, Integer orgId) {
+                                                     Integer warehouseId, Integer orgId) {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         if (pageNum != null && pageSize != null) {
             PageHelper.startPage(pageNum, pageSize);
@@ -71,8 +71,8 @@ public class ClearanceConfirmationController {
             if (null != storeName && !"".equals(storeName)) {
                 modelMap.put("storehouseName", storeName);
             }
-            if (null != ajmc && !"".equals(ajmc)) {
-                modelMap.put("ajmc", ajmc);
+            if (null != warehouseId && !"".equals(warehouseId)) {
+                modelMap.put("warehouseId", warehouseId);
             }
             /* 只能查询当前单位的数据  */
             if (null != orgId) {

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

@@ -21,8 +21,11 @@
     <result column="updatename" jdbcType="VARCHAR" property="updatename" />
     <result column="createdate" jdbcType="TIMESTAMP" property="createdate" />
     <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    
 
     <result column="storehouse_name" jdbcType="VARCHAR" property="storehouseName" />
+    <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" /> 
     <result column="tyajbm" jdbcType="VARCHAR" property="tyajbm" />
     <result column="ajmc" jdbcType="VARCHAR" property="ajmc" />
   </resultMap>
@@ -89,7 +92,7 @@
   <sql id="Base_Column_List">
     cc.id id,cc.cqqrdh cqqrdh,cc.ywrq ywrq,cc.tyajbm tyajbm,cc.bgy bgy,cc.sfqs sfqs,cc.sfxd sfxd,cc.jcyxf jcyxf,cc.qtsx qtsx,cc.sqr,cc.bmsh bmsh,cc.dwldsh dwldsh,
 cc.bz bz,cc.czbz czbz,cc.zhgxsj zhgxsj,cc.createname createname,cc.createdate createdate,
-cc.updatename updatename,cc.updatedate updatedate
+cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id 
   </sql>
 
 
@@ -111,12 +114,15 @@ cc.updatename updatename,cc.updatedate updatedate
     <if test="orgId != null">
       AND AB.org_id = #{orgId,jdbcType=INTEGER}
     </if>
+    <if test="warehouseId != null">
+      AND cc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+    </if>
     AND (cc.czbz = 'i' OR cc.czbz = 'u')
     order by cc.id desc
   </select>
 
   <select id="findByCleCon" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select
+    <!-- select
     <include refid="Base_Column_List" />
     ,AB.storehouse_name  storehouseName, AB.ajmc ajmc
     from clearance_confirmation cc
@@ -125,6 +131,14 @@ cc.updatename updatename,cc.updatedate updatedate
     FROM basic_unit_aisle Bu
     LEFT JOIN basic_storehouse Bs ON Bu.basic_storehouse_id = Bs.storehouse_id
     ) AB ON cc.tyajbm = AB.tyajbm
+    where cc.id = #{id,jdbcType=INTEGER} -->
+    
+    select
+    <include refid="Base_Column_List" />
+    ,Bs.storehouse_name ,w.warehouse_name 
+    from clearance_confirmation cc
+    INNER JOIN basic_warehouse w ON w.warehouse_id = cc.warehouse_id
+    INNER JOIN basic_storehouse Bs ON w.storehouse_id = Bs.storehouse_id
     where cc.id = #{id,jdbcType=INTEGER}
   </select>
 
@@ -159,6 +173,7 @@ cc.updatename updatename,cc.updatedate updatedate
         END AS temperatureMeasureType,
       Bs.design_capacity designCapacity,
       Bs.draftType,
+      Bs.storehouse_type storehouseType,
       Bs.keeping_way keepingWay
     FROM
       basic_storehouse Bs
@@ -178,7 +193,7 @@ cc.updatename updatename,cc.updatedate updatedate
   <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
     insert into clearance_confirmation (id,cqqrdh,ywrq,tyajbm,bgy,sfqs,sfxd,jcyxf,qtsx,sqr,bmsh,dwldsh,
                                   bz,czbz,zhgxsj,createname,createdate,
-                                  updatename,updatedate)
+                                  updatename,updatedate,warehouse_id)
     values (
              #{id,jdbcType=INTEGER},
             #{cqqrdh,jdbcType=VARCHAR},
@@ -198,7 +213,8 @@ cc.updatename updatename,cc.updatedate updatedate
             #{createname,jdbcType=VARCHAR},
             #{createdate,jdbcType=TIMESTAMP},
             #{updatename,jdbcType=VARCHAR},
-            #{updatedate,jdbcType=TIMESTAMP})
+            #{updatedate,jdbcType=TIMESTAMP},
+            #{warehouseId,jdbcType=INTEGER})
   </insert>
 
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
@@ -221,7 +237,8 @@ cc.updatename updatename,cc.updatedate updatedate
     createname=#{createname,jdbcType=VARCHAR},
     createdate=#{createdate,jdbcType=TIMESTAMP},
     updatename=#{updatename,jdbcType=VARCHAR},
-    updatedate=#{updatedate,jdbcType=TIMESTAMP}
+    updatedate=#{updatedate,jdbcType=TIMESTAMP},
+    warehouse_id = #{warehouseId,jdbcType=INTEGER}
   where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -359,8 +359,8 @@
 	  plan.execute_type,
 	  jkqyq.is_Upload
 	  FROM depot_qh.storage_overhead_set overhead 
-	  LEFT JOIN crk_qh.data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
-	  LEFT JOIN crk_qh.data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
+	  LEFT JOIN data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
+	  LEFT JOIN data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
 	  LEFT JOIN depot_qh.business_delivery_storage_notice notice ON xckc.tzdh = notice.bill_number
 	  LEFT JOIN depot_qh.business_plan plan ON notice.plan_number = plan.plan_number
 	  LEFT JOIN depot_qh.storage_kcgl_jkqyq_apply_default jkqyq ON fcbgz.ch = jkqyq.ch  

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

@@ -151,7 +151,7 @@
       o.org_id,
       cc.fcqrdh,
       cc.id,
-      Bs.storehouse_name ,
+      Bs.storehouse_name,
       cc.basic_storehouse_id,
       bua.ajmc,
       cc.basic_unit_aisle_id,
@@ -200,26 +200,28 @@
       AND (cc.czbz = 'i' OR cc.czbz = 'u')
   </select>
     <select id="findStorehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
-      SELECT
+      SELECT DISTINCT
         bs.storehouse_id storehouseId,
         bs.storehouse_name storehouseName
       FROM
         business_qc_quality_inspection bqqi
           LEFT JOIN basic_storehouse bs ON bs.storehouse_id = bqqi.basic_storehouse_id
       WHERE
+        bs.del_flag=1 and
       bqqi.org_id=#{orgId} and bqqi.jylb='01'
       ORDER BY bqqi.id desc
 
     </select>
   <select id="findWareHouse" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.vo.WareHouseVO">
     SELECT
+      DISTINCT
       bw.warehouse_name warehouseName,
       bw.warehouse_id warehouseId,
       bw.aisle_id ajid,
       bua.ajmc
-    FROM
-      basic_warehouse bw
-        LEFT JOIN basic_unit_aisle bua ON bw.aisle_id = bua.id
+    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
      bw.storehouse_id=#{storehouseId}
   </select>
@@ -227,9 +229,9 @@
     select
       kc.UnitID orgId,
       bw.dutystoreman   bgy,
-      kc.mxpz	grainVarietyId,
+      kc.pz	grainVarietyId,
       kc.hwxz	grainNatureId,
-      kc.kcsl lssl,
+      ROUND(kc.kcsl / 1000, 3) lssl,
       kc.dj	grainGradeId,
       kc.gb	producerId,
       kc.cjsj	rcrq,
@@ -240,8 +242,8 @@
       dj.enumname as "grainGradeName",
       shnd.enumname as shnd
     from data_kcgl_kcsw_default kc
-           LEFT JOIN  basic_warehouse bw on kc.hwh = bw.warehouse_id
-           LEFT JOIN depot_qh.basic_enum pz on pz.enumId = kc.mxpz
+           LEFT JOIN  basic_warehouse bw on kc.hwh = bw.warehouse_id and  bw.del_flag=1
+           LEFT JOIN depot_qh.basic_enum pz on pz.enumId = kc.pz
            LEFT JOIN depot_qh.basic_enum xz on xz.enumId = kc.hwxz
            LEFT JOIN depot_qh.basic_enum dj on dj.enumId = kc.dj
            LEFT JOIN depot_qh.basic_enum cd on cd.enumId = kc.gb
@@ -265,7 +267,7 @@
   <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.storage.model.WarehouseSealingRecord">
     insert into warehouse_sealing_record (id,fcqrdh,ywrq,basic_storehouse_id,basic_unit_aisle_id,warehouse_id,bgy,grain_variety_id,grain_nature_id,lssl,grain_grade_id,grain_area_id,shnd,
                                         sqr,bmsh, dwldsh,bz,czbz,zhgxsj,createname,createdate,
-                                       updatename,updatedate,glfs,status)
+                                       updatename,updatedate,glfs,status,rcsj)
     values (
              #{id,jdbcType=INTEGER},
             #{fcqrdh,jdbcType=VARCHAR},
@@ -289,7 +291,7 @@
             #{createname,jdbcType=VARCHAR},
             #{createdate,jdbcType=TIMESTAMP},
             #{updatename,jdbcType=VARCHAR},
-            #{updatedate,jdbcType=TIMESTAMP},#{glfs,jdbcType=VARCHAR},#{status,jdbcType=VARCHAR})
+            #{updatedate,jdbcType=TIMESTAMP},#{glfs,jdbcType=VARCHAR},#{status,jdbcType=VARCHAR},#{rcsj,jdbcType=TIMESTAMP})
   </insert>
 
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.WarehouseSealingRecord">
@@ -320,7 +322,8 @@
       updatename=#{updatename,jdbcType=VARCHAR},
       updatedate=#{updatedate,jdbcType=TIMESTAMP},
       glfs= #{glfs,jdbcType=VARCHAR},
-      status=#{status,jdbcType=VARCHAR}
+      status=#{status,jdbcType=VARCHAR},
+      rcsj=#{rcsj,jdbcType=TIMESTAMP}
   where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/storage/model/ClearanceConfirmation.java

@@ -20,6 +20,8 @@ public class ClearanceConfirmation {
     private Date updatedate;
 
     private String cqqrdh; //出清单确认单号
+    
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date ywrq;      //业务日期，格式：yyyy-MM-dd
     private String tyajbm; //统一廒间编码
     private String bgy;    //保管员
@@ -31,9 +33,28 @@ public class ClearanceConfirmation {
     private String bmsh;  //部门审核
     private String dwldsh;  //单位领导审核
     private String bz;      //备注
+    private String warehouseId;//货位id
+    private String warehouseName;//货位名称
+    
 
 
-    private String storehouseName;
+    public String getWarehouseName() {
+		return warehouseName;
+	}
+
+	public void setWarehouseName(String warehouseName) {
+		this.warehouseName = warehouseName;
+	}
+
+	public String getWarehouseId() {
+		return warehouseId;
+	}
+
+	public void setWarehouseId(String warehouseId) {
+		this.warehouseId = warehouseId;
+	}
+
+	private String storehouseName;
     private String ajmc; //廒间名称
 
     public String getStorehouseName() {

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

@@ -133,7 +133,7 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
         List<BusinessQcQualityInspection> list =businessQcQualityInspectionMapper.getQualityInspectionFindByWarehouseId(map);
         for (BusinessQcQualityInspection b:list) {
             //查询质检明细
-            List<Map<String,Object>> itm =businessQcQualityInspectionItemMapper.findByqualityId(businessQcQualityInspection.getId()+"");
+            List<Map<String,Object>> itm =businessQcQualityInspectionItemMapper.findByqualityId(b.getId()+"");
             Map<Integer, List<String>> transformedData =    cat(itm);
 
             b.setMaps(transformedData);

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

@@ -84,13 +84,14 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
             WareHouseVO wareHouseVO= WarehouseSealingRecordMapper.selectTyhwbm(WarehouseSealingRecord.getWarehouseId());
             if(wareHouseVO!=null){
                 WarehouseSealingRecord warehouseSealingRecord=  WarehouseSealingRecordMapper.selectFcqrd(WarehouseSealingRecord.getWarehouseId());
-                if(warehouseSealingRecord!=null){
+               if(warehouseSealingRecord!=null){
 //                    if(warehouseSealingRecord.getStatus()==1){
 //                        modelMap.put("message", "该货位已经生成粮情卡");
 //                        return modelMap;
 //
 //                    }
                     String fcqrd =warehouseSealingRecord.getFcqrdh();
+
                     int startIndex =fcqrd.length() - 11; // 假设20240909开始的位置是从字符串末尾数第15个字符开始
                     // 要截取的结束位置
                     int endIndex = fcqrd.length() - 3; // 假设20240909结束的位置是从字符串末尾数第9个字符结束
@@ -99,11 +100,12 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
                     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})$");
@@ -217,6 +219,7 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
             Integer keepingWay =null;
             Integer draftType =null;
             Integer temperatureMeasureType=null;
+            Integer storehouseType=null;
 
                     if(stoMap != null && !stoMap.isEmpty()){
                         if(stoMap.get("designCapacity")!=null){
@@ -232,8 +235,11 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
                         if(stoMap.get("temperatureMeasureType")!=null){
                             temperatureMeasureType =(Integer)(stoMap.get("temperatureMeasureType"));
                         }
+                        if(stoMap.get("storehouseType")!=null){
+                            storehouseType =(Integer)(stoMap.get("storehouseType"));
+                        }
                     }
-
+            grainSituationCard.setStorehouseType(storehouseType);
             grainSituationCard.setKeepingWay(keepingWay);
             grainSituationCard.setDesignCapacity(designCapacity);
             grainSituationCard.setDrafttype(draftType);