问题修改

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

@@ -340,10 +340,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             //表头数据
             List<Object> head = Arrays.asList("物料名称", "供应商名称", "连番号", "类型", "出库用户", "领用部门", "库位名称", "出库日期", "出库数量");
             //查询数据
-            PageHelper.startPage(askGoods.getPage(), askGoods.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(askGoodsMapper.export(askGoods));
+            List<Map<String, Object>> list = askGoodsMapper.export(askGoods);
             sheetDataList.add(head);
-            for(Map<String, Object> userMap : list.getList()){
+            for(Map<String, Object> userMap : list){
                 List<Object> listSheet = new ArrayList<>();
                 for(String key: userMap.keySet()){
                     listSheet.add(userMap.get(key));
@@ -431,10 +430,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             //表头数据
             List<Object> head = Arrays.asList("物料名称", "出库数量", "用户名称", "出库时间", "要货单ID", "领用部门", "出库单编号", "WBS");
             //查询数据
-            PageHelper.startPage(askGoods.getPage(), askGoods.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(askGoodsMapper.getRemovalHalfProductExcel(askGoods));
+            List<Map<String, Object>> list = askGoodsMapper.getRemovalHalfProductExcel(askGoods);
             sheetDataList.add(head);
-            for(Map<String, Object> userMap : list.getList()){
+            for(Map<String, Object> userMap : list){
                 List<Object> listSheet = new ArrayList<>();
                 for(String key: userMap.keySet()){
                     listSheet.add(userMap.get(key));
@@ -475,10 +473,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             //表头数据
             List<Object> head = Arrays.asList("物料名称", "出库数量", "用户名称", "出库时间", "公司名称", "客户名称", "出库单编号", "WBS");
             //查询数据
-            PageHelper.startPage(askGoods.getPage(), askGoods.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(askGoodsMapper.getRemovalHalfExcel(askGoods));
+            List<Map<String, Object>> list = askGoodsMapper.getRemovalHalfExcel(askGoods);
             sheetDataList.add(head);
-            for(Map<String, Object> userMap : list.getList()){
+            for(Map<String, Object> userMap : list){
                 List<Object> listSheet = new ArrayList<>();
                 for(String key: userMap.keySet()){
                     listSheet.add(userMap.get(key));

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

@@ -520,9 +520,9 @@ public class WarehousingServiceImpl implements WarehousingService {
             List<Object> head = Arrays.asList("物料名称", "生产时间", "数量", "用户名称", "入库时间", "入库单编号", "WBS");
             //查询数据
             PageHelper.startPage(notice.getPage(), notice.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(warehousingMapper.productExcel(notice));
+            List<Map<String, Object>> list = warehousingMapper.productExcel(notice);
             sheetDataList.add(head);
-            for(Map<String, Object> userMap : list.getList()){
+            for(Map<String, Object> userMap : list){
                 List<Object> listSheet = new ArrayList<>();
                 for(String key: userMap.keySet()){
                     listSheet.add(userMap.get(key));
@@ -731,10 +731,9 @@ public class WarehousingServiceImpl implements WarehousingService {
             //表头数据
             List<Object> head = Arrays.asList("物料名称", "生产批次", "数量", "用户名称", "库位编号", "入库时间", "连番号", "序列号", "属性", "入库单编号", "WBS");
             //查询数据
-            PageHelper.startPage(notice.getPage(), notice.getLimit());
-            PageInfo<Map<String, Object>> list = new PageInfo<>(warehousingMapper.getHalfExcel(notice));
+            List<Map<String, Object>> list = warehousingMapper.getHalfExcel(notice);
             sheetDataList.add(head);
-            for(Map<String, Object> userMap : list.getList()){
+            for(Map<String, Object> userMap : list){
                 List<Object> listSheet = new ArrayList<>();
                 for(String key: userMap.keySet()){
                     listSheet.add(userMap.get(key));

src/main/resources/mapper/AskGoodsMapper.xml

@@ -54,17 +54,21 @@
     <!-- 查询指定生产单的物料 -->
     <select id="getAskGoodsMaterial" resultType="com.tld.model.AskGoods">
         SELECT
-            a.id,
+            a.ask_goods_id,
             a.material_id,
-            a.num,
-            b.name as materialName,
-            b.code as materialCode,
-            a.out_num
+            IFNULL( a.out_num, 0 ) AS num,
+            e.NAME AS materialName,
+            e.CODE AS materialCode,
+            b.ask_goods_code,
+            b.company_number
         FROM
             tld_ask_goods a
-            left join tld_material b on a.material_id = b.tld_id
+            JOIN tld_ask_goods_f b ON a.ask_goods_id = b.ask_goods_id
+            LEFT JOIN tld_department c ON b.department = c.CODE
+            JOIN tld_material e ON a.material_id = e.tld_id
         WHERE
-            a.ask_goods_id = #{askGoodsId} and (a.num + 0) <![CDATA[>]]> (a.out_num + 0) and b.part_type != '半成品' and b.part_type != '产成品'
+                ( a.num + 0 ) <![CDATA[>]]> (
+                IFNULL( a.out_num, 0 ) + 0) and e.part_type != '半成品' and e.part_type != '产成品'
     </select>
     <!-- 物料库位选择 -->
     <select id="getMaterialCk" resultType="com.tld.model.Inventory">

src/main/resources/mapper/DictionaryMapper.xml

@@ -21,7 +21,7 @@
         select * from ${tableName}
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="name != null and name != ''">
-                and name = #{name}
+                and name like CONCAT(CONCAT('%', #{name}), '%')
             </if>
             <if test="code != null and code != ''">
                 and code = #{code}

src/main/resources/mapper/InviteMapper.xml

@@ -59,17 +59,21 @@
     <!-- 查询指定生产单的物料 -->
     <select id="getAskGoodsMaterial" resultType="com.tld.model.AskGoods">
         SELECT
-            a.id,
+            a.ask_goods_id,
             a.material_id,
-            a.num,
-            b.name as materialName,
-            b.code as materialCode,
-            a.out_num
+            IFNULL( a.out_num, 0 ) AS num,
+            e.NAME AS materialName,
+            e.CODE AS materialCode,
+            b.ask_goods_code,
+            b.company_number
         FROM
             tld_invite a
-            left join tld_material b on a.material_id = b.tld_id
+            JOIN tld_invite_f b ON a.ask_goods_id = b.ask_goods_id
+            LEFT JOIN tld_department c ON b.department = c.CODE
+            JOIN tld_material e ON a.material_id = e.tld_id
         WHERE
-            a.ask_goods_id = #{askGoodsId} and (a.num + 0) <![CDATA[>]]> (a.out_num + 0) and b.part_type != '半成品' and b.part_type != '产成品'
+                ( a.num + 0 ) <![CDATA[>]]> (
+                IFNULL( a.out_num, 0 ) + 0) and e.part_type != '半成品' and e.part_type != '产成品'
     </select>
     <!-- 查询指定pda 指定物料扫描总数 -->
     <select id="getScanNum" resultType="String">