Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-DAZHOU-TMSSHIP-API

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

@@ -65,20 +65,23 @@ public class DilBatchController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
         return success(data);
     }
-    @ApiOperation(value="查询货权转移出现的批次展示列表", notes="分页查询")
+    @ApiOperation(value="为提货委托查询批次展示列表", notes="分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "apiId", value = "375", required = false, dataType = "Integer")
     })
+
     @PostMapping("/getBatchListForAttorney")
     public RESTfulResult getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
                                       Integer pageNum,
                                       Integer pageSize,
-                                      Integer apiId) {
+                                      Integer apiId,
+                                      String con) {
         if (mapValue==null){
             mapValue=new HashMap<>();
         }
+        mapValue.put("con",con);
         List<Map<String, Object>> listTotal =  dilBatchService.getBatchListFortTransfer(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
@@ -87,6 +90,23 @@ public class DilBatchController extends BaseRESTfulController {
         return success(data);
     }
 
+    @PostMapping("/getBatchListForInstruction")
+    public RESTfulResult getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String con) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        mapValue.put("con",con);
+        List<Map<String, Object>> listTotal =  dilBatchService.getBatchListForInstruction(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = dilBatchService.getBatchListForInstruction(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        return success(data);
+    }
 
 
 

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

@@ -88,7 +88,12 @@ public class TmsshipTotalResultController extends BaseRESTfulController {
     public RESTfulResult getCapacityList(@RequestBody(required = false) Map<String,Object> mapVal,
                                        Integer pageNum,
                                        Integer pageSize,
-                                       Integer apiId){
+                                       Integer apiId,
+                                         String con){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        mapVal.put("con",con);
         List<Map<String, Object>> detailListTotal = tmsshipTotalResultService.getCapacity(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据

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

@@ -35,5 +35,6 @@ public interface DilBatchMapper extends IBaseMapper<DilBatch, Short> {
 
     List<Map<String, Object>> getBatchIdByForeign(Map<String, Object> mapValue);
 
-
+    //为装船指令查询批次展示列表
+    List<Map<String, Object>> getBatchListForInstruction(Map<String, Object> map);
 }

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

@@ -25,9 +25,12 @@ public interface IDilBatchService {
     //展示批次列表
     List<Map<String,Object>> getBatchList(Map<String,Object> map);
 
-    //查询货权转移和提货委托出现的批次id
+    //为提货委托查询批次
     List<Map<String,Object>> getBatchListFortTransfer(Map<String,Object> map);
 
+    //为装船指令查询批次
+    List<Map<String,Object>> getBatchListForInstruction(Map<String,Object> map);
+
    //根据用户输入模糊查询江船船名
     List<Map<String, Object>> getShipNameList(String state);
 

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

@@ -49,6 +49,11 @@ public class DilBatchServiceImpl  implements IDilBatchService {
         return dilBatchMapper.getBatchListFortTransfer(map);
     }
 
+    @Override
+    public List<Map<String, Object>> getBatchListForInstruction(Map<String, Object> map) {
+        return dilBatchMapper.getBatchListForInstruction(map);
+    }
+
     @Override
     public List<Map<String, Object>> getShipNameList(String state) {
         state = "%"+state+"%";

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

@@ -298,26 +298,70 @@
   LEFT JOIN RMS_MATERIAL RM
   ON RM.MATERIAL_ID=DB.MATERIAL_ID
 </select>
-<!--获取货权转移批次id 改成了 获取发货通知批次id -->
+<!--为提货委托查询批次展示列表 -->
   <select id="getBatchListFortTransfer" resultType="java.util.Map" parameterType="java.util.Map">
-    select DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-           RM.MATERIAL_NAME "materialName",
-           DBI.BATCH_INFACOTRY_ID "batchId",
-           APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-           DBI.INFACTORY_SHIP_NAME "infactoryShipName"
-
+    select DISTINCT DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+                    RM.MATERIAL_NAME            "materialName",
+                    DBI.BATCH_INFACOTRY_ID      "batchId",
+                    APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+                    DBI.INFACTORY_SHIP_NAME     "infactoryShipName",
+                    DB.INSERT_TIME
     from AMSSHIP_DELIVERY_NOTICE ADN
+           LEFT JOIN DIL_BATCH_INFACOTRY DBI
+                     ON DBI.BATCH_INFACOTRY_ID = ADN.BATCH_ID
+           LEFT JOIN DIL_BATCH DB
+                     on DBI.BATCH_ID = DB.BATCH_ID
+           left join AMS_PURCHASE_ORDER APO
+                     ON APO.BATCH_ID = DB.BATCH_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     ON RM.MATERIAL_ID = DB.MATERIAL_ID
+    <where>
+      <if test="con!=null">
+        (DB.RESULT_FOREIGN_SHIP_NAME like concat('%', concat(#{con},'%'))
+        or RM.MATERIAL_NAME like concat('%', concat(#{con}, '%'))
+        or DBI.BATCH_INFACOTRY_ID like concat('%', concat(#{con}, '%'))
+        or APO.PURCHASE_ORDER_NO like concat('%', concat(#{con}, '%'))
+        or DBI.INFACTORY_SHIP_NAME like concat('%', concat(#{con}, '%'))
+        )
+      </if>
+      and ADN.DELETED = 0
+      and ADN.NOTICE_DISTRIBUTION_STATUS = 1
+      and APO.PURCHASE_ORDER_NO is not null
+      order by  DB.INSERT_TIME desc
+    </where>
+  </select>
+<!--为装船指令查询批次展示列表 -->
+  <select id="getBatchListForInstruction" resultType="java.util.Map" parameterType="java.util.Map">
+    select DISTINCT DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+    RM.MATERIAL_NAME            "materialName",
+    DBI.BATCH_INFACOTRY_ID      "batchId",
+    APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+    DBI.INFACTORY_SHIP_NAME     "infactoryShipName",
+    DB.INSERT_TIME
+    from AMSSHIP_DELIVERY_ATTORNEY ADA
     LEFT JOIN DIL_BATCH_INFACOTRY DBI
-    ON DBI.BATCH_INFACOTRY_ID = ADN.BATCH_ID
+    ON DBI.BATCH_INFACOTRY_ID = ADA.BATCH_ID
     LEFT JOIN DIL_BATCH DB
     on DBI.BATCH_ID = DB.BATCH_ID
     left join AMS_PURCHASE_ORDER APO
-     ON APO.BATCH_ID=DB.BATCH_ID
+    ON APO.BATCH_ID = DB.BATCH_ID
     LEFT JOIN RMS_MATERIAL RM
-    ON RM.MATERIAL_ID=DB.MATERIAL_ID
-    where ADN.DELETED=0
-    order by  DB.INSERT_TIME desc
-</select>
+    ON RM.MATERIAL_ID = DB.MATERIAL_ID
+    <where>
+      <if test="con!=null">
+        (DB.RESULT_FOREIGN_SHIP_NAME like concat('%', concat(#{con},'%'))
+        or RM.MATERIAL_NAME like concat('%', concat(#{con}, '%'))
+        or DBI.BATCH_INFACOTRY_ID like concat('%', concat(#{con}, '%'))
+        or APO.PURCHASE_ORDER_NO like concat('%', concat(#{con}, '%'))
+        or DBI.INFACTORY_SHIP_NAME like concat('%', concat(#{con}, '%'))
+        )
+      </if>
+      and ADA.DELETED = 0
+      and ADA.ATTORNEY_DISTRIBUTION_STATUS = 1
+      and APO.PURCHASE_ORDER_NO is not null
+      order by  DB.INSERT_TIME desc
+    </where>
+  </select>
 <!--  根据用户输入模糊查询江船船名-->
     <select id="getShipNameList"  resultType="java.util.Map" parameterType="java.lang.String">
       select  RC.CAPACITY_NUMBER as "capacityName",

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

@@ -544,62 +544,39 @@
 
 
     <select id="getCapacity" resultType="java.util.Map">
-        SELECT
-        *
-        FROM
-        (
         SELECT DISTINCT
-        DBI.INFACTORY_SHIP_NAME "infactoryShipName",
-        db.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-        rm.MATERIAL_NAME AS "materialName",
-        rc.CAPACITY_NUMBER AS "capacityNumber",
-        oic.INSTRUCTIONS_CAPACITY_ID AS "orderId",
-        DBI.BATCH_INFACOTRY_ID AS "batchInfactoryId",
-        ada.DOWN_SWIM_PORT_ID AS "downSwimPortId",
-        rp1.PORT_NAME AS "portName1",
-        ada.PORT_ID AS "portId",
-        rp2.PORT_NAME AS "portName2",
-        oic.INSTRUCTIONS_SHIP_POSITION "instructionsShipPosition"
+            DBI.INFACTORY_SHIP_NAME "infactoryShipName",
+            db.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
+            rm.MATERIAL_NAME AS "materialName",
+            rc.CAPACITY_NUMBER AS "capacityNumber",
+            oic.INSTRUCTIONS_CAPACITY_ID AS "orderId",
+            DBI.BATCH_INFACOTRY_ID AS "batchInfactoryId",
+            ada.DOWN_SWIM_PORT_ID AS "downSwimPortId",
+            rp1.PORT_NAME AS "portName1",
+            ada.PORT_ID AS "portId",
+            rp2.PORT_NAME AS "portName2",
+            oic.INSTRUCTIONS_SHIP_POSITION "instructionsShipPosition"
         FROM
-        OMSSHIP_INSTRUCTIONS_CAPACITY oic
-        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-        LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_INFACOTRY_ID = osi.BATCH_ID
-        LEFT JOIN DIL_BATCH db ON db.BATCH_ID = DBI.BATCH_ID
-        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada ON ada.BATCH_ID = DBI.BATCH_INFACOTRY_ID
-        LEFT JOIN RMS_PORT rp1 ON ada.DOWN_SWIM_PORT_ID = rp1.PORT_ID
-        LEFT JOIN RMS_PORT rp2 ON ada.PORT_ID = rp2.PORT_ID
-        LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = db.MATERIAL_ID
-        LEFT JOIN RMS_CAPACITY rc ON rc.CAPACITY_ID = oic.CAPACITY_ID
-        WHERE
-        osi.DELETED = 0
-        AND OIC.DELETED = 0
-        AND ADA.DELETED = 0
-        )
-        <where>
-            <if test="resultForeignShipName != null">
-                and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="," close=")">
-                    "resultForeignShipName" in #{item}
-                </foreach>
-            </if>
-            <if test="materialName != null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    "materialName" in #{item}
-                </foreach>
-            </if>
-            <if test="portName1 != null">
-                and
-                <foreach collection="portName1" item="item" open="(" separator="," close=")">
-                    "portName1" in #{item}
-                </foreach>
-            </if>
-            <if test="portName2 != null">
-                and
-                <foreach collection="portName2" item="item" open="(" separator="," close=")">
-                    "portName2" in #{item}
-                </foreach>
-            </if>
-        </where>
+            OMSSHIP_INSTRUCTIONS_CAPACITY oic
+                LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+                LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_INFACOTRY_ID = osi.BATCH_ID
+                LEFT JOIN DIL_BATCH db ON db.BATCH_ID = DBI.BATCH_ID
+                LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada ON ada.BATCH_ID = DBI.BATCH_INFACOTRY_ID
+                LEFT JOIN RMS_PORT rp1 ON ada.DOWN_SWIM_PORT_ID = rp1.PORT_ID
+                LEFT JOIN RMS_PORT rp2 ON ada.PORT_ID = rp2.PORT_ID
+                LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = db.MATERIAL_ID
+                LEFT JOIN RMS_CAPACITY rc ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        WHERE OSI.DELETED = 0
+          AND OIC.DELETED = 0
+          AND ADA.DELETED = 0
+          AND OSI.INSTRUCTION_ISSUE_STATUS='已下发'
+        <if test="con!=null">
+            AND (DB.RESULT_FOREIGN_SHIP_NAME like concat('%', concat(#{con},'%'))
+            or RM.MATERIAL_NAME like concat('%', concat(#{con}, '%'))
+            or DBI.BATCH_INFACOTRY_ID like concat('%', concat(#{con}, '%'))
+            or rc.CAPACITY_NUMBER like concat('%', concat(#{con}, '%'))
+            or DBI.INFACTORY_SHIP_NAME like concat('%', concat(#{con}, '%'))
+            )
+        </if>
     </select>
 </mapper>