'销售master'

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

@@ -77,11 +77,11 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer carrierId){
+                                              String carrierSSOId){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        mapValue.put("carrierId",new BigDecimal(carrierId));
+        mapValue.put("carrierSSOId",carrierSSOId);
         List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
@@ -140,29 +140,14 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
 
     /**
      * 展示销售派单物资信息
-     * @param mapValue
+     * @param dispatchId
      * @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);
+    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId){
+        List<Map<String, Object>> dispatchMaterialList = amsDispatchSaleOrderService.getDispatchMaterialList(new BigDecimal(dispatchId));
+        return success(dispatchMaterialList);
     }
 
 

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

@@ -239,29 +239,26 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
 
     /**
      * 展示车序号下的物资详情
-     * @param mapValue
+     * @param saleOrderMaterialId
      * @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);
+    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId){
+        List<Map<String, Object>> truckNoMaterialList = amsSaleOrderMaterialService.getTruckNoMaterialList(new BigDecimal(saleOrderMaterialId));
+        return success(truckNoMaterialList);
+    }
+
+    /**
+     * 展示销售订单下的物资详情
+     * @param saleOrderId
+     * @return
+     */
+    @ApiOperation(value="展示销售订单下的物资详情")
+    @PostMapping(value = "/getSaleMaterialList")
+    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId){
+        List<Map<String, Object>> saleMaterialList = amsSaleOrderMaterialService.getSaleMaterialList(new BigDecimal(saleOrderId));
+        return success(saleMaterialList);
     }
 
 }

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

@@ -39,5 +39,8 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
     List<Map<String,Object>> getNullOrNotNull(BigDecimal dispatchId);
 
     // 展示销售派单物资信息
-    List<Map<String, Object>> getDispatchMaterialList(Map<String, Object> mapValue);
+    List<Map<String, Object>> getDispatchMaterialList(BigDecimal dispatchId);
+
+    // 通过ssoid查询承运商
+    BigDecimal getCarrierIdBySSO(String carrierSSOId);
 }

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

@@ -36,5 +36,8 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
     List<Map<String, Object>> getTruckNoList(Map<String, Object> mapValue);
 
     // 物资详情
-    List<Map<String, Object>> getTruckNoMaterialList(Map<String, Object> mapValue);
+    List<Map<String, Object>> getTruckNoMaterialList(BigDecimal saleOrderMaterialId);
+
+    // 销售订单下的
+    List<Map<String, Object>> getSaleMaterialList(BigDecimal saleOrderId);
 }

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

@@ -73,5 +73,5 @@ public interface IAmsDispatchSaleOrderService{
     int addDispatchSaleOrder(Map<String, Object> mapValue);
 
     // 展示销售派单物资信息
-    List<Map<String, Object>> getDispatchMaterialList(Map<String, Object> mapValue);
+    List<Map<String, Object>> getDispatchMaterialList(BigDecimal dispatchId);
 }

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

@@ -50,5 +50,8 @@ public interface IAmsSaleOrderMaterialService{
     int issueTruckNo(List<Map<String, Object>> mapList);
 
     // 展示车序号下的物资详情
-    List<Map<String, Object>> getTruckNoMaterialList(Map<String, Object> mapValue);
+    List<Map<String, Object>> getTruckNoMaterialList(BigDecimal saleOrderMaterialId);
+
+    // 销售订单下的物资
+    List<Map<String, Object>> getSaleMaterialList(BigDecimal saleOrderId);
 }

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

