tijaoi

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

@@ -184,10 +184,25 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
         return success(i);
     }
 
-    @ApiOperation(value = "内转零星运输计划")
+    @ApiOperation(value = "查运输订单物资详情")
     @PostMapping("/getSporadic")
     public RESTfulResult getSporadic(Integer sporadicId) {
         return success(amstruckSporadicOrderService.getSporadic(sporadicId));
     }
 
+    @ApiOperation(value = "查零星订单物资详情")
+    @PostMapping("/getSporadicOfOrder")
+    public RESTfulResult getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer sporadicId
+                                            ) {
+        mapValue.put("sporadicId",sporadicId);
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String, Object>> columnList = amstruckSporadicOrderService.getSporadicOfOrder(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
+        return success(pageList);
+    }
+
 }

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

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

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

@@ -64,4 +64,6 @@ public interface IAmstruckSporadicOrderService {
 
     List<Map<String,Object>> getSporadic(Integer sporadicId);
 
+    List<Map<String,Object>> getSporadicOfOrder(Map<String,Object> mapValue);
+
 }

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

@@ -168,8 +168,8 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         if (orderTime!=null) {
             amstruckSporadicOrder.setSporadicOrderTimes(DataChange.dataToBigDecimal(orderTime));
         }
-        //设置运输状态默认为启用
-        amstruckSporadicOrder.setTransStatus(new BigDecimal(1));
+        //设置运输状态
+        amstruckSporadicOrder.setTransStatus(DataChange.dataToBigDecimal(map.get("isMoreTrips")));
         if (map.get("carrierId")!=null) {
             amstruckSporadicOrder.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
         }
@@ -340,25 +340,6 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             }
             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;
     }
 
@@ -510,10 +491,17 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         }
         return result;
     }
+    //查看物资详情
     @Override
     public List<Map<String,Object>> getSporadic(Integer sporadicId) {
         return amstruckSporadicMaterialMapper.getSporadic(sporadicId);
     }
+
+    //查询零星订单下的运输订单
+    @Override
+    public List<Map<String, Object>> getSporadicOfOrder(Map<String, Object> mapValue) {
+        return amstruckSporadicMaterialMapper.getSporadicOfOrder(mapValue);
+    }
 }
 
 

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

@@ -472,7 +472,6 @@
   WHERE OO.ORDER_TYPE in (12,13,14)
   AND ASO.ISSUE_STATUS = #{issueStatus}
   AND ASO.DELETED = 0
-  AND ASO.TRANS_STATUS=1
   <if test="userId!=null">
     and ASO.INSERT_USERNAME=#{userId}
   </if>
@@ -595,18 +594,36 @@
     </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"
+  <select id="getSporadic" resultType="java.util.LinkedHashMap" parameterType="java.lang.Integer">
+    select RM.MATERIAL_NAME "materialName",
+           RM.MATERIAL_ID "materialId",
+           OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+           RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+           OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+           OOM.MATERIAL_PRIORITY "materialPriority"
     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
+           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 ASO.SPORADIC_ORDER_ID = #{sporadicId}
+      AND OO.CAPACITY_ID IS NULL
+    ORDER BY OOM.MATERIAL_PRIORITY
+  </select>
+  <select id="getSporadicOfOrder" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+    select OO.ORDER_NUMBER              "orderNum",
+           RC.CAPACITY_NUMBER           "capacityNum",
+           OO.ORDER_LINE_SEQUENCE       "orderLineSqe",
+           OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveTime"
+    from OMSTRUCK_ORDER OO
+           LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO
+                     ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+           LEFT JOIN RMS_CAPACITY RC
+                     ON RC.CAPACITY_ID = OO.CAPACITY_ID
+    WHERE OO.CAPACITY_ID IS NOT NULL
+      AND ASO.SPORADIC_ORDER_ID = #{sporadicId}
   </select>
 
 

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

@@ -539,7 +539,6 @@
         WHERE OO.ORDER_TYPE in (12,13,14)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
-        and   ASO.TRANS_STATUS =1
         <if test="userId!=null">
             and ASO.INSERT_USERNAME=#{userId}
         </if>