修改零星

pom.xml

@@ -110,7 +110,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <table>TMSTRUCK_UNLOAD_RESULT</table>-->
-                        <param>OMSTRUCK_ORDER</param>
+                        <param>AMSTRUCK_REQUIREMENT_MATERIAL</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -45,4 +45,8 @@ public interface TmsTruckFeign {
     //生成装车实绩： 运输订单Id、物资Id
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResult")
     RESTfulResult addLoadResult(@RequestBody(required = false) Map<String, Object> map);
+
+    //发送计量委托,运输订单id
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
+    RESTfulResult sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -566,6 +566,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal orderPlanId =(BigDecimal) messageMap.get("orderPlanId");
         //将订单状态设为未接收
         omstruckOrder.setOrderStatus(new BigDecimal(4));
+        //讲路段顺序号设为空，适应进厂以后扫码
+        omstruckOrder.setOrderLineSequence(null);
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         List<Map<String, Object>> allResultIdList = omstruckOrderMapper.getAllResultId(DataChange.dataToBigDecimal(orderId));
         for (Map<String,Object> allResultId:allResultIdList
@@ -807,6 +809,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrderSeparateService.addAllSonResult(orderMessage);
             //判断订单是否是一车多单
             BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
+            //判断是否是纯内转
+            if (orderType.intValue()==11){
+                //发送计量委托
+              tmsTruckFeign.sendMeasureCommission(map);
+            }
             if (orderType.intValue()==15 || orderType.intValue()==16 ) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
@@ -1927,6 +1934,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
+                mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
+                mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
                 break;
             case 12:
             case 13:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8