Merge branch 'master' into dev

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

@@ -379,7 +379,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                          Integer fuelOrder, String con) {
+                                          Integer fuelOrder,
+                                          String con,
+                                          String carrierSSOId) {
         int count = 0;
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
@@ -397,6 +399,12 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("fuelOrder", fuelOrder);
             count++;
         }
+        if(carrierSSOId != null){
+            if("".equals(carrierSSOId)) {
+                mapValue.put("carrierSSOId", carrierSSOId);
+                count++;
+            }
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {

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

@@ -223,4 +223,20 @@ 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));
+    }
+
+    /**
+     * 承运商销售分派运输订单给司机
+     * @param mapValue
+     * @return
+     */
+    @PostMapping("/addSaleTruckOrder")
+    public RESTfulResult addSaleTruckOrder(@RequestBody Map<String, Object> mapValue){
+        Integer result = omstruckOrderSeparateService.addSaleTruckOrder(mapValue);
+        return success(result);
+    }
 }

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

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsSaleOrderMaterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMaterial, BigDecimal> {
+}

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

@@ -214,12 +214,19 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //查询内转运输订单给APP 9 10 11
     Map<String, Object> getNZOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
+    //查询采购零星物资订单给app 12
+    Map<String,Object>  getSporadicOrder(@Param("orderId") BigDecimal orderId);
+
+    //查询采购零星物资出厂订单给app 13
+    Map<String,Object> getLxOutFactoryOrder(@Param("orderId") BigDecimal orderId);
+
     //查询发运计划运输订单给APP  2 3 4
     Map<String, Object> getFYJHOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
     //查询销售运输订单给APP 1
     Map<String, Object> getXSOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 
+
     //通过运输订单号查询运输订单类型
     Integer getOrderTypeByOrderNumber(@Param("orderId") BigDecimal orderId);
 

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/mapper/OmstruckOrderSeparateMapper.java

@@ -70,4 +70,7 @@ public interface OmstruckOrderSeparateMapper {
 
     //查询零星物资出厂订单信息（还未分配车辆）状态：3  13
     List<Map<String, Object>> getOthersOrderMesToSend(Map<String, Object> map);
+
+    // 查询销售订单的物资件数或重量
+    List<Map<String, Object>> getWeightOrNumber(BigDecimal saleOrderMaterialId);
 }

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);
+    // 承运商销售分派运输订单给司机
+    Integer addSaleTruckOrder(Map<String, Object> mapValue);
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
+import com.steerinfo.dil.mapper.AmsSaleOrderMaterialMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderSeparateMapper;
@@ -28,6 +29,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     @Autowired
     private OmstruckOrderSeparateMapper omstruckOrderSeparateMapper;
 
+    @Autowired
+    AmsSaleOrderMaterialMapper amsSaleOrderMaterialMapper;
+
     @Autowired
     private OmstruckOrderMapper omstruckOrderMapper;
 
