问题修改

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

@@ -330,6 +330,18 @@ public class QueryListController {
     public Map<String, Object> getPdaTask(User user){
         return queryListService.getPdaTask(user);
     }
+    
+    /** 
+    * @Description: 查询领料日期
+    * @Param: User
+    * @return: Map<String, Object>
+    * @Author: XiaoChen
+    * @Date: 2023/5/9
+    */
+    @GetMapping("getPlannedDelivery")
+    public Map<String, Object> getPlannedDelivery(User user){
+        return queryListService.getPlannedDelivery(user);
+    }
 
     /**
      * 查询pda任务数量
@@ -342,5 +354,17 @@ public class QueryListController {
     }
 
 
+    /**
+     * @Description: 查询部门
+     * @Param: User
+     * @return: Map<String, Object>
+     * @Author: XiaoChen
+     * @Date: 2023/5/9
+     */
+    @GetMapping("getDepartment")
+    public Map<String, Object> getDepartment(User user){
+        return queryListService.getDepartment(user);
+    }
+
 }
 

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

@@ -113,4 +113,12 @@ public interface QueryListMapper {
     int getZhuiSu(User user);
 
     int getBanChenPinChu(User user);
+
+    List<String> getPlannedDelivery(User user);
+
+    List<String> getInviteDelivery(User user);
+
+    List<Map<String, Object>> getPlannedDepartment(User user);
+
+    List<Map<String, Object>> getInviteDepartment(User user);
 }

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

