hebing

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

@@ -228,11 +228,6 @@ public class AMScontroller extends BaseRESTfulController {
         return amsFeign.updateAmsContractTransportPrice(amsContractTransportPrice);
     }
 
-    @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    @PostMapping(value = "/batchUpdateTransportPriceByOilPrice")
-    public RESTfulResult batchUpdateTransportPriceByOilPrice() {
-        return amsFeign.batchUpdateTransportPriceByOilPrice();
-    }
 
     @PostMapping("getPurchaseOrderList")
     @ApiOperation(value = "展示采购订单列表")
@@ -301,7 +296,7 @@ public class AMScontroller extends BaseRESTfulController {
      * @param apiId
      * @return
      */
-    @PostMapping("getBreachList")
+    @PostMapping("/amscontracttransportprices")
     @ApiOperation(value = "查询汽运单价信息")
     public RESTfulResult amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
                                        Integer pageNum,
@@ -328,11 +323,7 @@ public class AMScontroller extends BaseRESTfulController {
     RESTfulResult deleteAmsContractTransportPrice(BigDecimal priceId) {
         return amsFeign.deleteAmsContractTransportPrice(priceId);
     }
-    @PostMapping("deleteAmsContractTransportPrice")
-    @ApiOperation(value = "通过主键id删除汽运单价")
-    RESTfulResult getAmsContractTransportPriceByPriceId(@PathVariable("priceId") BigDecimal priceId) {
-        return amsFeign.deleteAmsContractTransportPrice(priceId);
-    }
+
     /**
      * 通过主键修改汽运单价
      */
@@ -368,8 +359,8 @@ public class AMScontroller extends BaseRESTfulController {
     RESTfulResult addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsDispatchSaleOrder(mapVal);
     }
-    @GetMapping("getCapacityNumber")
-    @ApiOperation(value = "得到收货地址下拉")
+    @GetMapping("getCarrierName")
+    @ApiOperation(value = "得到承运商名称")
     public RESTfulResult getCarrierName(){
         return amsFeign.getCarrierName();
     }
@@ -418,7 +409,7 @@ public class AMScontroller extends BaseRESTfulController {
     RESTfulResult getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
         return amsFeign.getAmsSaleOrderBySaleOrderId(saleOrderId);
     }
-    @PostMapping("/addAmsSaleOrder")
+    @PostMapping("/updateAmsSaleOrder")
     RESTfulResult updateAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.updateAmsSaleOrder(mapVal);
     }

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

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.SelfServiceMachineServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:06
+ */
+@RequestMapping("${api.version}/thd")
+@RestController
+public class SelfServiceMachineController extends BaseRESTfulController {
+
+    @Autowired
+    SelfServiceMachineServiceImpl selfServiceMachineService;
+
+    @ApiOperation(value="查询数据打印提货单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/printTHD")
+    public RESTfulResult printTiHuoDan(@RequestBody(required=false) Map<String, Object> mapValue){
+        Map<String, Object> tiHuoDan = selfServiceMachineService.printTiHuoDan((String) mapValue.get("orderNumber"));
+        return success(tiHuoDan);
+    }
+
+}

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

@@ -259,12 +259,12 @@ public interface AmsFeign {
     RESTfulResult updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
 
     /**
-     * 油价联动导致运价变动，批量修改运价
-     *
-     * @return
-     */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/batchUpdateTransportPriceByOilPrice")
-    RESTfulResult batchUpdateTransportPriceByOilPrice();
+//     * 油价联动导致运价变动，批量修改运价
+//     *
+//     * @return
+//     */
+//    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/batchUpdateTransportPriceByOilPrice")
+//    RESTfulResult batchUpdateTransportPriceByOilPrice();
 
     /**
      * 展示采购订单列表

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

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.mapper;
+
+import org.mapstruct.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 自助一体机
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:03
+ */
+
+@Mapper
+public interface SelfServiceMachineMapper {
+    //通过运输订单号查询订单信息
+    Map<String, Object> getTiHuoDan(String orderNumber);
+
+    //通过运输订单号查找订单子表物资信息
+    List<Map<String, Object>> getOOMMes(String orderNumber);
+}

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

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.service;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:04
+ */
+
+public interface SelfServiceMachineService {
+
+    //打印提货单
+    Map<String, Object> printTiHuoDan(String orderNumber);
+
+}

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

@@ -0,0 +1,35 @@
+package com.steerinfo.dil.service.impl;
+import com.steerinfo.dil.mapper.SelfServiceMachineMapper;
+import com.steerinfo.dil.service.SelfServiceMachineService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:05
+ */
+
+@Service
+public class SelfServiceMachineServiceImpl implements SelfServiceMachineService {
+
+    @Resource
+    private SelfServiceMachineMapper selfServiceMachineMapper;
+    /**
+     * 打印提货单
+     * @param orderNumber 运输订单号
+     * @return
+     */
+    @Override
+    public Map<String, Object> printTiHuoDan(String orderNumber) {
+
+        //查询订单信息
+        Map<String, Object> tiHuoDanMap = selfServiceMachineMapper.getTiHuoDan(orderNumber);
+        //查询该订单下的所有装车信息
+        List<Map<String, Object>> oomMes = selfServiceMachineMapper.getOOMMes(orderNumber);
+        tiHuoDanMap.put("loadMes", oomMes);
+        return tiHuoDanMap;
+    }
+}

src/main/resources/bootstrap.yml

@@ -22,7 +22,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:localhost:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:localhost:8081}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign:

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.SelfServiceMachineMapper">
+    <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_NUMBER "orderNumber",
+               RC.CAPACITY_NUMBER "capacityNumber",
+               RCA.CARRIER_NAME "carrierName",
+               RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join RMS_CARRIER RCA
+                           on RCA.CARRIER_ID = RC.CARRIER_ID
+                 left join AMS_SALE_ORDER ASO
+                           on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join RMS_CONSIGNEE RCON
+                           on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+<!--  查询订单子表关联的  -->
+    <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
+        select
+               RM.MATERIAL_NAME                          "materialName",
+               RPP.PLATFORM_NAME                         "platformName",
+               RP.PERSONNEL_NAME                         "personnelName",
+               (
+                 select ORDER_MATERIAL_NUMBER
+                 from OMSTRUCK_ORDER_MATERIAL OOM
+                 where OOM.ORDER_ID = OO.ORDER_ID
+                  and TLR.MATERIAL_ID = OOM.MATERIAL_ID
+                   ) "orderMaterialNumber"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           on TTR.ORDER_ID = OO.ORDER_ID
+                 left join TMSTRUCK_LOAD_RESULT TLR
+                           on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+                 left join RMS_PWAREHOUSE_PLATFORM RPP
+                           on RPP.PLATFORM_ID = TLR.LOADING_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = TLR.MATERIAL_ID
+                 left join RMS_PERSONNEL RP
+                           on RP.PERSONNEL_ID = TLR.LOADER_ID
+        where ORDER_NUMBER = #{orderNumber}
+    </select>
+</mapper>