廒间

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -154,7 +155,10 @@ public class WarehouseSealingRecordController {
         try {
             // 先查询到这条数据
             WarehouseSealingRecord WarehouseSealingRecord = WarehouseSealingRecordService.findByWarehouseSea(id);
+           Date date=new Date();
             WarehouseSealingRecord.setCzbz("d");
+            WarehouseSealingRecord.setUpdatedate(date);
+            WarehouseSealingRecord.setZhgxsj(date);
             WarehouseSealingRecordService.updateBasicStorehouse(WarehouseSealingRecord);
             modelMap.put("status", "success");
         } catch (Exception e) {

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

@@ -447,7 +447,10 @@
         LEFT JOIN depot_qh.basic_storehouse st ON st.storehouse_id = gsr.basic_storehouse_id
         LEFT JOIN depot_qh.basic_warehouse wa ON wa.warehouse_id = gsr.warehouse_id
         LEFT JOIN depot_qh.basic_enum pz ON pz.enumId = gsr.grain_variety_id
-
+        where 1=1
+    <if test="ajmc != null">
+      AND  o.org_name like CONCAT('%', #{orgName}, '%')
+    </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map" >
     update grain_situation_card

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

@@ -173,6 +173,8 @@
       cc.bmsh,
       cc.dwldsh,
       cc.bz,
+      cc.createdate,
+    cc.updatedate,
       cc.`status`
     from	warehouse_sealing_record cc
               LEFT JOIN basic_storehouse Bs ON cc.basic_storehouse_id = Bs.storehouse_id
@@ -289,15 +291,17 @@
     set
       fcqrdh= #{fcqrdh,jdbcType=VARCHAR},
       ywrq=#{ywrq,jdbcType=DECIMAL},
-      basicStorehouseId=#{basicStorehouseId,jdbcType=INTEGER},
-      basicUnitAisleId=#{basicUnitAisleId,jdbcType=INTEGER},
-      warehouseId=#{warehouseId,jdbcType=INTEGER},
+      basic_storehouse_id=#{basicStorehouseId,jdbcType=INTEGER},
+      basic_unit_aisle_id=#{basicUnitAisleId,jdbcType=INTEGER},
+      warehouse_id=#{warehouseId,jdbcType=INTEGER},
       bgy=#{bgy,jdbcType=VARCHAR},
-      lspzdm=#{lspzdm,jdbcType=VARCHAR},
-      lsxzdm= #{lsxzdm,jdbcType=VARCHAR},
+      grain_variety_id=#{grainVarietyId,jdbcType=VARCHAR},
+      grain_nature_id=#{grainNatureId,jdbcType=VARCHAR},
       lssl=#{lssl,jdbcType=DECIMAL},
-      lsdjdm=#{lsdjdm,jdbcType=VARCHAR},
-      lscd =#{lscd,jdbcType=VARCHAR},
+
+      grain_grade_id=#{grainGradeId,jdbcType=VARCHAR},
+      grain_area_id= #{grainAreaId,jdbcType=VARCHAR},
+
       shnd=#{shnd,jdbcType=INTEGER},
       sqr=#{sqr,jdbcType=DECIMAL},
       bmsh=#{bmsh,jdbcType=DECIMAL},

src/main/java/com/chinaitop/depot/storage/param/GrainSituationCardPageParam.java

@@ -48,4 +48,7 @@ public class GrainSituationCardPageParam {
     @ApiModelProperty(value = "关键词")
     private String searchKey;
 
+    @ApiModelProperty(value = "库区名称")
+    private String orgName;
+
 }

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

@@ -138,6 +138,7 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
             WarehouseSealingRecordMapper.insert(WarehouseSealingRecord);
         } else {
             WarehouseSealingRecord.setUpdatename(userName);
+           // WarehouseSealingRecord.setCreatedate(date);
             WarehouseSealingRecord.setUpdatedate(date);
             WarehouseSealingRecord.setZhgxsj(date);
             WarehouseSealingRecord.setCzbz("u");