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

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

@@ -699,14 +699,41 @@ public class BMSController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  String startTime,
                                                  String endTime,
-                                                      Integer feeType){
+                                                      Integer feeType,
+                                                      String con){
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
-        return bmsshipFeign.selectPortFeeSecondList(mapVal, pageNum, pageSize, apiId, startTime, feeType,endTime);
+        return bmsshipFeign.selectPortFeeSecondList(mapVal, pageNum, pageSize, apiId, startTime, feeType,endTime,con);
     }
 
+    /**
+     * 根据批次查火运湿吨详情
+     * @param batchId
+     * @return
+     */
+    @PostMapping("/getTrainDetailsByBatch/{batchId}")
+    public Map<String,Object> getTrainDetailsByBatch(@PathVariable("batchId")BigDecimal batchId){
+        return bmsshipFeign.getTrainDetailsByBatch(batchId);
+    }
 
+    /**
+     * 根据批次查汽运湿吨详情
+     * @param batchId
+     * @return
+     */
+    @PostMapping("/getTruckDetailsByBatch/{batchId}")
+    public Map<String,Object> getTruckDetailsByBatch(@PathVariable("batchId")BigDecimal batchId){
+        return bmsshipFeign.getTruckDetailsByBatch(batchId);
+    }
 
-
+    /**
+     * 根据批次查询装船作业
+     * @param
+     * @return
+     */
+    @PostMapping("/findLoadByBatch/{batchId}")
+    public Map<String,Object> findLoadByBatch(@PathVariable("batchId") BigDecimal batchId){
+        return bmsshipFeign.findLoadByBatch(batchId);
+    }
 }

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

@@ -1991,6 +1991,13 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getShipNameList(state);
     }
 
+    @ApiOperation(value = "国产矿物流导入")
+    @PostMapping(value = "/importDomesticLoadResult")
+    public Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.importDomesticLoadResult(mapValue);
+    }
+
+
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
     public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
@@ -2465,11 +2472,12 @@ public class TMSController extends BaseRESTfulController {
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           String materialName,
-                                                          String resultForeignShipName){
+                                                          String resultForeignShipName,
+                                                          String supplierName){
         if(map==null)
             map=new HashMap<>();
         System.out.println(map);
-        return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName);
+        return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName,supplierName);
     }
 
     @ApiOperation(value = "销售钢材统计报表")

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

@@ -426,6 +426,31 @@ public class UniversalController extends BaseRESTfulController {
     }
 
 
