xiaochen 2 anni fa
parent
commit
f186c1f987

+ 4 - 0
src/main/java/com/tld/model/AskGoods.java

@@ -155,6 +155,10 @@ public class AskGoods implements Serializable {
      * 物料code
      */
     private String wllbCode;
+    /**
+     * 物料code
+     */
+    private String wllbClass;
     /**
      * 页数
      */

+ 1 - 1
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("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
+                    strJson.put("W", 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

+ 7 - 2
src/main/java/com/tld/service/impl/QueryListServiceImpl.java

@@ -888,8 +888,13 @@ public class QueryListServiceImpl implements QueryListService {
     public Map<String, Object> getPdaTask(User user) {
         Map<String, Object> map = new HashMap<>();
         try{
-            List<Map<String,Object>> list = queryListMapper.getPdaTask(user);
-            map.put("data", list);
+//            List<Map<String,Object>> list = queryListMapper.getPdaTask(user);
+            Map<String, Object> map1 = new HashMap<>();
+
+//            Integer PlanNum = queryListMapper.getPlanNum(user);
+
+
+            map.put("data", map1);
             map.put("msg", "200");
         } catch (Exception e){
             e.printStackTrace();

+ 2 - 1
src/main/resources/mapper/AskGoodsMapper.xml

@@ -86,7 +86,8 @@
                c.id                 AS departmentId,
                a.production_code,
                a.wbs,
-               a.entry_number
+               a.entry_number,
+               e.wllb_class
         FROM tld_ask_goods a
         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