1

src/main/java/com/chinaitop/depot/product/controller/StorageProductFcbgzController.java

@@ -53,11 +53,11 @@ public class StorageProductFcbgzController {
             @ApiImplicitParam(name = "wareId", value = "货位id", paramType = "query"),
             @ApiImplicitParam(name = "searchStartDate", value = "开始日期", paramType = "query"),
             @ApiImplicitParam(name = "searchEndDate", value = "结束日期", paramType = "query"),
-            @ApiImplicitParam(name = "orgId", value = "组织机构代码", paramType = "query")
-
+            @ApiImplicitParam(name = "orgId", value = "组织机构代码", paramType = "query"),
+            @ApiImplicitParam(name = "zylx", value = "作业类型(0:入库,1:出库)", paramType = "query")
     })
     public PageInfo<StorageProductFcbgz> getProductList(Integer pageNum, Integer pageSize, 
-    		String houseId, String wareId, String searchStartDate, String searchEndDate, Integer orgId){
+    		String houseId, String wareId, String searchStartDate, String searchEndDate, Integer orgId, String zylx){
         StorageProductFcbgzExample storageProductFcbgzExample = new StorageProductFcbgzExample();
         StorageProductFcbgzExample.Criteria criteria = storageProductFcbgzExample.createCriteria();
         if(ParameterUtil.isnotnull(houseId)){
@@ -65,10 +65,13 @@ public class StorageProductFcbgzController {
         }
         if(ParameterUtil.isnotnull(wareId)){
             criteria.andWarehouseIdEqualTo(wareId);
-         }
+        }
         if(ParameterUtil.isnotnull(orgId)){
             criteria.andOrgIdEqualTo(orgId);
         }
+        if(ParameterUtil.isnotnull(zylx)){
+            criteria.andZylxEqualTo(zylx);
+        }
 
         if(ParameterUtil.isnotnull(searchStartDate) && ParameterUtil.isnotnull(searchEndDate)){
             Date starDate = ParameterUtil.string2datetime(searchStartDate + " 00:00:00");
@@ -91,11 +94,10 @@ public class StorageProductFcbgzController {
     @RequestMapping(value = "/getNumberList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value="查询库存数量列表", notes = "查询库存数量信息列表，支持分页")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-            @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
-            @ApiImplicitParam(name = "wareId", value = "货位id", paramType = "query")
-
+        @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+        @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+        @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
+        @ApiImplicitParam(name = "wareId", value = "货位id", paramType = "query")
     })
     public PageInfo<StorageProductKcsl> getNumberList(Integer pageNum, Integer pageSize,
                                                       Integer houseId, Integer wareId, Integer orgId){

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

@@ -523,7 +523,7 @@
   </update>
   <select id="findAllLskcxxjk" resultMap="ResultMapWithBLOBs">
     select
-      id, warehouse_id, storehouse_id, tyhwbm hwdm, lspzdm, lsxzdm, lsdjdm, shnd, gb, cd, 
+      id, warehouse_id, storehouse_id, hwdm hwdm, lspzdm, lsxzdm, lsdjdm, shnd, gb, cd, 
       bgy, lqgstydwbm lqgsdwdm, glfs, scdd, clfs, hwzt, rcsj, fcrq, ccwcsj, qcsj, sjsl, jjsl, chwqsh, 
       bclbs, sjzlxg, ldtj, czbz, zhgxsj, bz
     from ods_up_lskcxxjk_final

src/main/java/com/chinaitop/depot/tasks/TempWetTask.java

@@ -36,7 +36,7 @@ public class TempWetTask {
     /**
      * 每日中午12点，定时任务全平台进行算法计算
      */
-//    @Scheduled(cron = "0 50 16 * * ?") // 测试
+//    @Scheduled(cron = "0 45 14 * * ?") // 测试
     @Scheduled(cron = "0 0 12 * * ?") // 每天中午12点触发任务
     public void tempWetWarning() {
         log.info("----每天中午12点触发任务----");