adsa

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

@@ -184,6 +184,10 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
         return success(i);
     }
 
-
+    @ApiOperation(value = "内转零星运输计划")
+    @PostMapping("/getSporadic")
+    public RESTfulResult getSporadic(Integer sporadicId) {
+        return success(amstruckSporadicOrderService.getSporadic(sporadicId));
+    }
 
 }

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

@@ -22,4 +22,6 @@ public interface AmstruckSporadicMaterialMapper extends IBaseMapper<AmstruckSpor
 
     List<Map<String,Object>> getSporadicOrdersList4(Map<String,Object> mapValue);
 
+    List<Map<String,Object>> getSporadic(Integer sporadicId);
+
 }

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

@@ -31,4 +31,7 @@ public interface AmstruckSporadicOrderMapper extends IBaseMapper<AmstruckSporadi
     Map<String,Object> selectOrderInfo(Integer orderId);
 
     List<Map<String,Object>> selectOrderIdbySporadicOrderid(Integer sporadicOrderId);
+
+    List<Map<String, Object>> selectOrderMaterial(Integer orderId);
+
 }

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.service;
 
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -59,4 +61,7 @@ public interface IAmstruckSporadicOrderService {
 
     //停止
     int closeSporadic(Map<String,Object> map);
+
+    List<Map<String,Object>> getSporadic(Integer sporadicId);
+
 }

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

@@ -250,9 +250,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         switch (orderType){
             case 12:
             case 13:
-            case 15:
-            case 16:
-            case 19:
+            case 14:
                 addSporadicOrdersForCoke(map);
 
         }
