内转新增时间筛选

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

@@ -1,12 +1,19 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.druid.support.json.JSONUtils;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.service.IOmstruckOrderService;
+<<<<<<< HEAD
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
+=======
+import com.steerinfo.dil.util.*;
+>>>>>>> dc32f9f11deeaa024573daded2507e76b3e78134
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -47,6 +54,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
     ESFeign esFeign;
     @Autowired
     OmstruckOrderMapper omstruckOrderMapper;
+    @Autowired
+    EASCapacityTestUtil easCapacityTestUtil;
+    @Autowired
+    JoinFeign joinFeign;
 
 
     private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -796,6 +807,20 @@ public class OmstruckOrderController extends BaseRESTfulController {
     public RESTfulResult updateCapacityId(@RequestBody Map<String,Object> map) {
         int result = omstruckOrderService.updateCapacityId(map);
         if (result == 1) {
+//            BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+//            OmstruckOrder omstruckOrder1 = omstruckOrderMapper.selectByPrimaryKey(orderId);
+//            // 如果是钢材车辆，同步修改分录车号
+//            if (omstruckOrder1.getOrderType().intValue() == 1) {
+//                BigDecimal saleOrderMaterialId = omstruckOrder1.getOrderPlanId();
+//                Map<String, Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
+//                Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
+//                totalMap.put("input",input);
+//                System.out.println(totalMap);
+//                String json = JSONUtils.toJSONString(totalMap);
+//                System.out.println(json);
+//                Map<String, Object> s = joinFeign.pushCarNumberToEas(totalMap);
+//                System.out.println(s);
+//            }
             return success(result);
         }
         else {

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

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author hujianguo
+ * @create 2021-10-29 11:23
+ */
+@FeignClient(value = "dil-join-api-dev", url = "${openfeign.JoinFeign.url}")
+public interface JoinFeign {
+    // 得到销售订单信息
+    @PostMapping("/api/v1/join/amssaleorder/getSaleOrder")
+    Map<String,Object> getSaleOrder(@RequestParam BigDecimal saleOrderId);
+
+    // 推送销售订单到金蝶
+    @PostMapping("/api/v1/join/wsface/pushSaleOrderToEas")
+    Map<String,Object> pushSaleOrderToEas(@RequestBody Map<String, Object> map);
+
+    // 同步关闭金蝶销售订单
+    @PostMapping("/api/v1/join/wsface/deleteSaleOrderToEas")
+    Map<String,Object> deleteSaleOrderToEas(@RequestBody Map<String, Object> map);
+
+    // 推送车牌号到金蝶
+    @PostMapping("/api/v1/join/wsface/pushCarNumberToEas")
+    Map<String,Object> pushCarNumberToEas(@RequestBody Map<String, Object> map);
+
+    // 查询车牌号和金蝶分录
+    @PostMapping("/api/v1/join/wsface/findCarNumberByOrderId")
+    Map<String,Object> findCarNumberByOrderId(@RequestParam BigDecimal saleOrderMaterialId);
+}

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

@@ -1,13 +1,16 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.druid.support.json.JSONUtils;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.IMFeign;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.EASCapacityTestUtil;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -71,6 +74,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Autowired
     private ZJXLUtilMapper zjxlUtilMapper;
 
+    @Autowired
+    JoinFeign joinFeign;
+
+
     /**
      * 用于远程调用运输订单新增
      *

src/main/java/com/steerinfo/dil/util/EASCapacityTestUtil.java

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶测试环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASCapacityTestUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "A004";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "saveSaleOrderBillHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
@@ -20,5 +20,7 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
   port: 8095

src/main/resources/bootstrap.yml

@@ -32,7 +32,7 @@ cache:
 redis:
   host: 10.10.50.28
   port: 6379
-  pwd: 123456
+  pwd: adhykdj
   project:
     prefix: sysmanage
   pool:

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

@@ -1888,7 +1888,8 @@
         RC3.CARRIER_NAME "carrierName",
         RM.MATERIAL_NAME "materialName",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
-        RM.MATERIAL_MODEL "materialModel"
+        RM.MATERIAL_MODEL "materialModel",
+        OO.DRIVER_TEL "drivelTel"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -3810,8 +3811,9 @@
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
         RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
-        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
         CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
         TTR.RESULT_TOTAL_ID "resultTotalId"