'物资详情接口'

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

@@ -138,4 +138,32 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+    /**
+     * 展示销售派单物资信息
+     * @param mapValue
+     * @return
+     */
+    @ApiOperation(value="展示销售派单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "销售派单物资信息", required = false, dataType = "java.util.Map"),
+            @ApiImplicitParam(name = "apiId", value = "419", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/getDispatchMaterialList")
+    public RESTfulResult getDispatchMaterialList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer dispatchId){
+        if (mapValue == null) {
+            mapValue.put("dispatchId",dispatchId);
+        }
+        List<Map<String, Object>> dispatchMaterialList = amsDispatchSaleOrderService.getDispatchMaterialList(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> columnDataList = amsDispatchSaleOrderService.getDispatchMaterialList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchMaterialList,columnDataList);
+        return success(pageList);
+    }
+
+
 }

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

@@ -237,4 +237,31 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
         return success(result);
     }
 
+    /**
+     * 展示车序号下的物资详情
+     * @param mapValue
+     * @return
+     */
+    @ApiOperation(value="展示车序号下的物资详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "销售订单物资信息map", required = false, dataType = "java.util.Map"),
+            @ApiImplicitParam(name = "apiId", value = "419", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/getTruckNoMaterialList")
+    public RESTfulResult getTruckNoMaterialList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer saleOrderMaterialId){
+        if (mapValue == null) {
+            mapValue.put("saleOrderMaterialId",saleOrderMaterialId);
+        }
+        List<Map<String, Object>> truckNoMaterialList = amsSaleOrderMaterialService.getTruckNoMaterialList(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> columnDataList = amsSaleOrderMaterialService.getTruckNoMaterialList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, truckNoMaterialList,columnDataList);
+        return success(pageList);
+    }
+
 }

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

@@ -37,4 +37,7 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
 
     // 空与非空
     List<Map<String,Object>> getNullOrNotNull(BigDecimal dispatchId);
+
+    // 展示销售派单物资信息
+    List<Map<String, Object>> getDispatchMaterialList(Map<String, Object> mapValue);
 }

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

@@ -34,4 +34,7 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
 
     // 车序号信息
     List<Map<String, Object>> getTruckNoList(Map<String, Object> mapValue);
+
+    // 物资详情
+    List<Map<String, Object>> getTruckNoMaterialList(Map<String, Object> mapValue);
 }

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

@@ -71,4 +71,7 @@ public interface IAmsDispatchSaleOrderService{
 
     // 新增定向派单且直接下发
     int addDispatchSaleOrder(Map<String, Object> mapValue);
+
+    // 展示销售派单物资信息
+    List<Map<String, Object>> getDispatchMaterialList(Map<String, Object> mapValue);
 }

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

@@ -48,4 +48,7 @@ public interface IAmsSaleOrderMaterialService{
 
     // 下发车序号
     int issueTruckNo(List<Map<String, Object>> mapList);
+
+    // 展示车序号下的物资详情
+    List<Map<String, Object>> getTruckNoMaterialList(Map<String, Object> mapValue);
 }

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

@@ -456,4 +456,15 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         }
         return result;
     }
+
+    /**
+     * 展示销售派单物资信息
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getDispatchMaterialList(Map<String, Object> mapValue) {
+        List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getDispatchMaterialList(mapValue);
+        return mapList;
+    }
 }

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

@@ -263,4 +263,15 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
         }
         return result;
     }
+
+    /**
+     * 展示车序号下的物资详情
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getTruckNoMaterialList(Map<String, Object> mapValue) {
+        List<Map<String, Object>> mapList = amsSaleOrderMaterialMapper.getTruckNoMaterialList(mapValue);
+        return mapList;
+    }
 }

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

@@ -623,4 +623,24 @@
         </if>
     </sql>
 
+    <!-- 展示销售派单物资信息 -->
+    <select id="getDispatchMaterialList" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT
+            RM.MATERIAL_ID AS "materialId",
+            RM.MATERIAL_NAME AS "materialName",
+            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+            RM.MATERIAL_CODE AS "materialCode",
+            ASTM.SALE_ORDER_MATERIAL_NUMBER AS "materialNumber"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+            ON ASOM.SALE_ORDER_MATERIAL_ID = ADSO.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 = ASM.MATERIAL_ID
+        WHERE ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
 </mapper>

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

@@ -648,5 +648,20 @@
     <include refid="orderBy"></include>
   </select>
 
-
+  <select id="getTruckNoMaterialList" parameterType="java.util.Map" resultType="java.util.Map" >
+    SELECT
+        RM.MATERIAL_ID AS "materialId",
+           RM.MATERIAL_NAME AS "materialName",
+           RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+           RM.MATERIAL_CODE AS "materialCode",
+           ASTM.SALE_ORDER_MATERIAL_NUMBER AS "materialNumber"
+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
+LEFT JOIN RMS_MATERIAL RM
+ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+  </select>
 </mapper>