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

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

@@ -1986,6 +1986,18 @@ public class AMScontroller{
         return amsFeign.getSaleCokeOrder(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,shipperId,startTime,endTime);
     }
 
+    @ApiModelProperty(value = "反关闭金蝶单个分录")
+    @PostMapping("/adverseCloseSaleMaterial")
+    public Map<String, Object> adverseCloseSaleMaterial(@RequestParam Integer saleMaterialId) {
+        return amsFeign.adverseCloseSaleMaterial(saleMaterialId);
+    }
+
+    @ApiModelProperty(value = "反关闭金蝶整个销售订单")
+    @PostMapping("/adverseCloseSaleOrder")
+    public Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId) {
+        return amsFeign.adverseCloseSaleOrder(saleOrderId);
+    }
+
     @ApiOperation(value = "承运起止范围与装货点")
     @PostMapping("/getRangePoint")
     public Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -882,7 +883,6 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
-
     @ApiModelProperty(value = "边输边查片区")
     @PostMapping("/getSaleAreaByLike")
     public RESTfulResult getSaleAreaByLike(@RequestParam("index") String index) {
@@ -914,6 +914,38 @@ public class UniversalController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiModelProperty(value = "边输边查收货地址")
+    @PostMapping("/getPlaceAndAddress")
+    public RESTfulResult getPlaceAndAddress(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getPlaceAndAddress(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查物资名称")
+    @PostMapping("/getMaterialNameLike")
+    public RESTfulResult getMaterialNameLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getMaterialNameLike(index == null ? null : "%" + index + "%");
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查物资规格型号")
+    @PostMapping("/getSpecificationModelLike")
+    public RESTfulResult getSpecificationModelLike(@RequestBody Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getSpecificationModelLike(map);
+        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/AmsFeign.java

@@ -1733,10 +1733,17 @@ public interface AmsFeign {
                                             @RequestParam String startTime,
                                             @RequestParam String endTime);
 
+    @PostMapping(value = "/api/v1/ams/amssaleorders/adverseCloseSaleMaterial")
+    Map<String, Object> adverseCloseSaleMaterial(@RequestParam Integer saleMaterialId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/adverseCloseSaleOrder")
+    Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId);
+
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRangePoint")
     Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String, Object> map,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize,
                                       @RequestParam Integer apiId,
                                       @RequestParam String con);
+
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.mapper;
 
+import io.swagger.models.auth.In;
 import org.mapstruct.Mapper;
 
 import java.math.BigDecimal;
@@ -215,6 +216,16 @@ public interface UniversalMapper {
     int bandSaleArea(Map<String, Object> map);
 
     int getSteelOrderNum();
+    // 边输边查收货地址
+    List<Map<String, Object>> getPlaceAndAddress(String index);
+    // 边输边查物资名称
+    List<Map<String, Object>> getMaterialNameLike(String index);
+    // 边输边查物资规格型号
+    List<Map<String, Object>> getSpecificationModelLike(Map<String,Object> map);
+
+    int closePassedOrder();
+
+    List<Map<String,Object>> findPassedOrder();
 
     List<Map<String, Object>> getInwardWeightMaterial(Map<String, Object> mapValue);
 

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

@@ -1106,4 +1106,80 @@
         </where>
     </select>
 
+    <select id="getPlaceAndAddress" parameterType="java.lang.String" resultType="java.util.Map" >
+        SELECT RRP.PLACE_ID                 "placeId",
+               RRA.ADDRESS_ID               "shipperAddressId",
+               RRP.ADDRESS_DELIVERY_ADDRESS "place",
+               RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
+               RRP.ADDRESS_DELIVERY_ADDRESS "adressAndPlace"
+        FROM RMS_RECEIVE_PLACE RRP
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+        WHERE (instr(RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS,
+                     #{index}) > 0)
+    </select>
+
+    <select id="getMaterialNameLike" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT DISTINCT RM.MATERIAL_NAME "materialName"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        <if test="index != null">
+            AND RM.MATERIAL_NAME LIKE #{index}
+        </if>
+    </select>
+
+    <select id="getSpecificationModelLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpecificationModel",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_ID "value",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "label",
+        RM.MATERIAL_ID "id",
+        RM.MATERIAL_NAME "materialName"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        <if test="materialName != null">
+            AND (instr (RM.MATERIAL_NAME,#{materialName}) > 0)
+        </if>
+        <if test="specificationModel != null">
+            AND (instr (RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL, #{specificationModel}) >0)
+        </if>
+    </select>
+
+    <select id="findPassedOrder" resultType="java.util.Map">
+        SELECT OO.ORDER_ID "orderId",
+               RC.CAPACITY_NUMBER "capacityNumber"
+        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
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_TYPE = 1
+          AND OO.ORDER_STATUS IN (4,5)
+          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+          AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
+          ORDER BY OO.ORDER_ID DESC
+    </select>
+
+    <update id="closePassedOrder" >
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 7
+        WHERE OO.ORDER_ID IN
+        (SELECT OO.ORDER_ID
+        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
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        WHERE OO.ORDER_TYPE = 1
+        AND OO.ORDER_STATUS IN (4,5)
+        AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+        AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
+        )
+    </update>
 </mapper>