+    @ApiModelProperty(value = "查询存在装船作业并且尚未计算水运费的批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "502", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/findBatchHavingLoad")
+    public RESTfulResult findBatchHavingLoad(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String index){
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.findBatchHavingLoad(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
 
 
 
@@ -966,17 +991,6 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
-    @ApiModelProperty(value = "关闭过期运输订单")
-    @PostMapping("/closePassedOrder")
-    @Scheduled(cron = "0 0 8 * * ?")
-    public RESTfulResult closePassedOrder() {
-        List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
-        System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
-        int result = universalMapper.closePassedOrder();
-        System.out.println("订单关闭数为：" + result);
-        return success(result);
-    }
-
     @ApiOperation(value = "内转计重承运合同物资")
     @PostMapping("/getInwardWeightMaterial")
     public RESTfulResult getInwardWeightMaterial(@RequestBody(required = false) Map<String,Object> mapValue,

src/main/java/com/steerinfo/dil/feign/BmsshipFeign.java

@@ -285,7 +285,8 @@ public interface BmsshipFeign {
                                                 @RequestParam("apiId") Integer apiId,
                                                 @RequestParam("startTime") String startTime,
                                                 @RequestParam("feeType")Integer feeType,
-                                                @RequestParam("endTime") String endTime);
+                                                @RequestParam("endTime") String endTime,
+                                                @RequestParam("con") String con);
 
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBmsshipFee/{id}")
     Map<String, Object> getBmsshipFee(@PathVariable("id") Integer id);
@@ -296,4 +297,16 @@ public interface BmsshipFeign {
 
     @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addwaterStatement")
     Map<String, Object> addwaterStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getTrainDetailsByBatch/{batchId}")
+    Map<String,Object> getTrainDetailsByBatch(@PathVariable("batchId")BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getTruckDetailsByBatch/{batchId}")
+    Map<String,Object> getTruckDetailsByBatch(@PathVariable("batchId")BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findBatchHavingLoad")
+    Map<String,Object> findBatchHavingLoad(String con);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/findLoadByBatch/{batchId}")
+    Map<String,Object> findLoadByBatch(@PathVariable("batchId")BigDecimal batchId);
 }

src/main/java/com/steerinfo/dil/feign/TmsTrainFeign.java

@@ -235,6 +235,10 @@ public interface TmsTrainFeign {
             @RequestParam("loadingId")Integer loadingId,
             @RequestParam("unloadingId")Integer unloadingId);
 
+    @ApiOperation(value = "国产矿物流导入")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/importDomesticLoadResult")
+    Map<String, Object> importDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
     Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
@@ -281,7 +285,8 @@ public interface TmsTrainFeign {
                                                    @RequestParam("pageNum") Integer pageNum,
                                                    @RequestParam("pageSize") Integer pageSize,
                                                    @RequestParam("materialName")String materialName,
-                                                   @RequestParam("resultForeignShipName")String resultForeignShipName);
+                                                   @RequestParam("resultForeignShipName")String resultForeignShipName,
+                                                   @RequestParam("supplierName")String supplierName);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addWarehouseOutResult")

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

@@ -11,4 +11,6 @@ public interface DilCidCapacityMapper extends IBaseMapper<DilCidCapacity, BigDec
 
     @Select("select seq_dil_cid_capacityNo.nextval from dual")
     BigDecimal getCidMax();
+
+    Integer selectByCidAndCapacityNo(String cid, String capacityNo);
 }

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

@@ -232,4 +232,5 @@ public interface UniversalMapper {
 
     List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
 
+    List<Map<String,Object>> findBatchHavingLoad(Map<String,Object> map);
 }

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

@@ -1,5 +1,8 @@
 package com.steerinfo.dil.service;
 
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+
 import java.util.List;
 import java.util.Map;
 
@@ -21,4 +24,5 @@ public interface UniversalService {
     List<String> getWarranty(java.lang.String orderNumber);
 
     List<String> getTest(Map<String, Object> map);
+
 }

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

@@ -118,6 +118,11 @@ public class BackgroundProcessingServiceImpl implements IBackgroundProcessServic
     @Override
     public int bindCidCapacityNo(String cid, String capacityNo) {
         DilCidCapacity dilCidCapacity = new DilCidCapacity();
+        //根据车牌号和cid去查询是否存在
+        Integer j = dilCidCapacityMapper.selectByCidAndCapacityNo(cid,capacityNo);
+        if(j > 0){
+            return 0;
+        }
         dilCidCapacity.setCidCapacityId(dilCidCapacityMapper.getCidMax());
         dilCidCapacity.setCid(cid);
         dilCidCapacity.setCapacityNumber(capacityNo);

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

@@ -6,8 +6,14 @@ import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.UniversalService;
 import com.steerinfo.dil.util.ESUtil;
 import com.steerinfo.dil.util.HTTPRequestUtils;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,7 +28,8 @@ import java.util.*;
  * @ author    :TXF
  * @ time      :2021/10/19 18:05
  */
-
+@EnableScheduling
+@EnableAsync
 @Service
 public class UniversalServiceImpl implements UniversalService {
 
@@ -227,4 +234,16 @@ public class UniversalServiceImpl implements UniversalService {
             return 0;
         }
     }
+
+    /**
+     * 关闭过期运输订单
+     * @return
+     */
+    @Scheduled(cron = "0 0 8 * * ?")
+    public void closePassedOrder() {
+        List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
+        System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
+        int result = universalMapper.closePassedOrder();
+        System.out.println("订单关闭数为：" + result);
+    }
 }

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-#  path: C:\Users\24390\Desktop\work\a
+  # path: C:\Users\24390\Desktop\work\a
   path: /shared
 server:
   port: 8080

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

@@ -223,6 +223,7 @@
     <include refid="select"/>
     <include refid="whereLike"/>
   </select>
+
   <insert id="batchInsert" parameterType="java.util.List">
     insert into DIL_CID_CAPACITY 
       (CID_CAPACITY_ID, 
@@ -288,5 +289,9 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <select id="selectByCidAndCapacityNo" resultType="java.lang.Integer" parameterType="string">
+    select count(DCC.CAPACITY_NUMBER) from DIL_CID_CAPACITY DCC
+    WHERE DCC.CAPACITY_NUMBER = #{capacityNo}
+    AND DCC.CID = #{cid}
+  </select>
 </mapper>

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

@@ -263,11 +263,10 @@
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_ID AS "materialId"
         from RMS_MATERIAL RM
-        <where>
-            <if test="index != null">
-               instr(RM.MATERIAL_NAME, #{index}) > 0
-            </if>
-        </where>
+        WHERE RM.DELETED = 0
+        <if test="index != null">
+            AND instr(RM.MATERIAL_NAME, #{index}) > 0
+        </if>
         )
         <where>
         <if test="materialName != null">
@@ -774,7 +773,7 @@
 
 
     <select id="getWarranty" resultType="java.util.Map" parameterType="java.lang.String">
-        select oom.WARRANTY_CODE "warrantyCode"
+        select oo "warrantyCode"
         from OMSTRUCK_ORDER oo
         left join OMSTRUCK_ORDER_MATERIAL oom
         on oom.ORDER_ID = oo.ORDER_ID
@@ -1075,10 +1074,17 @@
     </update>
 
     <select id="getSteelOrderNum" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM OMSTRUCK_ORDER OO
-        WHERE OO.ORDER_LINE_SEQUENCE &gt;= 1
-        AND   OO.ORDER_STATUS = 5
-        AND   OO.ORDER_TYPE = 1
+        SELECT
+            COUNT( * )
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE
+            OO.ORDER_LINE_SEQUENCE >= 1
+          AND OO.ORDER_STATUS = 5
+          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+          AND OO.ORDER_TYPE = 1
     </select>
     <select id="getInwardWeightMaterial" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM (SELECT
@@ -1190,6 +1196,39 @@
                  </if>
     </select>
 
+    <select id="findBatchHavingLoad" resultType="java.util.Map">
+        SELECT  distinct	db.BATCH_ID "batchId",
+        db.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        rm.MATERIAL_NAME "materialName",
+        apo.PURCHASE_ORDER_NO       "purchaseOrderNo",
+        apo.PURCHASE_ORDER_ID        "purchaseOrderId"
+        FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
+        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+        ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.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 TMSSHIP_WATER_QUALITY_RESULT twqr
+        ON ttr.RESULT_ID = twqr.TOTAL_RESULT_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     tlsr.DELETED=0
+        and db.BATCH_ID not in (
+        select DISTINCT BATCH_ID
+        from BMSSHIP_FEE bf
+        where FEE_TYPE=3)
+        <if test="index!=null">
+            and (INSTR(db.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(rm.MATERIAL_NAME,#{index}) > 0)
+        </if>
+    </select>
+
 
     <update id="closePassedOrder" >
         UPDATE OMSTRUCK_ORDER OO