tijioia

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

@@ -1287,4 +1287,15 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         int result = amsSaleOrderService.adverseCloseSaleOrder(new BigDecimal(saleOrderId));
         return success(result);
     }
+
+    //库存调拨单
+    @ApiOperation(value = "库存调拨单")
+    @PostMapping("/getKucunList")
+    public RESTfulResult getKucunList(@RequestBody(required = false)Map<String,Object>map,
+                                      String startTime,
+                                      String endTime){
+        DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        List<Map<String,Object>> mapList = amsSaleOrderService.getKucunList(map);
+        return success(mapList);
+    }
 }

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

@@ -155,4 +155,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     Map<String, Object> getSaleMaterialMessage(BigDecimal saleMaterialId);
 
     int findOrderMaxNum(BigDecimal resultTotalId);
+
+    List<Map<String, Object>> getKucunList(Map<String, Object> map);
+
 }

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

@@ -1,8 +1,5 @@
 package com.steerinfo.dil.service;
 
-import com.steerinfo.dil.model.AmsSaleOrder;
-import com.steerinfo.dil.model.AmsSaleOrderMaterial;
-
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.List;
@@ -169,4 +166,7 @@ public interface IAmsSaleOrderService {
     int adverseCloseSaleMaterial(BigDecimal saleMaterialId);
     // 反关闭整个销售订单
     int adverseCloseSaleOrder(BigDecimal saleOrderId);
+
+    List<Map<String, Object>> getKucunList(Map<String, Object> map);
+
 }

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

@@ -1907,5 +1907,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         return result;
     }
 
+    @Override
+    public List<Map<String, Object>> getKucunList(Map<String, Object> map) {
+        return amsSaleOrderMapper.getKucunList(map);
+    }
+
 
 }

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

@@ -4455,4 +4455,33 @@
     FROM TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
     WHERE TLFR.RESULT_TOTAL_ID = #{resultTotalId}
   </select>
+    <select id="getKucunList" resultType="java.util.Map" parameterType="java.util.Map">
+      SELECT * FROM (
+                      SELECT ASO.SALE_NUMBER "saleNo", ASO.SALE_REMARK "saleRemark",
+                             RAS1.ARRIVAL_NAME      "sendStation",
+                             RAS.ARRIVAL_NAME       "toTheStation",
+                        RM.MATERIAL_NAME       "materialName",
+                        RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')' "materialSpa",
+                        ASM.MATERIAL_NUMBER                                    "materialNum",
+                        ASM.MATERIAL_WEIGHT                                    "materialWeight",
+                        ASO.TRANSFER_IN_DEP                                    "transInDep",
+                        ASO.TRANSFER_OUT_DEP                                   "transOutDep",
+                        ASM.TRANSFER_IN_OF_WAREHOUSE                           "transInWarehouse",
+                        RC.CONSIGNEE_COMPANY_NAME                              "receiveName"
+                      FROM AMS_SALE_ORDER ASO
+                        LEFT JOIN AMS_SALE_MATERIAL ASM
+                      ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                        LEFT JOIN RMS_MATERIAL RM
+                        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+                        LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT  TPAR
+                        ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
+                        LEFT JOIN RMSTRAIN_ARRIVAL_SEND   RAS
+                        ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
+                        LEFT JOIN RMSTRAIN_ARRIVAL_SEND   RAS1
+                        ON RAS1.ARRIVAL_ID = TPAR.SEND_STATION_ID
+                        LEFT JOIN RMS_CONSIGNEE           RC
+                        ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                      WHERE ASO.SALE_TYPE = 4
+       )
+    </select>
 </mapper>