@@ -311,4 +315,82 @@ 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);
+    }
+
+    /**
+     * 承运商销售分派运输订单给司机
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public Integer addSaleTruckOrder(Map<String, Object> mapValue) {
+        Integer orderType = (Integer) mapValue.get("orderType");
+        Integer lineId = (Integer) mapValue.get("lineId");
+        BigDecimal dispatchId = DataChange.dataToBigDecimal(mapValue.get("dispatchId"));
+        String capacityNumber = (String) mapValue.get("capacityNumber");
+        OmstruckOrder omstruckOrder = new OmstruckOrder();
+        BigDecimal orderId = omstruckOrderMapper.selectMaxId();
+        Map<String,Object> orderIdMap = new HashMap<>();
+        orderIdMap.put("orderId",orderId);
+        tmsTruckFeign.addTotalResult(orderIdMap);
+        omstruckOrder.setOrderId(orderId);
+        BigDecimal saleOrderMaterialId = omstruckOrderMapper.getSaleMaterialId(dispatchId);
+        // 查询销售订单中是物资重量还是件数
+        List<Map<String, Object>> materialMapList = omstruckOrderSeparateMapper.getWeightOrNumber(saleOrderMaterialId);
+        omstruckOrder.setOrderPlanId(saleOrderMaterialId);
+        String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
+        omstruckOrder.setOrderNumber(orderNumber);
+        omstruckOrder.setLineId(new BigDecimal(lineId));
+        omstruckOrder.setOrderIssueTime(new Date());
+        omstruckOrder.setOrderStatus(new BigDecimal(4));
+        omstruckOrder.setInsertTime(new Date());
+        omstruckOrder.setUpdateTime(new Date());
+        omstruckOrder.setInsertUsername("admin");
+        omstruckOrder.setUpdateUsername("admin");
+        omstruckOrder.setInsertUpdateRemark("无");
+        omstruckOrder.setDeleted(new BigDecimal(0));
+        omstruckOrder.setOrderType(new BigDecimal(orderType));
+        BigDecimal capacityId = omstruckOrderMapper.getCapacityId(capacityNumber);
+        omstruckOrder.setCapacityId(capacityId);
+        List<Map<String, Object>> mapList = omstruckOrderMapper.getMaterialMessages(dispatchId);
+        if (mapList != null && mapList.size() != 0) {
+            for (Map<String, Object> map : mapList) {
+                OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+                BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+                omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+                omstruckOrderMaterial.setOrderId(orderId);
+                omstruckOrderMaterial.setInsertTime(new Date());
+                omstruckOrderMaterial.setUpdateTime(new Date());
+                omstruckOrderMaterial.setInsertUsername("admin");
+                omstruckOrderMaterial.setUpdateUsername("admin");
+                omstruckOrderMaterial.setInsertUpdateRemark("无");
+                if (map != null) {
+                    BigDecimal saleOrderMaterialNumber = (BigDecimal) map.get("saleOrderMaterialNumber");
+                    BigDecimal materialId = (BigDecimal) map.get("materialId");
+                    omstruckOrderMaterial.setMaterialId(materialId);
+                    // 判断是重量还是件数
+                    if (materialMapList != null) {
+                        BigDecimal saleMaterialNumber = (BigDecimal) materialMapList.get(0).get("materialNumber");
+                        if (saleMaterialNumber != null && saleMaterialNumber.toString().length() != 0) {
+                            omstruckOrderMaterial.setOrderMaterialNumber(saleOrderMaterialNumber);
+                        }
+                        else {
+                            omstruckOrderMaterial.setOrderMaterialWeight(saleOrderMaterialNumber);
+                        }
+                    }
+
+                }
+                omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+            }
+        }
+        int result = omstruckOrderMapper.insertSelective(omstruckOrder);
+        // 调用websocket推送数据给司机
+        pushMesToWebsocket(orderIdMap);
+        return result;
+    }
 }

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

@@ -462,7 +462,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result = 0;
         for (Map<String, Object> map : mapList) {
             Integer orderId = (Integer) map.get("orderId");
-            OmstruckOrder omstruckOrder = omstruckOrderMapper.selectByPrimaryKey(new BigDecimal(orderId));
+            OmstruckOrder omstruckOrder = new OmstruckOrder();
+            omstruckOrder.setOrderId(new BigDecimal(orderId));
             //生成订单下发时间 修改订单表
             omstruckOrder.setOrderIssueTime(new Date());
             //设置状态为已下发：4
@@ -739,8 +740,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //新增运输订单
         omstruckOrderMapper.insertSelective(omstruckOrder);
         //更新运力状态为待运输：2
-        map.put("capacityStatus", 2);
-        omstruckOrderMapper.updateCapacityById(map);
+//        map.put("capacityStatus", 2);
+//        omstruckOrderMapper.updateCapacityById(map);
         //新增运输订单子表
         addOrderMaterial(map, omstruckOrder.getOrderId());
         //新增实绩总表关联订单 feign调用
@@ -1071,7 +1072,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      * @param carrierId
      * @return
      */
-    @Transactional
     @Override
     public int addAppTruckOrder(Integer dispatchId, Integer orderType, String capacityNumber, Integer carrierId) {
         OmstruckOrder omstruckOrder = new OmstruckOrder();
@@ -1124,12 +1124,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
         }
-        RmsCapacity rmsCapacity = rmsCapacityMapper.selectByPrimaryKey(capacityId);
-        rmsCapacity.setCapacityStatus(new BigDecimal(2));
-        rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+//        RmsCapacity rmsCapacity = new RmsCapacity();
+//        rmsCapacity.setCapacityId(capacityId);
+//        rmsCapacity.setCapacityStatus(new BigDecimal(2));
+//        rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+        int result = omstruckOrderMapper.insertSelective(omstruckOrder);
         // 调用websocket推送数据给司机
         pushMesToWebsocket(orderIdMap);