@@ -43,7 +43,7 @@ public interface WarehousingMapper {
 
     void addReturnWarehousing(ReturnWarehousing returnWarehousing);
 
-    List<ReturnWarehousing> getPlugOutWarehousing(String orderNumber);
+    List<ReturnWarehousing> getPlugOutWarehousing(@Param("orderNumber") String orderNumber);
 
     List<Storage> warehousingFlowing(Storage storage);
 

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

@@ -72,6 +72,10 @@ public class User implements Serializable {
      * 创建时间
      */
     private String createTime;
+    /**
+     * 创建时间
+     */
+    private String sqrq;
     /**
      * token
      */
@@ -80,6 +84,10 @@ public class User implements Serializable {
      * 菜单
      */
     private String menu;
+    /**
+     * 状态
+     */
+    private String type;
     /**
      * 前段用
      */

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

@@ -70,5 +70,9 @@ public interface QueryListService {
 
     Map<String, Object> getPdaTask(User user);
 
+    Map<String, Object> getPlannedDelivery(User user);
+
+    Map<String, Object> getDepartment(User user);
+
     Map<String, Object> getTaskNum(User user);
 }

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

@@ -1069,7 +1069,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("WMSCode", mapList.get(0).get("noticeCode").toString());//利道WMS出库单编号
                     strJson.put("WareHouse", returnWarehousing1.get("warehouseWhere"));//仓库ID
                     strJson.put("SourceBillDate", DateUtil.dateConversion(mapList.get(0).get("noticeTime").toString()));//业务日期
-                    strJson.put("W", mapList.get(0).get("sourceType").toString());//来源类型
+                    strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
                     strJson.put("MoveType", mapList.get(0).get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
                     strJson.put("Creator", realName);//制单人姓名1

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

@@ -928,4 +928,59 @@ public class QueryListServiceImpl implements QueryListService {
         }
         return map;
     }
+
+    /**
+     * @Description: 查询领料日期
+     * @Param: User
+     * @return:
+     * @Author: XiaoChen
+     * @Date: 2023/5/9
+     */
+    @Override
+    public Map<String, Object> getPlannedDelivery(User user) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            List<String> list = null ;
+            if (user.getType().equals("计划出库")){
+                list = queryListMapper.getPlannedDelivery(user);//计划出库
+            }else {
+                list = queryListMapper.getInviteDelivery(user);//邀请出库
+            }
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+
+    /**
+     * @Description: 查询部门
+     * @Param: User
+     * @return: Map<String, Object>
+     * @Author: XiaoChen
+     * @Date: 2023/5/9
+     */
+    @Override
+    public Map<String, Object> getDepartment(User user) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            List<Map<String,Object>> list = null ;
+            if (user.getType().equals("计划出库")){
+                list = queryListMapper.getPlannedDepartment(user);//计划出库
+            }else {
+                list = queryListMapper.getInviteDepartment(user);//邀请出库
+            }
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

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

@@ -268,6 +268,7 @@ public class WarehousingServiceImpl implements WarehousingService {
                 String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreatePurInStock";
                 HttpClientUtil httpClientUtil1 = new HttpClientUtil();
                 Map<String, Object> result = httpClientUtil1.doPost(url, returnData);
+                System.out.println("返回信息为:"+result.toString());
                 Error error = new Error();
                 int type = 0;
                 if (Integer.parseInt(result.get("msg").toString()) != 200) {
@@ -281,15 +282,14 @@ public class WarehousingServiceImpl implements WarehousingService {
                     JSONObject jsonObject = JSONObject.parseObject(JSON.parseObject((String) result.get("data")).get("result").toString());
                     if (jsonObject.get("State").toString().equals("0")) {
                         //如果失败存入报错信息跟数据
-                        error.setErrorInfo(jsonObject.get("Msg").toString());
+                        error.setErrorInfo(jsonObject.get("FailReason").toString());
                         error.setUrl(url);
                         error.setDataVal(returnData.toJSONString()).setType("入库回传");
                         errorMapper.addError(error);
                         type = 1;
                     }
                 }
-                //删除父子表信息
-                askGoodsMapper.delPlugOutWarehousing(returnWarehousing.getOrderNumber());
+
                 //添加记录到tld_access
                 String names = "入库回传";
                 String accessType = "1";
@@ -298,6 +298,8 @@ public class WarehousingServiceImpl implements WarehousingService {
                 //增加流水传输状态
                 warehousingMapper.updateWarehousingType(returnWarehousing.getStorageCode(), type);
             }
+            //删除父子表信息
+            askGoodsMapper.delPlugOutWarehousing(orderNumber);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/resources/mapper/QueryListMappeer.xml

@@ -1453,4 +1453,64 @@
     <select id="getTestTwo" resultType="java.util.Map">
         select DISTINCT ask_goods_id from tld_ask_goods_vitrual where unique_code = "1111"
     </select>
+    <!--查询领料日期计划出库-->
+    <select id="getPlannedDelivery" resultType="java.lang.String">
+        select
+            b.sqrq
+        from tld_ask_goods a
+        left join tld_ask_goods_f b on a.ask_goods_id = b.ask_goods_id
+        where a.material_id in(
+            select b.tld_id from tld_user_material a
+            left join tld_material b on a.material_id = b.code
+            where a.user_id = #{userId})
+        and a.type = '0'
+        group by b.sqrq
+        order by b.sqrq desc
+    </select>
+    <!--查询领料日期邀请出库-->
+    <select id="getInviteDelivery" resultType="java.lang.String">
+        select
+            b.sqrq
+        from tld_invite a
+                 left join tld_invite_f b on a.ask_goods_id = b.ask_goods_id
+        where a.material_id in(
+            select b.tld_id from tld_user_material a
+                                     left join tld_material b on a.material_id = b.code
+            where a.user_id = #{userId})
+          and a.ask_goods_type = '0'
+        group by b.sqrq
+        order by b.sqrq desc
+    </select>
+    <!--查询部门-->
+    <select id="getPlannedDepartment" resultType="java.util.Map">
+        select
+            c.name,
+            c.code
+        from tld_ask_goods a
+        left 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
+        where a.material_id in(
+            select b.tld_id from tld_user_material a
+                                     left join tld_material b on a.material_id = b.code
+            where a.user_id = #{userId})
+          and a.type = '0'
+          and b.sqrq = #{sqrq}
+        group by c.name,c.code
+    </select>
+    <!--查询部门-->
+    <select id="getInviteDepartment" resultType="java.util.Map">
+        select
+            c.name,
+            c.code
+        from tld_invite a
+        left join tld_invite_f b on a.ask_goods_id = b.ask_goods_id
+        left join tld_department c on b.department = c.code
+        where a.material_id in(
+            select b.tld_id from tld_user_material a
+            left join tld_material b on a.material_id = b.code
+            where a.user_id = #{userId})
+          and a.ask_goods_type = '0'
+          and b.sqrq = #{sqrq}
+        group by c.name,c.code
+    </select>
 </mapper>

src/main/resources/mapper/WarehousingMapper.xml

@@ -202,7 +202,7 @@
                ifnull(b.name, '') as wbsName
         from tld_return_gs_warehousing a
                  left join tld_wbs b on a.wbs = b.tld_id
-        where #{orderNumber} LIKE CONCAT('%', CONCAT(order_number, ','), '%')
+        where a.order_number = #{orderNumber}
     </select>
     <!-- 查询入库流水 -->
     <select id="warehousingFlowing" resultType="com.tld.model.Storage">