粮情卡

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

@@ -3,12 +3,16 @@ package com.chinaitop.depot.storage.mapper;
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 @Repository
 public interface ClearanceConfirmationMapper {
 
+    ClearanceConfirmation selectCqqrd(Integer warehouseId);
+
     List<ClearanceConfirmation> getCleConList(Map<String, Object> map);
 
     ClearanceConfirmation   findByCleCon(Integer id);
@@ -20,4 +24,7 @@ public interface ClearanceConfirmationMapper {
     List<ClearanceConfirmation> findByCleConList(Map<String, Object> modelMap1);
 
 
+    Map selectFcbgz(Map map);
+
+    Map<String, BigDecimal> getexcessLossQuantity(Integer warehouseId);
 }

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

@@ -136,6 +136,25 @@ cc.updatename updatename,cc.updatedate updatedate
     where cc.cqqrdh=#{cqqrdh,jdbcType=VARCHAR}
       AND (cc.czbz = 'i' OR cc.czbz = 'u')
   </select>
+  <select id="selectFcbgz" resultType="map">
+    select SUM(zcsl) as cksl from data_kcgl_fcbgz_default
+        where rq BETWEEN #{cqsj} AND #{fcsj}
+    and hwh=#{warehouseId}
+  </select>
+  <select id="getexcessLossQuantity" resultType="map">
+    select actual_loss_quantity as getexcessLossQuantity from business_gslr_loss_collect
+    where  warehouse_id=#{warehouseId}
+    order by id desc
+      limit 1
+  </select>
+
+  <select id="selectCqqrd" resultType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
+    select updatedate from
+      clearance_confirmation where
+      warehouse_id=#{warehouseId}
+    order by id desc
+      limit 1
+  </select>
 
 
   <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">

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

@@ -160,7 +160,7 @@
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.storage.model.GrainSituationCard" >
     insert into grain_situation_card (id, createname, createdate, 
-      updatename, updatedate, warehouse_sealing_record_id, 
+      updatename, updatedate, warehouse_sealing_record_id,excess_loss_quantity
       fill_org_id, keep_org_id, basic_storehouse_id, 
       basic_unit_aisle_id, warehouse_id, storehouse_type, 
       design_capacity, grain_variety_id, grain_nature_id, 
@@ -175,7 +175,8 @@
       packaged_count, average_weight, check_record_ids
       )
     values (#{id,jdbcType=INTEGER}, #{createname,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, 
-      #{updatename,jdbcType=VARCHAR}, #{updatedate,jdbcType=TIMESTAMP}, #{warehouseSealingRecordId,jdbcType=INTEGER}, 
+      #{updatename,jdbcType=VARCHAR}, #{updatedate,jdbcType=TIMESTAMP}, #{warehouseSealingRecordId,jdbcType=INTEGER},
+            #{excessLossQuantity,jdbcType=DECIMAL},
       #{fillOrgId,jdbcType=INTEGER}, #{keepOrgId,jdbcType=INTEGER}, #{basicStorehouseId,jdbcType=INTEGER}, 
       #{basicUnitAisleId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{storehouseType,jdbcType=INTEGER}, 
       #{designCapacity,jdbcType=DECIMAL}, #{grainVarietyId,jdbcType=INTEGER}, #{grainNatureId,jdbcType=INTEGER}, 
@@ -445,6 +446,7 @@
   </select>
   <select id="selectCardList" resultType="com.chinaitop.depot.storage.model.GrainSituationCard" resultMap="BaseResultMap1">
     SELECT
+    gsr.id,
       o.org_name orgName,
       st.storehouse_name storehouseName,
       wa.warehouse_name warehouseName,
@@ -522,6 +524,9 @@
       <if test="record.updatedate != null" >
         updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.excessLossQuantity != null" >
+        excess_loss_quantity = #{record.excessLossQuantity,jdbcType=DECIMAL},
+      </if>
       <if test="record.warehouseSealingRecordId != null" >
         warehouse_sealing_record_id = #{record.warehouseSealingRecordId,jdbcType=INTEGER},
       </if>
@@ -673,6 +678,9 @@
       silo_grain_height = #{record.siloGrainHeight,jdbcType=DECIMAL},
       packaged_count = #{record.packagedCount,jdbcType=INTEGER},
       average_weight = #{record.averageWeight,jdbcType=DECIMAL},
+
+      excess_loss_quantity = #{record.excessLossQuantity,jdbcType=DECIMAL},
+
       check_record_ids = #{record.checkRecordIds,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />

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

@@ -30,22 +30,6 @@ public class WarehouseSealingRecord {
     @ApiModelProperty(value = "粮食产地；basic_enum的id；粮食产地名称")
     private String producerName;
 
-    public String getGrainVarietyName() {
-        return grainVarietyName;
-    }
-
-    public void setGrainVarietyName(String grainVarietyName) {
-        this.grainVarietyName = grainVarietyName;
-    }
-
-    public String getGrainNatureName() {
-        return grainNatureName;
-    }
-
-    public void setGrainNatureName(String grainNatureName) {
-        this.grainNatureName = grainNatureName;
-    }
-
     private Integer id;
     private String czbz;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -101,230 +85,4 @@ public class WarehouseSealingRecord {
     @ApiModelProperty(value = "库区ID")
     private Integer orgId;
 
-    public Integer getBasicStorehouseId() {
-        return basicStorehouseId;
-    }
-
-    public void setBasicStorehouseId(Integer basicStorehouseId) {
-        this.basicStorehouseId = basicStorehouseId;
-    }
-
-    public Integer getBasicUnitAisleId() {
-        return basicUnitAisleId;
-    }
-
-    public void setBasicUnitAisleId(Integer basicUnitAisleId) {
-        this.basicUnitAisleId = basicUnitAisleId;
-    }
-
-    public Integer getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(Integer warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getCzbz() {
-        return czbz;
-    }
-
-    public void setCzbz(String czbz) {
-        this.czbz = czbz;
-    }
-
-    public Date getZhgxsj() {
-        return zhgxsj;
-    }
-
-    public void setZhgxsj(Date zhgxsj) {
-        this.zhgxsj = zhgxsj;
-    }
-
-    public String getCreatename() {
-        return createname;
-    }
-
-    public void setCreatename(String createname) {
-        this.createname = createname;
-    }
-
-    public Date getCreatedate() {
-        return createdate;
-    }
-
-    public Integer getGrainVarietyId() {
-        return grainVarietyId;
-    }
-
-    public void setGrainVarietyId(Integer grainVarietyId) {
-        this.grainVarietyId = grainVarietyId;
-    }
-
-    public Integer getGrainNatureId() {
-        return grainNatureId;
-    }
-
-    public void setGrainNatureId(Integer grainNatureId) {
-        this.grainNatureId = grainNatureId;
-    }
-
-    public Integer getGrainGradeId() {
-        return grainGradeId;
-    }
-
-    public void setGrainGradeId(Integer grainGradeId) {
-        this.grainGradeId = grainGradeId;
-    }
-
-    public Integer getGrainAreaId() {
-        return grainAreaId;
-    }
-
-    public void setGrainAreaId(Integer grainAreaId) {
-        this.grainAreaId = grainAreaId;
-    }
-
-    public void setCreatedate(Date createdate) {
-        this.createdate = createdate;
-    }
-
-    public String getUpdatename() {
-        return updatename;
-    }
-
-    public void setUpdatename(String updatename) {
-        this.updatename = updatename;
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
-    public String getFcqrdh() {
-        return fcqrdh;
-    }
-
-    public void setFcqrdh(String fcqrdh) {
-        this.fcqrdh = fcqrdh;
-    }
-
-    public Date getYwrq() {
-        return ywrq;
-    }
-
-    public void setYwrq(Date ywrq) {
-        this.ywrq = ywrq;
-    }
-
-    public String getBgy() {
-        return bgy;
-    }
-
-    public void setBgy(String bgy) {
-        this.bgy = bgy;
-    }
-
-
-    public BigDecimal getLssl() {
-        return lssl;
-    }
-
-    public void setLssl(BigDecimal lssl) {
-        this.lssl = lssl;
-    }
-
-
-    public Year getShnd() {
-        return shnd;
-    }
-
-    public void setShnd(Year shnd) {
-        this.shnd = shnd;
-    }
-
-    public String getSqr() {
-        return sqr;
-    }
-
-    public void setSqr(String sqr) {
-        this.sqr = sqr;
-    }
-
-    public String getBmsh() {
-        return bmsh;
-    }
-
-    public void setBmsh(String bmsh) {
-        this.bmsh = bmsh;
-    }
-
-    public String getDwldsh() {
-        return dwldsh;
-    }
-
-    public void setDwldsh(String dwldsh) {
-        this.dwldsh = dwldsh;
-    }
-
-    public String getBz() {
-        return bz;
-    }
-
-    public void setBz(String bz) {
-        this.bz = bz;
-    }
-
-    public Date getRcsj() {
-        return rcsj;
-    }
-
-    public void setRcsj(Date rcsj) {
-        this.rcsj = rcsj;
-    }
-
-    public String getGlfs() {
-        return glfs;
-    }
-
-    public void setGlfs(String glfs) {
-        this.glfs = glfs;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getStorehouseName() {
-        return storehouseName;
-    }
-
-    public void setStorehouseName(String storehouseName) {
-        this.storehouseName = storehouseName;
-    }
-
-    public String getAjmc() {
-        return ajmc;
-    }
-
-    public void setAjmc(String ajmc) {
-        this.ajmc = ajmc;
-    }
 }

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

@@ -1,8 +1,10 @@
 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.GrainSituationCardMapper;
 import com.chinaitop.depot.storage.mapper.WarehouseSealingRecordMapper;
+import com.chinaitop.depot.storage.model.ClearanceConfirmation;
 import com.chinaitop.depot.storage.model.GrainSituationCard;
 import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -34,8 +37,8 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
     @Resource
     private GrainSituationCardMapper grainSituationCardMapper;
 
-//    @Resource
-//    private BasicStorehouseService basicStorehouseService;
+    @Resource
+    private ClearanceConfirmationMapper clearanceConfirmationMapper;
 
 
 
@@ -81,11 +84,11 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
             if(wareHouseVO!=null){
                 WarehouseSealingRecord warehouseSealingRecord=  WarehouseSealingRecordMapper.selectFcqrd(WarehouseSealingRecord.getWarehouseId());
                 if(warehouseSealingRecord!=null){
-                    if(warehouseSealingRecord.getStatus()==1){
-                        modelMap.put("message", "该货位已经生成粮情卡");
-                        return modelMap;
-
-                    }
+//                    if(warehouseSealingRecord.getStatus()==1){
+//                        modelMap.put("message", "该货位已经生成粮情卡");
+//                        return modelMap;
+//
+//                    }
                     String fcqrd =warehouseSealingRecord.getFcqrdh();
                     int startIndex =fcqrd.length() - 11; // 假设20240909开始的位置是从字符串末尾数第15个字符开始
                     // 要截取的结束位置
@@ -150,7 +153,25 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
             WarehouseSealingRecord.setCzbz("u");
             WarehouseSealingRecordMapper.updateByPrimaryKey(WarehouseSealingRecord);
         }
+
         if(WarehouseSealingRecord.getStatus()==1){
+            //查询出清确认单时间
+            int sum =0;
+            Date cqsj;
+            BigDecimal cksl;
+            ClearanceConfirmation clearanceConfirmation = clearanceConfirmationMapper.selectCqqrd(WarehouseSealingRecord.getWarehouseId());
+            if(clearanceConfirmation.getUpdatedate()==null){
+                cqsj= new Date();
+            }
+             cqsj =clearanceConfirmation.getUpdatedate();
+            //查询fcbgz
+            Map map =new HashMap<>();
+            map.put("warehouseId",WarehouseSealingRecord.getWarehouseId());
+            map.put("cqsj",cqsj);
+            map.put("fcsj",date);
+            Map<String, Double> map1=clearanceConfirmationMapper.selectFcbgz(map);
+             cksl =BigDecimal.valueOf(map1.get("cksl"));
+            Map<String,BigDecimal> mmap=clearanceConfirmationMapper.getexcessLossQuantity(WarehouseSealingRecord.getWarehouseId());
             GrainSituationCard grainSituationCard =new GrainSituationCard();
             grainSituationCard.setCreatedate(date);
             grainSituationCard.setUpdatedate(date);
@@ -167,9 +188,10 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
             grainSituationCard.setLssl(WarehouseSealingRecord.getLssl());
             grainSituationCard.setShnd(WarehouseSealingRecord.getShnd());
             grainSituationCard.setRcsj(WarehouseSealingRecord.getRcsj());
-            grainSituationCard.setOutQuantity(WarehouseSealingRecord.getLssl());
+            grainSituationCard.setOutQuantity(cksl);
             grainSituationCard.setFormWarehouseTime(WarehouseSealingRecord.getZhgxsj());
             grainSituationCard.setStorageOrgId(WarehouseSealingRecord.getOrgId());
+            grainSituationCard.setExcessLossQuantity(mmap.get("getexcessLossQuantity"));
             grainSituationCardMapper.insert(grainSituationCard);
         }
         modelMap.put("status", "success");