adas

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

@@ -581,7 +581,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                          String saler
                                                          ) {
         if (con != null  && !"".equals(con) && !"null".equals(con)) {
-            mapValue.put("con", con);
+            mapValue.put("con", "%" + con + "%");
         }
         if(shipperId != null  && !"".equals(shipperId) && !"null".equals(shipperId)){
             mapValue.put("shipperId", shipperId);

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

@@ -2084,10 +2084,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         System.out.println(resultMap);
         String outPutMap = (String) resultMap.get("output");
         JSONObject jsonObject = JSON.parseObject(outPutMap);
-        System.out.println(jsonObject);
-        System.out.println(jsonObject.get("NumberStatus"));
-        DataChange.dataToBigDecimal(jsonObject.get("NumberStatus"));
-        result = DataChange.dataToBigDecimal(jsonObject.get("NumberStatus")).intValue();
+        if(jsonObject != null){
+            result = DataChange.dataToBigDecimal(jsonObject.get("NumberStatus")).intValue();
+        }
         if(result == 7){
             //如果为7则更新
             amsSaleOrderMapper.updateSaleOrderStatus(saleNumber);

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

@@ -23,7 +23,7 @@ public class EasSaleOrderStatusUtil {
     // context
     public final Map<String,Object> login = new HashMap<>();
     public final String password = "dgjt@kingdee";
-    public final String dcName = "D002";
+    public final String dcName = "FDDGEAS85";
     public final String dbType = "0";
     public final String userName = "user";
     // context

src/main/resources/application-prod.yml

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

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

@@ -1964,7 +1964,7 @@
     and ASM.DELETED IS NULL
     and ASM.SALE_MATERIAL_ID IS NOT NULL
     <if test="con != null">
-      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
+      and r_consignee.CONSIGNEE_COMPANY_NAME||a_s_order.SALE_NUMBER||rm.material_name||RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL like #{con}
     </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME