问题修改

src/main/java/com/tld/controller/QueryListController.java

@@ -120,9 +120,34 @@ public class QueryListController {
         return queryListService.getDelivery(delivery);
     }
 
+    /**
+     * 销售单导出
+     * @param delivery
+     * @param response
+     */
     @GetMapping("getDeliveryExcel")
     public void getDeliveryExcel(Delivery delivery, HttpServletResponse response){
         queryListService.getDeliveryExcel(delivery, response);
     }
+
+    /**
+     * 查询移库单
+     * @param warehouseTransfer 参数
+     * @return 返回结果
+     */
+    @GetMapping("getWarehouseTransfer")
+    public Map<String, Object> getWarehouseTransfer(WarehouseTransfer warehouseTransfer){
+        return queryListService.getWarehouseTransfer(warehouseTransfer);
+    }
+
+    /**
+     * 移库单导出
+     * @param warehouseTransfer
+     * @param response
+     */
+    @GetMapping("getWarehouseTransferExcel")
+    public void getWarehouseTransferExcel(WarehouseTransfer warehouseTransfer, HttpServletResponse response){
+        queryListService.getWarehouseTransferExcel(warehouseTransfer, response);
+    }
 }
 

src/main/java/com/tld/mapper/QueryListMapper.java

@@ -32,4 +32,8 @@ public interface QueryListMapper {
     List<Delivery> getDelivery(Delivery delivery);
 
     List<Map<String, Object>> getDeliveryExcel(Delivery delivery);
+
+    List<WarehouseTransfer> getWarehouseTransfer(WarehouseTransfer warehouseTransfer);
+
+    List<Map<String, Object>> getWarehouseTransferExcel(WarehouseTransfer warehouseTransfer);
 }

src/main/java/com/tld/model/WarehouseTransfer.java