-        return omstruckOrderMapper.insertSelective(omstruckOrder);
+        return result;
     }
 
     /**
@@ -1192,18 +1194,15 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             capacityMap.put("capacityNumber",capacityNumber);
             List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(capacityMap);
             RmsCapacity rmsCapacity = rmsCapacities.get(0);
-            rmsCapacity.setCapacityStatus(new BigDecimal(2));
+//            rmsCapacity.setCapacityStatus(new BigDecimal(2));
             result +=rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
             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));
@@ -1211,6 +1210,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");
@@ -1617,6 +1617,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 10:
             case 11:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(orderId);
+                break;
+            case 12:
+                mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
+            case 13:
+                mesMap = omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
+
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
         return mesMap;

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

@@ -42,24 +42,26 @@ redis:
 
 #feign设置
 openfeign:
-  #正式环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.166:8079}
-#  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.166:8055}
-    #测试环境
+#正式环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8018}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+
+    #测试环境
+#  ColumnDataFeign:
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
+#  TmsTruckFeign:
+#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+#  AmsFeign:
+#    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+#  ImFeign:
+#    url: ${IMFEIGN_URL:172.16.33.166:8018}
 
 
 mybatis:
@@ -72,6 +74,6 @@ mybatis:
 
 server:
   #正式
-#  port: 8095
+   port: 8095
   #测试
-  port: 8016
+#  port: 8016

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

@@ -673,6 +673,10 @@
         </if>
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+            on RCA.CARRIER_ID = RC.CARRIER_ID
+        </if>
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
@@ -701,6 +705,9 @@
             <if test="fuelOrder != null">
                 and OO.ORDER_TYPE in (6, 7)
             </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
         </where>
         )
         <where>
@@ -1501,17 +1508,12 @@
     <!--通过运输订单ID查询数据 用于websocket推送数据  如果订单实绩中有卸货点  没有卸货点通过传入的卸货点进行查询-->
     <select id="pushMesToWebsocket" parameterType="java.util.Map" resultType="java.util.Map">
         select OO.ORDER_NUMBER           "orderNumber",
-               OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-               RM.MATERIAL_NAME          "materialName",
                RC.CAPACITY_NUMBER        "capacityNumber"
         from OMSTRUCK_ORDER OO
                  left join RMS_CAPACITY RC
                            on RC.CAPACITY_ID = OO.CAPACITY_ID
-                 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_ID = #{orderId}
+                and rownum = 1
     </select>
 
 
@@ -2275,14 +2277,16 @@
                RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
                ASTM.MATERIAL_THEORETICAL_WEIGHT               AS "materialTheoreticalWeight",
                ASTM.SALE_ORDER_MATERIAL_NUMBER                AS "saleOrderMaterialNumber",
-               ASTM.MATERIAL_ID                               AS "materialId"
+               ASM.MATERIAL_ID                               AS "materialId"
         FROM AMS_DISPATCH_SALE_ORDER ADSO
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_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
+            ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
                  LEFT JOIN RMS_MATERIAL RM
-                           ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+                           ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         WHERE ADSO.DISPATCH_ID = #{dispatchId}
     </select>
 
@@ -2751,30 +2755,54 @@
           AND OO.ORDER_STATUS in (4, 5)
     </select>
 
-    <!--  查询内转运输订单给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"
+<!--查询采购零星物资信息给app 12 -->
+    <select id="getSporadicOrder" 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",
+                OO.ORDER_TYPE      "orderType",
+                RS.SUPPLIER_NAME  "shipperName",
+                RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+
         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
+                 left join AMSTRUCK_SPORADIC_ORDER ASO
+                           ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_SUPPLIER RS
+                           ON RS.SUPPLIER_ID=ASO.SEND_UNIT_ID
+                 LEFT JOIN RMS_CONSIGNEE RC2
+                           ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
+          AND OO.ORDER_STATUS in (4, 5)
+    </select>
 
+    <!--  查询内转运输订单给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",
+              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} AND OO.ORDER_STATUS in (4, 5)
     </select>
     <!--  查询发运计划运输订单给APP  2 3 4 -->
     <select id="getFYJHOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -2796,7 +2824,7 @@
                            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>
     <!--  查询销售运输订单给APP 1 -->
     <select id="getXSOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -2824,9 +2852,10 @@
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
                  LEFT JOIN RMS_RECEIVE_ADDRESS RDA
                            ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
-        WHERE OO.ORDER_ID = #{orderId}
+        WHERE OO.ORDER_ID = #{orderId} AND OO.ORDER_STATUS in (4, 5)
     </select>
 
+
     <!--  通过运输订单号查询订单类型  -->
     <select id="getOrderTypeByOrderNumber" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
         SELECT OO.ORDER_TYPE
@@ -2871,4 +2900,26 @@
         from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId}
     </select>
+
+<!--  查询采购零星物资出厂订单给app 13  -->
+    <select id="getLxOutFactoryOrder" 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",
+                OO.ORDER_TYPE      "orderType",
+                RS.SHIPPER_NAME "loadName",
+                RC2.CONSIGNEE_COMPANY_NAME "unloadName"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join AMSTRUCK_SPORADIC_ORDER ASO
+                           ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SEND_UNIT_ID
+                 LEFT JOIN RMS_CONSIGNEE RC2
+                           ON RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+          AND OO.ORDER_STATUS in (4, 5)
+    </select>
 </mapper>

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

@@ -383,6 +383,17 @@
   <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",
+           RM.MATERIAL_ID                                 "materialId"
+    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">-->

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

@@ -167,7 +167,8 @@
 <!--    通过总实绩ID和路段顺序号查询计毛实绩数据 -->
     <select id="getMaoWeightMes" parameterType="map" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
-               TWR.RESULT_GROSS_WEIGHT_TIME "pointDate"
+               TWR.RESULT_GROSS_WEIGHT_TIME "pointDate",
+               TWR.RESULT_GROSS_WEIGHT     "weight"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join RMS_TRUCK_CALCULATE RTC
             on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
@@ -187,19 +188,12 @@
 <!--    通过总实绩ID和路段顺序号查询装货实绩数据-->
     <select id="getLoadMes" parameterType="map" resultType="java.util.Map">
         select TLR.RESULT_LOAD_END_TIME "pointDate",
-               (case
-                   when OO.ORDER_TYPE in (1, 4)
-                   then (select RPP.PLATFORM_NAME
-                            from RMS_PWAREHOUSE_PLATFORM RPP
-                            where RPP.PLATFORM_ID = TLR.LOADING_ID )
-                   else (select RW.WAREHOUSE_NAME from RMS_WAREHOUSE RW
-                         where RW.WAREHOUSE_ID = TLR.LOADING_ID)
-               end) "pointName"
+               RW.WAREHOUSE_NAME "pointName"
         from TMSTRUCK_LOAD_RESULT TLR
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-        left join OMSTRUCK_ORDER OO
-            on OO.ORDER_ID = TTR.ORDER_ID
+        left join RMS_WAREHOUSE RW
+            on RW.WAREHOUSE_ID = TLR.LOADING_ID
         where TLR.RESULT_TOTAL_ID = #{resultTotalId} and TLR.SEGMENT_SQE = #{segmentSqe}
     </select>
 
@@ -223,7 +217,8 @@
 <!--  通过总实绩ID和路段顺序号查询计皮实绩数据  -->
     <select id="getPiWeightMes" parameterType="map" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
-               TWR.RESULT_TARE_WEIGHT_TIME "pointDate"
+               TWR.RESULT_TARE_WEIGHT_TIME "pointDate",
+               TWR.RESULT_TARE_WEIGHT       "weight"
         from TMSTRUCK_WEIGHT_RESULT TWR
                  left join RMS_TRUCK_CALCULATE RTC
                            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
@@ -391,7 +386,7 @@
         ASO.SPORADIC_ORDER_NO "sporadicOrderNo",
         OO.ORDER_NUMBER "orderNumber",
         RS.SUPPLIER_NAME "sendCompany",
-        RS2.SUPPLIER_NAME "receiveCompany",
+        RC2.CONSIGNEE_COMPANY_NAME "receiveCompany",
         ASO.INSERT_TIME "insertTime",
         RC.CAPACITY_NUMBER "capacityNumber"
         from OMSTRUCK_ORDER OO
@@ -403,8 +398,8 @@
         on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
-        left join RMS_SUPPLIER RS2
-        on RS2.SUPPLIER_ID = ASO.RECEIVE_UNIT_ID
+        left join RMS_CONSIGNEE RC2
+        on RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
         <where>
             OO.ORDER_STATUS = #{status}
             <if test="type == 1">
@@ -462,5 +457,16 @@
         </if>
     </select>
 
+    <!-- 查询销售订单的物资件数或重量 -->
+    <select id="getWeightOrNumber" parameterType="DECIMAL" resultType="java.util.Map" >
+        SELECT ASM.MATERIAL_NUMBER AS "materialNumber",
+               ASM.MATERIAL_WEIGHT AS "materialWeight"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
 
 </mapper>