@@ -253,6 +253,9 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
      */
     @Override
     public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> mapValue) {
+        String carrierSSOId = (String) mapValue.get("carrierSSOId");
+        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSSOId);
+        mapValue.put("carrierId",carrierId);
         List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(mapValue);
         if (mapList == null) {
             return null;
@@ -459,12 +462,12 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
 
     /**
      * 展示销售派单物资信息
-     * @param mapValue
+     * @param dispatchId
      * @return
      */
     @Override
-    public List<Map<String, Object>> getDispatchMaterialList(Map<String, Object> mapValue) {
-        List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getDispatchMaterialList(mapValue);
+    public List<Map<String, Object>> getDispatchMaterialList(BigDecimal dispatchId) {
+        List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getDispatchMaterialList(dispatchId);
         return mapList;
     }
 }

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

@@ -266,12 +266,23 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
 
     /**
      * 展示车序号下的物资详情
-     * @param mapValue
+     * @param saleOrderMaterialId
      * @return
      */
     @Override
-    public List<Map<String, Object>> getTruckNoMaterialList(Map<String, Object> mapValue) {
-        List<Map<String, Object>> mapList = amsSaleOrderMaterialMapper.getTruckNoMaterialList(mapValue);
+    public List<Map<String, Object>> getTruckNoMaterialList(BigDecimal saleOrderMaterialId) {
+        List<Map<String, Object>> mapList = amsSaleOrderMaterialMapper.getTruckNoMaterialList(saleOrderMaterialId);
         return mapList;
     }
+
+    /**
+     * 销售订单下的物资
+     * @param saleOrderId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSaleMaterialList(BigDecimal saleOrderId) {
+        List<Map<String, Object>> saleMaterialList = amsSaleOrderMaterialMapper.getSaleMaterialList(saleOrderId);
+        return saleMaterialList;
+    }
 }

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

@@ -624,7 +624,7 @@
     </sql>
 
     <!-- 展示销售派单物资信息 -->
-    <select id="getDispatchMaterialList" parameterType="java.util.Map" resultType="java.util.Map" >
+    <select id="getDispatchMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
         SELECT
             RM.MATERIAL_ID AS "materialId",
             RM.MATERIAL_NAME AS "materialName",
@@ -643,4 +643,10 @@
         WHERE ADSO.DISPATCH_ID = #{dispatchId}
     </select>
 
+    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
+        SELECT
+            RC.CARRIER_ID AS "carrierId"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_SSO_ID = #{carrierSSOId}
+    </select>
 </mapper>

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

@@ -1173,28 +1173,6 @@
            RC.CONSIGNEE_COMPANY_NAME                        "consigneeCompanyName",
            ASO.SALE_ORDER_ISSELF_MENTION                    "saleOrderIsselfMention",
            ADSO.DISPATCH_TIME                               "dispatchTime",
-           (
-             SELECT *
-             FROM (
-                    SELECT RM.MATERIAL_NAME
-                    FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
-                    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 ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
-                    ORDER BY ASTM.TRUCKNO_MATERIAL_ID
-                  )
-             WHERE ROWNUM = 1
-           ) "materialName",
-           (
-             SELECT *
-             FROM (
-                    SELECT ASTM.MATERIAL_THEORETICAL_WEIGHT
-                    FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
-                    WHERE ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
-                    ORDER BY ASTM.TRUCKNO_MATERIAL_ID
-                  )
-             WHERE ROWNUM = 1
-             ) "weight",
            ADSO.INSERT_TIME AS "insertTime"
     FROM AMS_SALE_ORDER ASO
            JOIN AMS_SALE_ORDER_MATERIAL ASOM

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

@@ -648,7 +648,7 @@
     <include refid="orderBy"></include>
   </select>
 
-  <select id="getTruckNoMaterialList" parameterType="java.util.Map" resultType="java.util.Map" >
+  <select id="getTruckNoMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
     SELECT
         RM.MATERIAL_ID AS "materialId",
            RM.MATERIAL_NAME AS "materialName",
@@ -664,4 +664,16 @@ LEFT JOIN RMS_MATERIAL RM
 ON RM.MATERIAL_ID = ASM.MATERIAL_ID
 WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
   </select>
+  
+  <select id="getSaleMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
+        SELECT
+        RM.MATERIAL_NAME AS "materialName",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+        ASM.MATERIAL_NUMBER AS "materialNumber",
+        ASM.MATERIAL_WEIGHT AS "materialWeight"
+        FROM AMS_SALE_MATERIAL ASM
+        LEFT JOIN RMS_MATERIAL RM
+        ON ASM.MATERIAL_ID = RM.MATERIAL_ID
+        WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
+  </select>
 </mapper>