Merge remote-tracking branch 'origin/master'

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,4 +22,7 @@ public interface JoinFeign {
     // 查询车牌号和金蝶分录
     @PostMapping("/api/v1/join/amssaleorder/selectSaleSteelOrder")
     Map<String,Object> selectSaleSteelOrder(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResultByDaGang")
+    Map<String,Object> receiveTmsTruckWeightResultByDaGang(@RequestBody List<Map<String,Object>> mapList);
 }

src/main/java/com/steerinfo/dil/mapper/UtilsMapper.java

@@ -140,4 +140,7 @@ public interface UtilsMapper {
 
     //查询总实绩的订单是否包含某个物资的数目
     int getMaterialNumByTotal(Map<String,Object> map);
+
+    BigDecimal getOrderSeq(BigDecimal orderId);
+
 }

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/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -2,6 +2,8 @@ package com.steerinfo.dil.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.cache.Weigher;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.MeasureJsonData;
 import com.steerinfo.dil.model.TmstruckMeasureCommission;
@@ -56,6 +58,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     @Autowired
     private TmstruckTareReturnResultMapper tmstruckTareReturnResultMapper;
 
+
+    @Autowired
+    private JoinFeign joinFeign;
+
     private static final  String daGangUrl = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
 
     private static final  String dagangUrlForLoad = "http://172.16.33.122:44325/api/logistics/modifyLoadPlace";
@@ -263,6 +269,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", true);
             }
         }
+        measureCommission.put("orderType",1);
         System.out.println(measureCommission);
         return sendMesToMeasure(measureCommission);
     }
