修改库存查询导出

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@@ -125,6 +125,7 @@ public class WmsInventoryRest {
     @ApiOperation(value = "导出")
     public void exportExcel(@RequestBody WmsInventoryQuery query) {
         //得到所有要导出的数据
+        query.setType("配件库");
         List<WmsInventoryVoExcelVo> exportVoList = wmsInventoryService.listExcel(query);
         //定义导出的excel名字
         String excelName = "库存列表";

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -131,10 +131,28 @@
     </select>
 
     <select id="listExcel" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVoExcelVo">
-        select a.*,
-        (@rank := @rank + 1) rankNo
-        from (SELECT @rank := 0) t,
+        SELECT
+        (@rank := @rank + 1) rankNo,
+        a.goodsID,
+        a.sid,
+        a.goodsSpuName,
+        a.goodsSkuCode,
+        a.goodsSkuOwnSpec,
+        a.unit,
+        a.supplierName,
+        a.manufacturerName,
+        a.warehouseName,
+        a.warehouseRackCode,
+        a.count,
+        a.cost,
+        a.taxRate tax,
+        DATE_FORMAT( a.firstInDate, '%Y-%m-%d' ) AS firstInDate,
+        DATEDIFF(NOW(), DATE_FORMAT( a.firstInDate, '%Y-%m-%d' )) dateAge
+        FROM
         wms_inventory a
+        LEFT JOIN anrui_portal.sys_organization as s ON a.useOrgSid = s.sid
+        LEFT JOIN wms_warehouse_info as i ON a.warehouseSid = i.sid,
+        (SELECT @rank := 0) t
         <where>
             ${ew.sqlSegment}
         </where>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -202,13 +202,12 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                 apply(StringUtils.isNotBlank(query.getFirstInEndDate()), "date_format (a.firstInDate,'%Y-%m-%d') <= date_format('" + query.getFirstInEndDate() + "','%Y-%m-%d')"
                 );
         if (StringUtils.isNotBlank(query.getDateAge())) {
-            qw.apply("DATEDIFF(NOW(), DATE_FORMAT( a.firstInDate, '%Y-%m-%d' )) <" + query.getDateAge());
+            qw.apply("DATEDIFF(NOW(), DATE_FORMAT( a.firstInDate, '%Y-%m-%d' )) >" + query.getDateAge());
         }
         if (StringUtils.isNotBlank(query.getType())) {
-            if (query.getType().equals("拆件库")) {
-                qw.eq("i.warehouseTypeValue", "拆件库");
-            }
+            qw.eq("i.warehouseTypeValue", query.getType());
         }
+        qw.notLike("a.goodsID","-O");
         List<WmsInventoryVoExcelVo> list = baseMapper.listExcel(qw);
         list.removeAll(Collections.singleton(null));
         return list;