@@ -319,70 +317,48 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
      */
     @Override
     public List<Map<String, Object>> getSporadicOrdersList(Map<String, Object> mapValue) {
-        Integer orderType1 = (Integer) mapValue.get("orderType");
         List<Map<String, Object>> mapList=null;
-        switch (orderType1) {
-            case 12:
-                //apiId：439
-                if (mapValue.get("sporadicStatus") != null) {
-                    //走查询订单id的接口
-                    mapList = amstruckSporadicOrderMapper.getSporadicOrdersList(mapValue);
-                }else {
-                    //不查询订单id的接口
-                    mapList=amstruckSporadicMaterialMapper.getSporadicOrdersList4(mapValue);
-                }
-                for (Map<String, Object> map : mapList) {
-                    BigDecimal type = (BigDecimal) map.get("type");
-                    BigDecimal tranStatus =(BigDecimal) map.get("transStatus");
-                    String orderType = "";
-                    String Status = "";
-                    if (type.intValue() == 12) {
-                        orderType += "内转零星进厂";
-                    }
-                    if (type.intValue() == 13) {
-                        orderType += "内转零星出厂";
-                    }
-                    if (tranStatus.intValue() == 0){
-                        Status += "禁用";
-                    }
-                    if (tranStatus.intValue() == 1){
-                        Status += "启用";
-                    }
-                    map.put("orderType", orderType);
-                    map.put("Status",Status);
-                }
-            case 13:
-                break;
-            case 15:
-                if(mapValue.get("sporadicStatus") != null){
-                    //不查询订单id
-                    mapList = amstruckSporadicMaterialMapper.getSporadicOrdersList2(mapValue);
-                }else{
-                    //查询订单id
-                    mapList = amstruckSporadicOrderMapper.getSporadicOrdersList1(mapValue);
-                }
-                //没有承运商状态为3
-                if (DataChange.dataToBigDecimal(mapValue.get("sporadicStatus")).intValue()==3) {
-                    mapList =amstruckSporadicMaterialMapper.getSporadicOrdersList3(mapValue);
-                }
-                for (Map<String, Object> map1 : mapList) {
-                    BigDecimal type = (BigDecimal) map1.get("type");
-                    String orderType = "";
-                    if (type.intValue() == 15) {
-                        orderType += "普通零星进厂";
-                    }
-                    if (type.intValue() == 16) {
-                        orderType += "普通零星出厂";
-                    }
-                    if (type.intValue() == 19) {
-                        orderType += "普通零星退货";
-                    }
-                    map1.put("orderType", orderType);
-                }
-            case 16:
-            case 19:
-                break;
+        //apiId：439
+        if (mapValue.get("sporadicStatus") != null) {
+            //走查询订单id的接口
+            mapList = amstruckSporadicOrderMapper.getSporadicOrdersList(mapValue);
+        } else {
+            //不查询订单id的接口
+            mapList = amstruckSporadicMaterialMapper.getSporadicOrdersList4(mapValue);
+        }
+        for (Map<String, Object> map : mapList) {
+            BigDecimal type = (BigDecimal) map.get("type");
+            String orderType = "";
+            if (type.intValue() == 12) {
+                orderType += "零星进厂";
+            }
+            if (type.intValue() == 13) {
+                orderType += "零星出厂";
+            }
+            if (type.intValue() == 14) {
+                orderType += "中转";
+            }
+            map.put("orderType", orderType);
         }
+//        //没有承运商状态为3
+//        if (DataChange.dataToBigDecimal(mapValue.get("sporadicStatus")).intValue() == 3) {
+//            mapList = amstruckSporadicMaterialMapper.getSporadicOrdersList3(mapValue);
+//        }
+//        for (Map<String, Object> map1 : mapList) {
+//            BigDecimal type = (BigDecimal) map1.get("type");
+//            String orderType = "";
+//            if (type.intValue() == 15) {
+//                orderType += "普通零星进厂";
+//            }
+//            if (type.intValue() == 16) {
+//                orderType += "普通零星出厂";
+//            }
+//            if (type.intValue() == 19) {
+//                orderType += "普通零星退货";
+//            }
+//            map1.put("orderType", orderType);
+//
+//        }
         return mapList;
     }
 
@@ -455,7 +431,10 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 //根据运输订单id查找订单信息
                 //生成新的订单
                 OmstruckOrder omstruckOrder=new OmstruckOrder();
+                //查找订单主表数据
                 Map<String, Object> map2 = amstruckSporadicOrderMapper.selectOrderInfo(orderId);
+                //查找订单子表数据
+                List<Map<String,Object>>materialList =amstruckSporadicOrderMapper.selectOrderMaterial(orderId);
                 BigDecimal carrierId =(BigDecimal) map2.get("carrierId");
                 if (carrierId!=null){
                     omstruckOrder.setCarrierId(carrierId);
@@ -478,16 +457,20 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 tmstruckTotalResult.setInsertUsername(userId);
                 result+=tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
                 //新增订单子表
-                OmstruckOrderMaterial omstruckOrderMaterial=new OmstruckOrderMaterial();
-                omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
-                omstruckOrderMaterial.setOrderId(omstruckOrder.getOrderId());
-                omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map2.get("materialId")));
-                omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map2.get("materialNumber")));
-                omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map2.get("materialWeight")));
-                omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(map2.get("materialPriority")));
-                omstruckOrderMaterial.setInsertTime(new Date());
-                omstruckOrderMaterial.setInsertUsername(userId);
-                omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+                for (Map<String,Object>materialMap:materialList
+                     ) {
+                    OmstruckOrderMaterial omstruckOrderMaterial=new OmstruckOrderMaterial();
+                    omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
+                    omstruckOrderMaterial.setOrderId(omstruckOrder.getOrderId());
+                    omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(materialMap.get("materialId")));
+                    omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(materialMap.get("materialNumber")));
+                    omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(materialMap.get("materialWeight")));
+                    omstruckOrderMaterial.setMaterialPriority(DataChange.dataToBigDecimal(materialMap.get("materialPriority")));
+                    omstruckOrderMaterial.setInsertTime(new Date());
+                    omstruckOrderMaterial.setInsertUsername(userId);
+                    omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+                }
+
                 //设置运力id
                 Integer capacityId = (Integer) map1.get("capacityId");
                 omstruckOrder.setOrderId(orderId1);
@@ -502,28 +485,6 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
     }
 
 
-//    //内转零星停止
-//    @Override
-//    public int closeSporadicOrderInward(Map<String, Object> map) {
-//        int result=0;
-//        BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
-//        AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
-//        amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
-//
-//        result+=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
-//        //查找零星订单下的所有未接收的运输订单
-//        List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
-//        for (Map<String,Object> map1:stringObjectMap) {
-//            //获取零星订单关联的未接收的订单
-//            BigDecimal orderId =(BigDecimal) map1.get("orderId");
-//            OmstruckOrder omstruckOrder=new OmstruckOrder();
-//            omstruckOrder.setOrderId(orderId);
-//            omstruckOrder.setOrderStatus(new BigDecimal(8));
-//            result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-//        }
-//        return result;
-//
-//    }
 
 
     @Override
