tijiao

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

@@ -223,4 +223,9 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         int i = omstruckOrderSeparateService.updateOmstruckOrder(omstruckOrder);
         return success(i);
     }
+
+    @PostMapping("getUnloadOrderMaterial")
+    public RESTfulResult getUnloadOrderMaterial(@RequestBody(required = false) Map<String,Object>map){
+        return success(omstruckOrderSeparateService.getUnloadOrderMaterial(map));
+    }
 }

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

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMaterial, BigDecimal> {
@@ -23,4 +25,6 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     //通过订单Id
     BigDecimal getOrderMaterialIdByOrderId(BigDecimal orderId);
 
+    //通过订单id或者订单号查询订单子表物资ID
+    List<Map<String, Object>> getUnloadOrderMaterial(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/model/RmsCapacity.java

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -82,16 +81,16 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
     private String capacityFuelConsumption;
 
     /**
-     * 是否自有车辆（0：是；1：不是）(CAPACITY_OWNERIS,DECIMAL,0)
+     * 是否自有车辆（0：是；1：不是）(CAPACITY_OWNERIS,VARCHAR,16)
      */
     @ApiModelProperty(value="是否自有车辆（0：是；1：不是）",required=false)
-    private BigDecimal capacityOwneris;
+    private String capacityOwneris;
 
     /**
-     * 运力是否黑名单（0：是；1：不是）(CAPACITY_BLACKLIST,DECIMAL,0)
+     * 运力是否黑名单（0：是；1：不是）(CAPACITY_BLACKLIST,VARCHAR,16)
      */
     @ApiModelProperty(value="运力是否黑名单（0：是；1：不是）",required=false)
-    private BigDecimal capacityBlacklist;
+    private String capacityBlacklist;
 
     /**
      * 备注(MEMO,VARCHAR,128)
@@ -255,20 +254,20 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
         this.capacityFuelConsumption = capacityFuelConsumption == null ? null : capacityFuelConsumption.trim();
     }
 
-    public BigDecimal getCapacityOwneris() {
+    public String getCapacityOwneris() {
         return capacityOwneris;
     }
 
-    public void setCapacityOwneris(BigDecimal capacityOwneris) {
-        this.capacityOwneris = capacityOwneris;
+    public void setCapacityOwneris(String capacityOwneris) {
+        this.capacityOwneris = capacityOwneris == null ? null : capacityOwneris.trim();
     }
 
-    public BigDecimal getCapacityBlacklist() {
+    public String getCapacityBlacklist() {
         return capacityBlacklist;
     }
 
-    public void setCapacityBlacklist(BigDecimal capacityBlacklist) {
-        this.capacityBlacklist = capacityBlacklist;
+    public void setCapacityBlacklist(String capacityBlacklist) {
+        this.capacityBlacklist = capacityBlacklist == null ? null : capacityBlacklist.trim();
     }
 
     public String getMemo() {

src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

@@ -17,4 +17,7 @@ public interface IOmstruckOrderSeparateService {
 
     //根据运输订单id修改运力id
     int updateOmstruckOrder(OmstruckOrder omstruckOrder);
+
+
+    List<Map<String,Object>> getUnloadOrderMaterial(Map<String, Object> map);
 }

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

@@ -307,4 +307,10 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public int updateOmstruckOrder(OmstruckOrder omstruckOrder) {
         return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
     }
+
+    //根据运输订单号查物资
+    @Override
+    public List<Map<String,Object>> getUnloadOrderMaterial(Map<String, Object> map) {
+        return omstruckOrderMaterialMapper.getUnloadOrderMaterial(map);
+    }
 }

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

@@ -1198,13 +1198,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             BigDecimal capacityId = rmsCapacity.getCapacityId();
             capacityMap.clear();
             capacityMap.put("capacityId",capacityId);
-            List<RmsDriverCapacity> rmsDriverCapacities = rmsDriverCapacityMapper.selectByParameters(capacityMap);
-            RmsDriverCapacity rmsDriverCapacity = rmsDriverCapacities.get(0);
-            rmsDriverCapacity.setCarrierId(new BigDecimal(carrierId));
-            result +=rmsDriverCapacityMapper.updateByPrimaryKeySelective(rmsDriverCapacity);
             BigDecimal orderId = omstruckOrderMapper.selectMaxId();
             // 添加总实绩
             Map<String,Object> orderIdMap = new HashMap<>();
+            orderIdMap.put("orderId",orderId);
             tmsTruckFeign.addTotalResult(orderIdMap);
             omstruckOrder.setOrderId(orderId);
             omstruckOrder.setOrderPlanId(new BigDecimal(planId));
@@ -1212,6 +1209,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setOrderNumber(orderNumber);
             omstruckOrder.setOrderIssueTime(new Date());
             omstruckOrder.setOrderStatus(new BigDecimal(3));
+            omstruckOrder.setCapacityId(capacityId);
             omstruckOrder.setInsertTime(new Date());
             omstruckOrder.setUpdateTime(new Date());
             omstruckOrder.setInsertUsername("admin");

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-DEV

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-PROD

src/main/resources/bootstrap.yml

@@ -45,7 +45,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:192.168.1.104:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:

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

@@ -2768,28 +2768,29 @@
 
     <!--  查询内转运输订单给APP 9 10 11-->
     <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-        SELECT OO.ORDER_ID        "orderId",
-               OO.ORDER_NUMBER    "orderNumber",
-               OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               RS.SUPPLIER_NAME   "loadName",
-               RW.WAREHOUSE_NAME  "unloadName",
-               OO.ORDER_TYPE      "orderType"
-        FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-                           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
-                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-                 LEFT JOIN AMS_PURCHASE_ORDER APO
-                           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-                 LEFT JOIN RMS_SUPPLIER RS
-                           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-                 LEFT JOIN RMS_WAREHOUSE RW
-                           ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+       SELECT OO.ORDER_ID            "orderId",
+              OO.ORDER_NUMBER        "orderNumber",
+              OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+              RC.CAPACITY_NUMBER     "capacityNumber",
+              rwl.warehouse_name     "loadName",
+              RW.WAREHOUSE_NAME      "unloadName",
+              OO.ORDER_TYPE          "orderType"
+         FROM OMSTRUCK_ORDER OO
+         LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
+         LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+         left join rms_warehouse rwl
+           on rwl.warehouse_id = air.requirement_platform_id
+         LEFT JOIN AMS_PURCHASE_ORDER APO
+           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+         LEFT JOIN RMS_SUPPLIER RS
+           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+         LEFT JOIN RMS_WAREHOUSE RW
+           ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
+         LEFT JOIN RMS_CAPACITY RC
+           ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
-
     </select>
     <!--  查询发运计划运输订单给APP  2 3 4 -->
     <select id="getFYJHOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">

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

@@ -383,6 +383,16 @@
   <select id="getOrderMaterialIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
     select OOM.ORDER_MATERIAL_ID from OMSTRUCK_ORDER_MATERIAL OOM where OOM.ORDER_ID = #{orderId}
   </select>
+  <select id="getUnloadOrderMaterial" resultType="java.util.Map" parameterType="java.util.Map">
+    select RM.MATERIAL_NAME "materialName",
+       RM.MATERIAL_SPECIFICATION || rm.material_model "materialSpeModel"
+  from OMSTRUCK_ORDER oo
+  LEFT JOIN OMSTRUCK_ORDER_MATERIAL oom
+    on oom.ORDER_ID = oo.ORDER_ID
+  LEFT JOIN RMS_MATERIAL RM
+    on RM.MATERIAL_ID = OOM.MATERIAL_ID
+  where oo.ORDER_NUMBER = #{orderNumber}
+  </select>
   <!--  //通过订单号获取计量实绩主键
       BigDecimal selectWeightResultId(BigDecimal orderId);-->
 <!--  <select id="selectWeightResultId" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">-->