@@ -648,7 +655,38 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             boolean success = (boolean) hashMap.get("success");
             System.out.println(hashMap.get("msg"));
             if(success){
+                try {
+                    if(map.get("orderType") != null && DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 1) {
+                        Object weight = hashMap.get("weight");
+                        Object weightDateTime = hashMap.get("weightDateTime");
+                        if(weight != null && weightDateTime != null){
+                            List<Map<String,Object>> mapListWeight = new ArrayList<>();
+                            Map<String, Object> weightMap = new HashMap<>();
+                            weightMap.put("orderNumber",map.get("transportNum"));
+                            weightMap.put("resultTareCalculateNumber","一号汽车衡");
+                            weightMap.put("resultTareWeight",weight);
+                            weightMap.put("resultTareWeightTime",weightDateTime);
+                            weightMap.put("carNo",map.get("carNum"));
+                            weightMap.put("flag","GCXS");
+                            weightMap.put("needCheckToKD",1);
+                            weightMap.put("resultCrossCalculateNumber","");
+                            weightMap.put("resultCrossWeight","");
+                            weightMap.put("resultNetWeight","");
+                            weightMap.put("resultCrossWeightTime","");
+                            weightMap.put("resultNetWeightTime","");
+                            weightMap.put("resultPoundNo","");
+                            weightMap.put("materialId","");
+                            weightMap.put("wuliuRemark","委托带出皮重");
+                            mapListWeight.add(weightMap);
+                            joinFeign.receiveTmsTruckWeightResultByDaGang(mapListWeight);
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 return 1;
+            }else{
+                System.out.println("委托发送失败：" + jsonData);
             }
         }else{
             System.out.println("委托发送失败：" + jsonData);

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

@@ -63,9 +63,9 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
     }
 
     public int generaSendMessage(String mobile,String capacityNum,BigDecimal orderId) throws Exception {
-        String url = "http://www.btom.cn:8080/simpleinter/sendSMS?appId=EUCP-EMY-SMS1-10QNI&";
+        String url = "http://www.btom.cn:8080/simpleinter/sendSMS?appId=EUCP-EMY-SMS1-0RHMZ&";
         String tmpTmp = MD5Util.formatTimeTmp();
-        String sign = MD5Util.sign("EUCP-EMY-SMS1-10QNI","EE20B0B28B75E567");
+        String sign = MD5Util.sign("EUCP-EMY-SMS1-0RHMZ","0CC1A5DEBB4590DA");
         String driverTel = tmstruckSmsRusultMapper.getDriverTel(orderId);
         String mobile1 = mobile.trim();
         String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。";

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

@@ -100,10 +100,17 @@ public class UtilsServiceImpl implements IUtilsService {
             //如果没有传入运输订单Id则需要传入了运输订单号
             orderId = utilsMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
         }
+        //根据订单查询里面订单里面的路段顺序号
+        BigDecimal orderLineSequence = utilsMapper.getOrderSeq(orderId);
+        //这是该实绩的路段顺序号
         BigDecimal segmentSqe = DataChange.dataToBigDecimal(map.get("segmentSqe"));
         if(segmentSqe.intValue() == 0){
             return 0;
         }
+        //如果订单里面路段顺序号 大于 实绩里面路段顺序号,则不更新
+        if (orderLineSequence != null && segmentSqe != null && orderLineSequence.intValue() > segmentSqe.intValue()) {
+            segmentSqe = orderLineSequence;
+        }
         Map<String, Object> mesMap = new HashMap<>();
         mesMap.put("orderId", orderId);
         mesMap.put("orderLineSequence", segmentSqe);

src/main/resources/application-prod.yml

@@ -28,7 +28,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

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

@@ -1919,6 +1919,7 @@
                     ASM.SALE_MATERIAL_ID "saleMaterialId",
                     ASM.MATERIAL_NUMBER "materialNum",
                     ASM.EAS_PRIMARY_ID "closeEntryId",
+                    ASM.STEEL_METER "steelMeters",
                     ASM.DELETED "deletedStatus",
                     RC.CONSIGNEE_COMPANY_NAME "consigneeName",
                     ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
@@ -1931,9 +1932,10 @@
                     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",
                     OO.ORDER_LINE_SEQUENCE "lineSequence",
                     ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
                     RSR.SALER_NAME "saler",
@@ -3030,7 +3032,12 @@
         SELECT distinct OO.ORDER_ID "orderId",
         ASO.SALE_ORDER_ID "saleOrderId",
         ASO.SALE_NUMBER "saleOrderNo",
+        ASO.SALE_REMARK "saleRemark",
+        ASO.SALER_ID    "salerId",
+        ASO.SHIPPER_ID  "shipperId",
+        ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
         RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+        RC.CONSIGNEE_ID "receiveId",
         ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
         RS.SHIPPER_NAME "shipperName",
         (CASE WHEN
@@ -3050,6 +3057,7 @@
         OO.ORDER_LINE_SEQUENCE "lineSequence",
         ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
         RSR.SALER_NAME "saler",
+        RSR.SALER_ID    "saler",
         R_CARRIER.CARRIER_ABBREVIATION "carrierName",
         OO.ORDER_NUMBER "orderNo",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
@@ -3121,23 +3129,42 @@
     </select>
     <select id="getSteelReportDetailsListBySmId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
         SELECT distinct
+        ASO.SALE_NUMBER "saleOrderNo",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
+        ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
+        ASM.MATERIAL_NUMBER "materialNumber",
         ASM.MATERIAL_NUMBER "materialNum",
+        ASM.IS_POUND_SALE   "isPoundSale",
+        ADSO.CARRIER_ID     "carrierId",
         ASM.EAS_PRIMARY_ID "closeEntryId",
+        ASM.STEEL_METER "steelMeters",
+        RRP.PLACE_ID "placeId",
+        RRP.ADDRESS_DELIVERY_ADDRESS    "place",
+        RRP.ADDRESS_ID "shipperAddressId",
+        ASOM.TRUCK_REMARK   "truckRemark",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL   "saleOrderConsigneeTel",
+        ASOM.SALE_DATE_OF_RECEIPT  "saleDateOfReceipt",
         ASM.DELETED "deletedStatus",
         RM.MATERIAL_ID  "materialId",
         RM.MATERIAL_NAME  "materialName",
         RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+        RM.MATERIAL_SPECIFICATION   "materialSpecification",
+        RM.MATERIAL_MODEL   "materialModel",
         TWR.RESULT_GROSS_WEIGHT "grossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
         TWR.RESULT_TARE_WEIGHT       "tareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
         TWR.RESULT_NET_WEIGHT        "netWeight",
         TLR.RESULT_LOAD_END_TIME     "loadTime",
-        BDO.DETAILS_AMOUNT           "detailsAmount"
+        BDO.DETAILS_AMOUNT           "detailsAmount",
+        oo.ORDER_NUMBER             "orderNo"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM

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

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

@@ -394,4 +394,8 @@
                  LEFT JOIN RMS_MATERIAL RM ON RM .MATERIAL_ID = OOM .MATERIAL_ID
         WHERE TTR .RESULT_TOTAL_ID=#{resultTotalId} AND RM .MATERIAL_NAME LIKE CONCAT('%',CONCAT(#{con},'%'))
     </select>
+    <select id="getOrderSeq" resultType="java.math.BigDecimal">
+        SELECT OO.ORDER_LINE_SEQUENCE FROM OMSTRUCK_ORDER OO
+        where oo.ORDER_ID = #{orderId}
+    </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout