tijao

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

@@ -152,13 +152,20 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Object materialId = map.get("materialId");
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
         //预计进厂时间
-        Date orderEntryTime = new Date((long) map.get("orderEntryTime"));
+        Date orderEntryTime = null;
+        if(map.get("orderEntryTime") != null){
+            try {
+                orderEntryTime = new Date((long) map.get("orderEntryTime"));
+            } catch (Exception e) {
+                System.out.println("预估进厂日期转换失败");
+            }
+        }
         int count = 0;
         for (Map<String, Object> capacityMap : driverCapacityIdList) {
             //添加运输订单
             OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
             omstruckOrder.setOrderPlanId(purchaseOrderId);
-            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityMap.get("capacityId"))); //添加运力排班ID
+            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityMap.get("capacityId"))); //添加运力ID
             omstruckOrder.setOrderEntryTime(orderEntryTime);
             count += omstruckOrderMapper.insertSelective(omstruckOrder);
             BigDecimal orderId = omstruckOrder.getOrderId();
@@ -572,6 +579,7 @@ 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));
@@ -1940,9 +1948,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     mesMap.put("organizationCode","二厂");
                 }
                 break;
-            case 11:
-                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
-                break;
             case 12:
             case 13:
             case 15:

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

@@ -1612,8 +1612,10 @@
         join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
         where db.MATERIAL_ID = #{materialId}
         and apo.SUPPLIER_UNIT_ID = #{supplierId}
-        and apo.purchasing_organization_id = #{purchaseOrgId}
         and apo.deleted = 0
+        <if test="purchaseOrgId != null">
+            and apo.purchasing_organization_id = #{purchaseOrgId}
+        </if>
         <if test="remark != null">
             and instr(db.RESULT_FOREIGN_SHIP_NAME, #{remark}) > 0
         </if>