dsada

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.controller;
 
 import com.alibaba.druid.support.json.JSONUtils;
-import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.feign.JoinFeign;
@@ -750,7 +749,9 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
     @ApiModelProperty(value = "新增钢材销售订单")
     @PostMapping("/addSteelSaleOrder")
     public RESTfulResult addSteelSaleOrder(@RequestBody Map<String,Object> mapValue){
+        System.out.println("-----销售钢材界面录入-----" + new Date());
         System.out.println(mapValue);
+        System.out.println("-----销售钢材界面录入-----" + new Date());
         try {
             // 成功
             int result = amsSaleOrderService.addSteelSaleOrder(mapValue);
@@ -1595,9 +1596,9 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
     public RESTfulResult addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList) throws Exception {
         int count = 0;
         String saleOrderNo = null;
-        System.out.println("------销售订单批量导入Excel导入-----");
+        System.out.println("------销售订单批量导入Excel导入-----" + new Date());
         System.out.println(mapList);
-        System.out.println("------销售订单批量导入Excel导入-----");
+        System.out.println("------销售订单批量导入Excel导入-----" + new Date());
         try {
             for (Map<String,Object> map:mapList
                  ) {
@@ -1633,9 +1634,9 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
     public RESTfulResult addUnloadSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
         int count = 0;
         String saleOrderNo = null;
-        System.out.println("------销售订单批量导入Excel导入继续装-----");
+        System.out.println("------销售订单批量导入Excel导入继续装-----" + new Date());
         System.out.println(mapList);
-        System.out.println("------销售订单批量导入Excel导入继续装-----");
+        System.out.println("------销售订单批量导入Excel导入继续装-----" + new Date());
         try {
             for (Map<String,Object> map:mapList
             ) {
@@ -1689,29 +1690,7 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
     @PostMapping("getMakeOrderDate")
     public RESTfulResult getMakeOrderDate(@RequestBody(required = false) Map<String,Object> map) {
         List <String> easPrimaryIds = amsSaleOrderService.getEasPrimaryIds(map);
-        String easPrimaryList = "";
-        for (String easPrimaryId :easPrimaryIds) {
-            easPrimaryList = easPrimaryList + '\'' +  easPrimaryId + '\'' + ',';
-        }
-        easPrimaryList = easPrimaryList.substring(0,easPrimaryList.length() - 1);
-        ArrayList<String> easPrimaryList1 = new ArrayList<>();
-        easPrimaryList1.add(easPrimaryList);
-        System.out.println(easPrimaryList);
-        Map<String,Object> totalMap = easFluMakeDateUtil.getTotalMap();
-        Map<String, Object> input = new HashMap<>();
-        input.put("defineSqlNumber","defineXSCKTime");
-        input.put("defineSqlparams",easPrimaryList1);
-        totalMap.put("input",input);
-        totalMap.put("outerSystem","DG");
-        JSONObject jsonObject = new JSONObject(totalMap);
-        System.out.println(jsonObject);
-        Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
-        String outPut = (String) resultMap.get("output");
-
-        System.out.println(outPut);
-        JSONObject jsonObject1 = new JSONObject(resultMap);
-        System.out.println(jsonObject1);
-        return success();
+        return success(easPrimaryIds);
 
     }
 

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

@@ -38,4 +38,5 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
 
     int getSaleMaterialDelete(BigDecimal saleOrderMaterialId);
 
+    int updateSaleMaterialMakeDate(Map<String, Object> rowSet);
 }

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

@@ -203,4 +203,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     List<String> getEasPrimaryIds(Map<String, Object> map);
 
+    List<Map<String, Object>> getNextCarrier(BigDecimal addressId);
+
 }

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.service.impl;
 
-import com.alibaba.druid.sql.visitor.functions.Char;
 import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -102,6 +101,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Autowired
     RmsFeign rmsFeign;
 
+    @Autowired
+    EasFluMakeDateUtil easFluMakeDateUtil;
+
     @Override
     public List<Map<String, Object>> getSaleOrderInfo(Map<String, Object> map) {
         return amsSaleOrderMapper.getSaleOrderInfo(map);
@@ -1194,6 +1196,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public synchronized List<Map<String,Object>> getCarrierByAddress(BigDecimal placeId) {
         BigDecimal addressId = amsSaleOrderMapper.getAddressByPlace(placeId);
         List<Map<String,Object>> mapList = amsSaleOrderMapper.getCarrierByAddress(addressId);
+        try {
+            if(mapList != null  && mapList.size() != 1) {
+                mapList = amsSaleOrderMapper.getNextCarrier(addressId);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return mapList;
     }
 
@@ -2454,7 +2463,43 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
 
     @Override
     public List<String> getEasPrimaryIds(Map<String, Object> map) {
-        return amsSaleOrderMapper.getEasPrimaryIds(map);
+        List<String> easPrimaryIds = amsSaleOrderMapper.getEasPrimaryIds(map);
+        String easPrimaryList = "";
+        for (String easPrimaryId :easPrimaryIds) {
+            easPrimaryList = easPrimaryList + '\'' +  easPrimaryId + '\'' + ',';
+        }
+        easPrimaryList = easPrimaryList.substring(0,easPrimaryList.length() - 1);
+        ArrayList<String> easPrimaryList1 = new ArrayList<>();
+        easPrimaryList1.add(easPrimaryList);
+        System.out.println(easPrimaryList);
+        Map<String,Object> totalMap = easFluMakeDateUtil.getTotalMap();
+        Map<String, Object> input = new HashMap<>();
+        input.put("defineSqlNumber","defineXSCKTime");
+        input.put("defineSqlparams",easPrimaryList1);
+        totalMap.put("input",input);
+        totalMap.put("outerSystem","DG");
+        JSONObject jsonObject = new JSONObject(totalMap);
+        System.out.println(jsonObject);
+        Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
+        String outPut = (String) resultMap.get("output");
+        JSONObject outputjson = JSONObject.parseObject(outPut);
+        Map<String,Object> outputMap = (Map<String,Object>) outputjson;
+        List<Map<String,Object>> rowSetList = (List<Map<String,Object>>) outputMap.get("rowset");
+        for (Map<String,Object> rowSet : rowSetList) {
+            Map<String, Object> easMap = new HashMap<>();
+            System.out.println(rowSet);
+            String easprimaryIdMakeDate = (String) rowSet.get("FCREATETIME");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date easprimaryIdMakeDate1 = null;
+            try {
+                easprimaryIdMakeDate1 = sdf.parse(easprimaryIdMakeDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            rowSet.put("easprimaryIdMakeDate",easprimaryIdMakeDate1);
+            amsSaleMaterialMapper.updateSaleMaterialMakeDate(rowSet);
+        }
+        return easPrimaryIds;
     }
 
 

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

@@ -23,7 +23,7 @@ public class EasFluMakeDateUtil {
     // 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}
    OTMSFeign:
      url: ${OTMSFEIGN_URL:172.16.33.166:8038}
    RmsFeign:

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

@@ -830,7 +830,7 @@
      WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId})
   </update>
 
-  <select id="getOrderResults" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+    <select id="getOrderResults" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
     SELECT count(TER.RESULT_ID) FROM TMSTRUCK_TOTAL_RESULT TTR
     LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
     ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -845,4 +845,9 @@
       WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
       and ASM.DELETED is null
     </select>
+  <update id="updateSaleMaterialMakeDate">
+    update AMS_SALE_MATERIAL ASM
+    SET ASM.SALE_MAKE_DATE = #{easprimaryIdMakeDate}
+    WHERE ASM.EAS_PRIMARY_ID = #{FSALEORDERENTRYID}
+  </update>
 </mapper>

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

@@ -4673,5 +4673,18 @@
       </foreach>
       </if>
     </select>
+  <select id="getNextCarrier" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    select adso.CARRIER_ID from AMS_SALE_ORDER_MATERIAL asom
+    left join RMS_RECEIVE_PLACE rrp
+    on rrp.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
+    left join AMS_DISPATCH_SALE_ORDER adso
+    on adso.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
+    left join rms_carrier rc
+    on rc.CARRIER_ID = adso.CARRIER_ID
+    where rrp.ADDRESS_ID = #{addressId}
+      and rc.CARRIER_TYPE = '销售钢材承运商'
+    order by asom.SALE_ORDER_MATERIAL_ID desc
+    fetch first 1 row only
+  </select>
 
 </mapper>