@@ -26,6 +26,10 @@ public class WarehouseTransfer {
      * 要货仓库id
      */
     private String askGoodsWarehouseId;
+    /**
+     * 要货仓库名称
+     */
+    private String askGoodsWarehouseName;
     /**
      * 单据日期
      */
@@ -42,10 +46,22 @@ public class WarehouseTransfer {
      * 供货仓库id
      */
     private String supplyWarehouseId;
+    /**
+     * 供货仓库名称
+     */
+    private String supplyWarehouseName;
     /**
      * 物料id
      */
     private String materialId;
+    /**
+     * 物料名称
+     */
+    private String materialName;
+    /**
+     * 物料编号
+     */
+    private String materialCode;
     /**
      * wbs
      */
@@ -70,6 +86,14 @@ public class WarehouseTransfer {
      * 出货仓库
      */
     private String warehouseWhere;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
     /**
      * 分数
      */

src/main/java/com/tld/service/QueryListService.java

@@ -27,4 +27,8 @@ public interface QueryListService {
     Map<String, Object> getDelivery(Delivery delivery);
 
     void getDeliveryExcel(Delivery delivery, HttpServletResponse response);
+
+    Map<String, Object> getWarehouseTransfer(WarehouseTransfer warehouseTransfer);
+
+    void getWarehouseTransferExcel(WarehouseTransfer warehouseTransfer, HttpServletResponse response);
 }

src/main/java/com/tld/service/impl/QueryListServiceImpl.java

@@ -229,7 +229,7 @@ public class QueryListServiceImpl implements QueryListService {
             //导出数据汇总
             List<List<Object>> sheetDataList = new ArrayList<>();
             //表头数据
-            List<Object> head = Arrays.asList("生产领料单", "物料ID", "要货数量", "已出库数量", "物料名称", "物料编号", "要料单编号", "公司编号");
+            List<Object> head = Arrays.asList("销售单ID", "物料ID", "WBS", "交货数量", "取消数量", "出库数量", "公司编号", "单据日期", "物料名称", "物料编号");
             //查询数据
             List<Map<String, Object>> list = queryListMapper.getDeliveryExcel(delivery);
             sheetDataList.add(head);
@@ -243,7 +243,49 @@ public class QueryListServiceImpl implements QueryListService {
             //当前时间
             Date time = new Date();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMddHHmmss");
-            ExcelUtils.export(response, "非生产领用单数据导出" + sdf.format(time), sheetDataList);
+            ExcelUtils.export(response, "销售单数据导出" + sdf.format(time), sheetDataList);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public Map<String, Object> getWarehouseTransfer(WarehouseTransfer warehouseTransfer) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            PageHelper.startPage(warehouseTransfer.getPage(), warehouseTransfer.getLimit());
+            PageInfo<WarehouseTransfer> list = new PageInfo<>(queryListMapper.getWarehouseTransfer(warehouseTransfer));
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    @Override
+    public void getWarehouseTransferExcel(WarehouseTransfer warehouseTransfer, HttpServletResponse response) {
+        try {
+            //导出数据汇总
+            List<List<Object>> sheetDataList = new ArrayList<>();
+            //表头数据
+            List<Object> head = Arrays.asList("移库单ID", "移库单编号", "物料ID", "物料名称", "物料编号", "WBS", "移库数量", "已移库数量", "要货仓库ID", "出货仓库ID", "要货仓库名称", "出货仓库名称", "单据日期");
+            //查询数据
+            List<Map<String, Object>> list = queryListMapper.getWarehouseTransferExcel(warehouseTransfer);
+            sheetDataList.add(head);
+            for (Map<String, Object> userMap : list) {
+                List<Object> listSheet = new ArrayList<>();
+                for (String key : userMap.keySet()) {
+                    listSheet.add(userMap.get(key));
+                }
+                sheetDataList.add(listSheet);
+            }
+            //当前时间
+            Date time = new Date();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMddHHmmss");
+            ExcelUtils.export(response, "移库单数据导出" + sdf.format(time), sheetDataList);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/resources/mapper/QueryListMappeer.xml

@@ -254,18 +254,13 @@
         select
             a.id,
             a.delivery_id,
-            a.entry_number,
             a.material_id,
             a.wbs,
-            a.measurement_id,
             a.gs_delivery_num,
             a.gs_cancel_num,
-            a.out_num,
+            ifnull(a.out_num, 0) as out_num,
             b.company_number,
             b.bills_time,
-            b.delivery_type,
-            b.source_type,
-            b.move_type,
             c.name as materialName,
             c.code as materialCode
         from tld_delivery a
@@ -291,6 +286,119 @@
     </select>
     <!-- 导出销售单 -->
     <select id="getDeliveryExcel" resultType="java.util.LinkedHashMap">
-
+        select
+            a.delivery_id,
+            a.material_id,
+            a.wbs,
+            a.gs_delivery_num,
+            a.gs_cancel_num,
+            a.out_num,
+            b.company_number,
+            b.bills_time,
+            c.name as materialName,
+            c.code as materialCode
+        from tld_delivery a
+        join tld_delivery_f b on a.delivery_id = b.delivery_id
+        join tld_material c on a.material_id = c.tld_id
+        <trim prefix="WHERE" prefixOverrides="and |or">
+            <if test="deliveryId != null and deliveryId != ''">
+                and a.delivery_id = #{deliveryId}
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and c.code like CONCAT(CONCAT('%', #{materialCode}), '%')
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and c.name like CONCAT(CONCAT('%', #{materialName}), '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and a.bills_time <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and a.bills_time <![CDATA[<=]]> #{endTime}
+            </if>
+        </trim>
+    </select>
+    <!-- 查询移库单 -->
+    <select id="getWarehouseTransfer" resultType="com.tld.model.WarehouseTransfer">
+        select
+            a.id,
+            a.warehouse_transfer_id,
+            a.entry_number,
+            a.supply_warehouse_id,
+            a.material_id,
+            a.wbs,
+            a.num,
+            a.out_num,
+            a.type,
+            b.warehouse_transfer_code,
+            b.ask_goods_warehouse_id,
+            b.document_time,
+            b.warehouse_transfer_type,
+            c.name as materialName,
+            c.code as materialCode,
+            f.name as askGoodsWarehouseaName,
+            e.name as supplyWarehouseName
+        from tld_warehouse_transfer a
+        join tld_warehouse_transfer_f b on a.warehouse_transfer_id = b.warehouse_transfer_id
+        join tld_material c on a.material_id = c.tld_id
+        join tld_warehouse e on a.supply_warehouse_id = e.tld_id
+        join tld_warehouse f on a.ask_goods_warehouse_id = f.tld_id
+        <trim prefix="WHERE" prefixOverrides="and |or">
+            <if test="type != null and type != ''">
+                and a.type = #{type}
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and c.code like CONCAT(CONCAT('%', #{materialCode}), '%')
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and c.name like CONCAT(CONCAT('%', #{materialName}), '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and a.document_time <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and a.document_time <![CDATA[<=]]> #{endTime}
+            </if>
+        </trim>
+    </select>
+    <!-- 移库单导出 -->
+    <select id="getWarehouseTransferExcel" resultType="java.util.LinkedHashMap">
+        select
+            a.warehouse_transfer_id,
+            b.warehouse_transfer_code,
+            a.material_id,
+            c.name as materialName,
+            c.code as materialCode,
+            a.wbs,
+            a.num,
+            a.out_num,
+            b.ask_goods_warehouse_id,
+            a.supply_warehouse_id,
+            f.name as askGoodsWarehouseaName,
+            e.name as supplyWarehouseName,
+            b.document_time,
+            a.type
+        from tld_warehouse_transfer a
+        join tld_warehouse_transfer_f b on a.warehouse_transfer_id = b.warehouse_transfer_id
+        join tld_material c on a.material_id = c.tld_id
+        join tld_warehouse e on a.supply_warehouse_id = e.tld_id
+        join tld_warehouse f on a.ask_goods_warehouse_id = f.tld_id
+        <trim prefix="WHERE" prefixOverrides="and |or">
+            <if test="type != null and type != ''">
+                and a.type = #{type}
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and c.code like CONCAT(CONCAT('%', #{materialCode}), '%')
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and c.name like CONCAT(CONCAT('%', #{materialName}), '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and a.document_time <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and a.document_time <![CDATA[<=]]> #{endTime}
+            </if>
+        </trim>
     </select>
 </mapper>

src/main/resources/mapper/WarehouseTransferMapper.xml

@@ -11,17 +11,39 @@
             a.supply_warehouse_id,
             a.material_id,
             a.wbs,
-            a.measurement_id,
             a.num,
             a.out_num,
             a.type,
             b.warehouse_transfer_code,
             b.ask_goods_warehouse_id,
             b.document_time,
-            b.warehouse_transfer_type
+            b.warehouse_transfer_type,
+            c.name as materialName,
+            c.code as materialCode,
+            f.name as askGoodsWarehouseaName,
+            e.name as supplyWarehouseName
         from tld_warehouse_transfer a
         join tld_warehouse_transfer_f b on a.warehouse_transfer_id = b.warehouse_transfer_id
-        where type = #{type}
+        join tld_material c on a.material_id = c.tld_id
+        join tld_warehouse e on a.supply_warehouse_id = e.tld_id
+        join tld_warehouse f on a.ask_goods_warehouse_id = f.tld_id
+        <trim prefix="WHERE" prefixOverrides="and |or">
+            <if test="type != null and type != ''">
+                and a.type = #{type}
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and c.code like CONCAT(CONCAT('%', #{materialCode}), '%')
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and c.name like CONCAT(CONCAT('%', #{materialName}), '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and a.document_time <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and a.document_time <![CDATA[<=]]> #{endTime}
+            </if>
+        </trim>
     </select>
     <!-- 物料库位选择 -->
     <select id="getMaterialCk" resultType="com.tld.model.Inventory">