tijaio

pom.xml

@@ -129,9 +129,18 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.75</version>
         </dependency>
-
-
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <!-- 表示开发的时候引入，发布的时候不会加载此包 -->
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/com/steerinfo/dil/controller/TmstruckTimeTaskResultController.java

@@ -61,6 +61,7 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
         int i=0;
         try {
             i=tmstruckTimeTaskResultService.addTimeTaskResult(mapValue);
+
         } catch (Exception e) {
             return failed(e.getMessage());
         }

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

@@ -19,4 +19,8 @@ public interface AmsFeign {
     @PostMapping("api/v1/ams/amssaleordermaterials/dispatchTruckOrderByCarrier")
     RESTfulResult dispatchTruckOrderByCarrier(@RequestBody Map<String, Object> mapValue);
 
+    //根据物资查询运输物资单价
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
+    Map<String,Object> getInwardPriceBy(Map<String, Object> priceMap);
+
 }

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

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * @ author    :TXF
@@ -17,4 +18,7 @@ public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")
     public RESTfulResult addDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
+
+    @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
+    int addDetailsOrder(Map<String,Object> map);
 }

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

@@ -37,9 +37,9 @@ public interface TmstruckTimeTaskResultMapper extends IBaseMapper<TmstruckTimeTa
     //根据运输订单号查找需要用车时长
     Map<String,Object>  selectInwardDueTimeByOrderId(BigDecimal orderId);
 
-
-
     //根据运输订单id查找实绩中是否含有已经计时结束的实绩
     int CountTimeTaskByOrderId(BigDecimal orderId);
 
+    Map<String,Object> getRequirementInfo(BigDecimal orderId1);
+
 }

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

@@ -127,7 +127,6 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         List<Map<String, Object>> inwardReportResult = statisticalReportMapper.getInwardReportResult(mapValue);
         for (Map<String,Object>inwardReport:inwardReportResult
         ) {
-
             BigDecimal netWeightSecond = DataChange.dataToBigDecimal(inwardReport.get("netWeightSecond"));
             BigDecimal netWeightFirst = DataChange.dataToBigDecimal(inwardReport.get("netWeightFirst"));
             BigDecimal netTract = netWeightSecond.subtract(netWeightFirst).divide(new BigDecimal(1), 2, 4);

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

@@ -12,6 +12,9 @@ import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
 import com.steerinfo.dil.service.IUtilsService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.controller.RESTfulResult;
+import org.apache.commons.lang3.builder.ToStringExclude;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -247,7 +250,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                         //生成新的运输订单
                         omsFeign.addPurInwardOrder(orderId);
                     }
-
+                    try {
+                        bmsTruckFeign.addDetailsOrder(map);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
                 break;
             case 12:
@@ -360,4 +367,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     public List<Map<String, Object>> getSporadicLeaveFactory(Map<String, Object> mapValue) {
         return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(mapValue);
     }
+
+
 }

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.feign.BmsTruckFeign;
 import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckTimeTaskResultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;
@@ -42,6 +44,10 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     private UtilsServiceImpl utilsService;
     @Autowired
     private OmsFeign omsFeign;
+    @Autowired
+    private BmsTruckFeign bmsTruckFeign;
+    @Autowired
+    private AmsFeign amsFeign;
 
 
 
@@ -200,7 +206,6 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 //推送
                  omsFeign.addNewTransportOrder(orderId1);
             }
-
         }
         return i;
     }
@@ -266,7 +271,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int addTimeTaskResult(Map<String, Object> map) throws Exception {
-           //判断是否是计时开始还是计时结束
+        //判断是否是计时开始还是计时结束
         int i=0;
         BigDecimal inwardType =DataChange.dataToBigDecimal(map.get("inwardTypes")) ;
         String orderNumber = (String) map.get("orderNumber");
@@ -291,7 +296,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
             tmstruckTimeTaskResult.setInsertUsername(personnelSsoId);
         }
         //新增第一条计时实绩
-        i += tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+        tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
         if(inwardType.intValue() == 3){
             //获取最新暂停结束确认时间
             Map<String, Object> map2 = new HashMap<>();
@@ -315,6 +320,23 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                 i += tmstruckTimeTaskResultMapper.updateByPrimaryKeySelective(tmstruckTimeTaskResult);
             }
             pushOrderForPause(map);
+            BigDecimal orderId1 = DataChange.dataToBigDecimal(map.get("orderId"));
+            Map<String,Object>mapInfo = tmstruckTimeTaskResultMapper.getRequirementInfo(orderId1);
+            Map<String,Object>mapPrice = null;
+            try {
+                mapPrice = amsFeign.getInwardPriceBy(mapInfo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            if(mapPrice != null){
+                mapPrice.put("orderId",orderId1);
+                try {
+                    i += bmsTruckFeign.addDetailsOrder(mapPrice);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
         }
             return i;
         }

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

@@ -70,6 +70,7 @@ public class UtilsServiceImpl implements IUtilsService {
         if(orderSeq.intValue() == maxSeq.intValue()){
             map.put("orderStatus", 2);
             utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+
         }
         if(map.get("priceId")!=null){
             //如果有价格ID 则说明需要结算 调用新增详单接口

src/main/java/com/steerinfo/dil/util/MD5Util.java

@@ -1,6 +1,9 @@
 package com.steerinfo.dil.util;
 
 import java.security.MessageDigest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.SimpleTimeZone;
 
 /**
  * @author luobang
@@ -37,6 +40,19 @@ import java.security.MessageDigest;
             return hexValue.toString();
         }
 
+        public static String formatTimeTmp(){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+            Date date = new Date();
+            String timeTmp = simpleDateFormat.format(date);
+            return timeTmp;
+        }
+
+        public static String sign(String AppId,String secretKey) throws Exception {
+            String instr = AppId + secretKey + formatTimeTmp();
+            return md5Encode(instr);
+        }
+
+
         /**
          *测试
          * @throws Exception

src/main/resources/application-prod.yml

@@ -24,9 +24,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+    url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   WmshBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
@@ -40,7 +40,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
 
 server:
   port: 8088

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

@@ -818,5 +818,15 @@
                        on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
       where OO.ORDER_ID=#{orderId}
     </select>
+  <select id="getRequirementInfo" resultType="java.util.Map" parameterType="decimal">
+      select AIR.CAPACITY_TYPE_ID "capacityTypeId" ,AIR.REQUIREMENT_TYPE "requirementType" from OMSTRUCK_ORDER OO
+      left join AMSTRUCK_INWARD_PLAN AIP
+      on aip.PLAN_ID = OO.ORDER_PLAN_ID
+      LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+      ON ARP.PLAN_ID = AIP.PLAN_ID
+      LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+      ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+      where oo.ORDER_ID = #{orderId1}
+  </select>
 
 </mapper>