'销售dev'

pom.xml

@@ -109,7 +109,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>-->
+                        <param>OMSTRUCK_ORDER_MATERIAL</param>
 <!--                    <param>TMSTRAIN_WEIGHT_RESULT</param>-->
                     </tables>
                 </configuration>

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

@@ -214,6 +214,9 @@ 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  2 3 4
     Map<String, Object> getFYJHOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 

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

@@ -359,6 +359,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //修改运输订单运力ID
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        BigDecimal orderType;
+        if(map.get("orderType") == null){
+            //查询订单类型
+            orderType = new BigDecimal(omstruckOrderMapper.getOrderTypeByOrderNumber(orderId));
+        }else{
+            orderType = DataChange.dataToBigDecimal(map.get("orderType"));
+        }
         omstruckOrder.setOrderId(orderId);
         if (map.get("unloadPointId") != null) {
             omstruckOrder.setUnloadPointId(DataChange.dataToBigDecimal(map.get("unloadPointId")));
@@ -372,8 +379,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         if(map.get("unloadPointId")!=null || map.get("capacityId") != null || map.get("orderEntryTime") != null){
             omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         }
-        Integer orderType = (Integer) map.get("orderType");
-        switch (orderType) {
+        switch (orderType.intValue()) {
             case 1:
                 break;
             case 2:
@@ -393,16 +399,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
                 if (map.get("orderMaterialWeight") != null) {
                     omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map.get("orderMaterialWeight")));
-                    if(orderType == 8)
+                    if(orderType.intValue() == 8)
                         amsFeign.updateMaterial(map);//修改运输计划子表 已分配未分配重量
                 }
                 if(map.get("orderMaterialNumber") != null) {
                     omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map.get("orderMaterialNumber")));
                 }
-                    if (map.get("materialId") != null) {
+                if (map.get("materialId") != null) {
                     omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
                 }
-                omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
+                if(map.get("orderMaterialWeight") != null || map.get("orderMaterialNumber") != null || map.get("materialId") != null){
+                    omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
+                }
                 break;
             case 9:
                 break;
@@ -454,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
@@ -1610,6 +1619,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 10:
             case 11:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(orderId);
+                break;
+            case 12:
+                mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
+
         }
         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: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     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: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-PROD

src/main/resources/bootstrap.yml

@@ -41,24 +41,25 @@ redis:
   database: 0
 
 #feign设置
-openfeign:
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8055}
-    #测试环境
+#正式环境
+#openfeign:
 #  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:
@@ -71,6 +72,6 @@ mybatis:
 
 server:
 #  正式
-  port: 8095
+#  port: 8095
   #测试
-#  port: 8016
+  port: 8016

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

@@ -644,29 +644,33 @@
         select
                 OO.ORDER_ID "orderId",
                 APO.PURCHASE_ORDER_ID "purchaseOrderId",
-                AP.PLAN_ID "planId",
                 APO.PURCHASE_ORDER_NO "purchaseOrderNo",
                 RM.MATERIAL_NAME "materialName",
+            <if test="orderTypee == 8">
                 AP.PLAN_NO "planNo",
+                AP.PLAN_ID "planId",
+                to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
+                to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
+            </if>
                 RC.CAPACITY_NUMBER "capacityNumber",
                 RC.CAPACITY_ID "capacityId",
                 OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-                to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
-                to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
                 OO.INSERT_USERNAME "insertUsername",
                 OO.INSERT_TIME "insertTime",
                 OO.ORDER_NUMBER "orderNumber",
                 RW.WAREHOUSE_NAME "warehouseName", --卸货点
                 to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
                 RS.SUPPLIER_NAME "supplierName", --发货单位
-                RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位,
+                RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
                 OO.ORDER_ISSUE_TIME "orderIssueTime"
 
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
         on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
-        left join AMSTRUCK_PURPLAN AP
-        on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
+        <if test="orderTypee == 8">
+            left join AMSTRUCK_PURPLAN AP
+            on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
+        </if>
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -681,12 +685,12 @@
         on APO.RECEIVE_UNIT_ID = RCSE.CONSIGNEE_ID
         <where>
             <choose>
-                <when test="orderStatus != 8">
+                <when test="orderStatus != 111">
                     and OO.ORDER_STATUS = #{orderStatus}
                 </when>
-                <otherwise>
+                <when test="orderStatus == 111">
                     and OO.ORDER_STATUS in (0, 1, 2, 4, 5, 6)
-                </otherwise>
+                </when>
             </choose>
             <if test="planId != null ">
                 and AP.PLAN_ID = #{planId}
@@ -1185,7 +1189,7 @@
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
-    <!--  通过运输订单ID查询运输订单相关信息 -->
+    <!--  通过运输订单ID查询运输订单相关信息 仅限单拼 -->
     <select id="getOrderByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         SELECT APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
                RC.CAPACITY_NUMBER        "capacityNumber",
@@ -1502,6 +1506,7 @@
                  left join RMS_CAPACITY RC
                            on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_ID = #{orderId}
+                and rownum = 1
     </select>
 
 
@@ -2743,6 +2748,20 @@
           AND OO.ORDER_STATUS in (4, 5)
     </select>
 
+<!--查询采购零星物资信息给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"
+        FROM OMSTRUCK_ORDER OO
+        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 9 10 11-->
     <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         SELECT OO.ORDER_ID        "orderId",

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

@@ -391,7 +391,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 +403,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">