daj

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

@@ -10,16 +10,16 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
-//import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+//import org.omg.CORBA.OBJ_ADAPTER;
+
 /**
  * AmstruckInwardPlan RESTful接口：
  * @author generator
@@ -137,7 +137,8 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer planStatus,
                                           String carrierId,
-                                          Integer planId) {
+                                          Integer planId,
+                                          String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
@@ -147,6 +148,9 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
         if (planId != null && !"undefined".equals(planId.toString())) {
             mapValue.put("planId",new BigDecimal(planId));
         }
+        if(con != null && !"null".equals(con)){
+            mapValue.put("con","%" + con + "%");
+        }
         List<Map<String, Object>> columnList = null;
         PageHelper.startPage(pageNum, pageSize);
         if(planStatus == 100){

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

@@ -69,6 +69,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     EASUtil easUtil;
     @Autowired
     EASDeleteUtil easDeleteUtil;
+
+    @Autowired
+    EASSaleOrderUtil easSaleOrderUtil;
+
     @Autowired
     EASTestUtil easTestUtil;
     @Autowired
@@ -227,9 +231,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         Map<String, Object> head = (Map<String, Object>) input.get("head");
         head.put("status","");
         // 获得金蝶接口配置：正式
-//        Map<String, Object> totalMap = easUtil.getTotalMap();
-        // 获得金蝶接口配置:测试
         Map<String, Object> totalMap = easUtil.getTotalMap();
+        // 获得金蝶接口配置:测试
+        //Map<String, Object> totalMap = easSaleOrderUtil.getTotalMap();
         // 组装报文
         totalMap.put("input",input);
         System.out.println(totalMap);

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

@@ -0,0 +1,73 @@
+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 EASSaleOrderUtil {
+    // 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 = "D002";
+    public final String dbType = "1";
+    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

@@ -19,7 +19,7 @@ openfeign:
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
    JoinFeign:
-     url: ${JOINFEIGN_URL:172.16.33.166:8066}
+     url: ${JOINFEIGN_URL:localhost:8066}
 
  #正式环境端口
 

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

@@ -1617,7 +1617,9 @@
         </foreach>
       </if>
     </where>
-    <include refid="orderBy"></include>
+    <include refid="orderBy1">
+
+    </include>
   </select>
 
   <select id="getSaleOrderReportedes"  parameterType="java.util.Map" resultType="java.util.LinkedHashMap">

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

@@ -655,6 +655,9 @@
         <if test="planStatus == 3">
             and to_date(#{newTime}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.DUE_DATE
         </if>
+        <if test="con != null">
+            and rm.material_name like #{con}
+        </if>
         )
         <where>
             <if test="planNumber != null">

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,stdout,file,RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout