From 2850a38318fdbd236c096a43fb8c11351b4f6c43 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期一, 27 三月 2023 14:15:13 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 2 +- src/main/java/com/zy/asrs/controller/LocMastController.java | 2 +- src/main/resources/mapper/LocMastMapper.xml | 2 ++ src/main/webapp/static/js/locMast/locMast.js | 1 + src/main/webapp/static/js/stoMan/stoQue.js | 1 + src/main/java/com/zy/asrs/entity/LocMast.java | 7 +++++++ 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index 96adfe8..3f1bc78 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -72,7 +72,7 @@ EntityWrapper<LocMast> wrapper = new EntityWrapper<>(); convert(param, wrapper); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} - return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper)); + return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0))); } private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java index 23d8301..04c0b3d 100644 --- a/src/main/java/com/zy/asrs/entity/LocMast.java +++ b/src/main/java/com/zy/asrs/entity/LocMast.java @@ -176,6 +176,13 @@ @TableField("ctn_no") private String ctnNo; + @ApiModelProperty(value= "") + @TableField("qr_code_value") + private String qrCodeValue; + + @ApiModelProperty(value= "") + private String status; + public String getWhsType$(){ BasWhsService service = SpringUtils.getBean(BasWhsService.class); diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java index 99f034f..a816b9c 100644 --- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java +++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java @@ -30,7 +30,7 @@ @Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc") public List<String> getViewLocLevCount(@Param("row1") int row1); // - @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1") + @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} and status=0 order by bay1") public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1); // 搴撲綅Map diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml index 6e94452..c3e56da 100644 --- a/src/main/resources/mapper/LocMastMapper.xml +++ b/src/main/resources/mapper/LocMastMapper.xml @@ -35,6 +35,8 @@ <result column="barcode" property="barcode" /> <result column="Pdc_type" property="PdcType" /> <result column="ctn_no" property="ctnNo" /> + <result column="qr_code_value" property="qrCodeValue" /> + <result column="status" property="status" /> </resultMap> diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js index 98692a4..c31ecf8 100644 --- a/src/main/webapp/static/js/locMast/locMast.js +++ b/src/main/webapp/static/js/locMast/locMast.js @@ -28,6 +28,7 @@ // ,{field: 'locSts', align: 'center',title: ''} // ,{field: 'sheetNo', align: 'center',title: ''} ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'} + ,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true} ,{field: 'row1', align: 'center',title: '鎺�', sort:true} ,{field: 'bay1', align: 'center',title: '鍒�', sort:true} ,{field: 'lev1', align: 'center',title: '灞�', sort:true} diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js index a4630e5..ae9d342 100644 --- a/src/main/webapp/static/js/stoMan/stoQue.js +++ b/src/main/webapp/static/js/stoMan/stoQue.js @@ -30,6 +30,7 @@ ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'} // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'} ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'} + ,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true} ,{field: 'row1', align: 'center',title: '鎺�'} ,{field: 'bay1', align: 'center',title: '鍒�'} ,{field: 'lev1', align: 'center',title: '灞�'} -- Gitblit v1.9.1