Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.feign.*;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
@@ -9,6 +10,7 @@ import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.HTTPRequestUtils;
 import com.steerinfo.dil.util.getRequestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -70,8 +74,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 
     @Autowired
     JoinFeign joinFeign;
-
-    private  String guoYuanUrl="http://113.204.217.110:9810/dagang/receiving";
+    //果园库测试接口："http://113.204.217.110:9810/dagang/receiving";
+    //果园库正式接口
+    private  String guoYuanUrl="http://114.117.208.165:9810/dagang/receiving";
     //城嘉库登录访问接口
     private  String chengJiaLoginUrl="http://116.204.73.104:8083/dagon/login";
     //城嘉库推送数据接口
@@ -285,14 +290,14 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     e.printStackTrace();
                 }
                 //查询该订单的出库单制作日期
-                try {
-                    List<String> easPrimaryIds = tmstruckLeaveFactoryResultMapper.getEasPrimaryIds(orderNumber);
-                    Map<String, Object> easPrimaryMap = new HashMap<>();
-                    easPrimaryMap.put("easPrimaryList",easPrimaryIds);
-                    amsFeign.getMakeOrderDate(easPrimaryMap);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+//                try {
+//                    List<String> easPrimaryIds = tmstruckLeaveFactoryResultMapper.getEasPrimaryIds(orderNumber);
+//                    Map<String, Object> easPrimaryMap = new HashMap<>();
+//                    easPrimaryMap.put("easPrimaryList",easPrimaryIds);
+//                    amsFeign.getMakeOrderDate(easPrimaryMap);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
                 //判断该订单是不是异地库
                 try {
                         String addressPlace = tmstruckLeaveFactoryResultMapper.getAddressPlace(orderId);
@@ -303,12 +308,37 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                             if (token != null) {
                                 for (Map<String,Object> map1:data) {
                                     map1.put("token", token);
+                                    //接口发送日期
+                                    map1.put("sendTime",new Date());
                                     ///调用城嘉库推送接口
                                     sendMesToChengJia(map1);
                                 }
                             } else {
                                 System.out.println("登录城嘉库失败");
                             }
+                        }else if(addressPlace!=null &&  addressPlace.contains("果园港")){
+                            //果园库
+                            List<Map<String,Object>> data =getOffSiteWarehouse(orderNumber);
+                            Map<String,Object> details=new HashMap<>();
+                            DateFormat format=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            for(Map<String,Object> temp:data){
+                                temp.put("resultOutGateTime",format.format((Date)(temp.get("outGateTime"))));
+                                temp.put("orderIssueTime",format.format((Date)(temp.get("orderIssueTime"))));
+                                temp.remove("outGateTime");
+                                temp.put("orderWagonNo",temp.get("capacityNo"));
+                            }
+                            //发送时间
+                            details.put("sendTime",format.format(new Date()));
+                            //系统代码
+                            details.put("sysCode", "DGXT");
+                            //仓库代码
+                            details.put("warehouseCode", "LJJT");
+                            //运输方式
+                            details.put("transportType", "汽运");
+                            //详细数据
+                            details.put("details", data);
+                            //推送数据
+                            sendMesToGuoyuan(details);
                         }
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -533,8 +563,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             }else if (materialName.contains("螺纹")){
                 map1.put("materialType","螺纹钢");
             }
-            //接口发送日期
-            map1.put("sendTime",new Date());
         }
         return mapList;
     }
@@ -585,12 +613,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     /**
      * 推送数据给城嘉库
      */
-
-    /**
-     * 访问重庆果园库接口方法
-     * @param map
-     * @return
-     */
     public int sendMesToChengJia(Map<String, Object> map){
         String token =(String) map.get("token");
         Map<String,Object> jsonObject = new HashMap<>();
@@ -611,4 +633,37 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         }
         return 0;
     }
+
+    /**
+     * 访问重庆果园库接口方法
+     * @param map
+     * @return
+     */
+    public int sendMesToGuoyuan(Map<String, Object> map){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.putAll(map);
+        String jsonData = null;
+        try {
+            jsonData = HTTPRequestUtils.send(guoYuanUrl, jsonObject, "utf-8");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            try{
+                HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+                BigDecimal code =DataChange.dataToBigDecimal(hashMap.get("code"));
+                System.out.println(hashMap.get("message"));
+                if(code.intValue()==200){
+                    return 1;
+                }else {
+                    System.out.println("推送数据失败"+hashMap.get("message"));
+                }
+            }catch (Exception e){
+
+            }
+
+        }
+        return 0;
+    }
 }

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -1932,7 +1932,7 @@
                     RCA.CAPACITY_NUMBER "newCapacityNo",
                     NVL(OO.CAPACITY_ID,0)  "capacityIds",
                     OO.CAPACITY_ID "capacityId",
-                    DECODE(NVL(OO.IS_ACCEPT,0),1,'已接收','未接收') "isAccept",
+                    DECODE(NVL(OO.IS_ACCEPT,0),1,'已接收','') "isAccept",
                     ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
                     ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
                     ASOM.TRUCK_REMARK "truckRemark",
@@ -2308,7 +2308,9 @@
         --计划件数
         ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber",
         --制单时间
-        ASM.SALE_MAKE_DATE "saleMakeDate"
+        ASM.SALE_MAKE_DATE "saleMakeDate",
+        --操作人
+        OO.RECORD_USERNAME "recordUserName"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RC
         ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
@@ -2586,7 +2588,9 @@
         --计划件数
         ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber",
         --制单时间
-        ASM.SALE_MAKE_DATE "saleMakeDate"
+        ASM.SALE_MAKE_DATE "saleMakeDate",
+        --操作人
+        OO.RECORD_USERNAME "recordUserName"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RC
         ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID

src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1406,10 +1406,13 @@
             RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
             TLFR.RESULT_OUT_GATE_TIME "outGateTime",
             ASO.sale_remark "saleRemark" ,
+            ASO.sale_remark "remark" ,
             TWR.INSERT_UPDATE_REMARK  "orderWagonNo",
-            sysdate "sendTime",
             '汽运' "transportType",
             '四川省达州市通川区' "shipperAddress",
+            '四川省达州市通川区' "shipperAdddress",
+            OO.DRIVER_TEL "capacityTel",
+            CONCAT( CONCAT( CONCAT( RRA.ADDRESS_PROVINCE, ADDRESS_DISTRICT ), ADDRESS_TOWN ), RRP.ADDRESS_DELIVERY_ADDRESS ) "consigneeAddress",
             ASM.IS_POUND_SALE "isPoundSale",
             (case when
                       ASM.IS_POUND_SALE = 1