@@ -549,6 +510,10 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         }
         return result;
     }
+    @Override
+    public List<Map<String,Object>> getSporadic(Integer sporadicId) {
+        return amstruckSporadicMaterialMapper.getSporadic(sporadicId);
+    }
 }
 
 

src/main/resources/bootstrap.yml

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

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

@@ -459,7 +459,6 @@
   RCA.CARRIER_NAME AS "carrierName",
   ASO.INSERT_TIME AS "insertTime",
   OO.ORDER_TYPE AS "type",
-  RM.MATERIAL_NAME "materialName",
   ASO.TRANS_STATUS "transStatus"
   FROM AMSTRUCK_SPORADIC_ORDER ASO
   LEFT JOIN RMS_CONSIGNEE RCO
@@ -470,12 +469,7 @@
   ON RCA.CARRIER_ID = ASO.CARRIER_ID
   LEFT JOIN OMSTRUCK_ORDER OO
   ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_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_TYPE in (12,13)
+  WHERE OO.ORDER_TYPE in (12,13,14)
   AND ASO.ISSUE_STATUS = #{issueStatus}
   AND ASO.DELETED = 0
   AND ASO.TRANS_STATUS=1
@@ -601,8 +595,19 @@
     </where>
     <include refid="orderBy"></include>
   </select>
-
-
+  <select id="getSporadic" resultType="java.util.Map" parameterType="java.lang.Integer">
+    select RM.MATERIAL_NAME    "materialName",
+           RM.MATERIAL_ID       "materialId",
+           ASM.MATERIAL_WEIGHT "materialWeight",
+           RM.MATERIAL_SPECIFICATION ||RM.MATERIAL_MODEL "specificationModel",
+           ASM.MATERIAL_NUMBER "materialNumber"
+    from AMSTRUCK_SPORADIC_ORDER ASO
+    LEFT JOIN AMSTRUCK_SPORADIC_MATERIAL ASM
+    ON ASM.SPORADIC_ORDER_ID = ASO.SPORADIC_ORDER_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    WHERE ASO.SPORADIC_ORDER_ID = #{sporadicId}
+  </select>
 
 
   <!-- 排序 -->

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

@@ -526,7 +526,6 @@
         OO.ORDER_TYPE AS "type",
         OO.ORDER_ID "orderId",
         OO.ORDER_STATUS "orderStatus",
-        RM.MATERIAL_NAME "materialName",
         ASO.TRANS_STATUS "transStatus"
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RCO
@@ -537,12 +536,7 @@
         ON RCA.CARRIER_ID = ASO.CARRIER_ID
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_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_TYPE in (12,13)
+        WHERE OO.ORDER_TYPE in (12,13,14)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
         and   ASO.TRANS_STATUS =1
@@ -737,15 +731,9 @@
                OO.ORDER_NUMBER "orderNumber",
                OO.LINE_ID "lineId",
                OO.ORDER_LINE_SEQUENCE "lineSqe",
-               OOM.MATERIAL_ID "materialId",
-               OOM.ORDER_MATERIAL_NUMBER "materialNumber",
-               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
-               OOM.MATERIAL_PRIORITY "materialPriority",
                OO.ORDER_TYPE "orderType",
                OO.CARRIER_ID "carrierId"
         from OMSTRUCK_ORDER OO
-                 left join OMSTRUCK_ORDER_MATERIAL OOM
-                           on OO.ORDER_ID=OOM.ORDER_ID
         where OO.ORDER_ID=#{orderId}
     </select>
 
@@ -755,5 +743,16 @@
         from OMSTRUCK_ORDER OO
         where OO.ORDER_STATUS=4 AND OO.ORDER_PLAN_ID=#{sporadicOrderId}
     </select>
+    <select id="selectOrderMaterial" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select
+               OOM.MATERIAL_ID "materialId",
+               OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+               OOM.MATERIAL_PRIORITY "materialPriority"
+        from OMSTRUCK_ORDER OO
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OO.ORDER_ID=OOM.ORDER_ID
+        where OO.ORDER_ID=#{orderId}
+    </select>
 
 </mapper>