修改

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

@@ -735,12 +735,10 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
                                                          String con) {
         if (con != null  && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
-
         }
         if (carrierSsoId!=null){
             mapValue.put("carrierSsoId",carrierSsoId);
         }
-
         //不分页筛选数据
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
@@ -1465,6 +1463,7 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
     @PostMapping(value = "/closingEntries")
     @Transactional
     public RESTfulResult closingEntries(@RequestBody List<Map<String, Object>> mapList){
+        System.out.println(mapList + "关闭分录" +  new Date());
         if (mapList.isEmpty()){
             return failed("没有分录数据");
         }else {
@@ -1522,7 +1521,8 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
                     // 状态：close为关闭
                     head.put("status",status);
                     Map<String,Object> input = new HashMap<>();
-                    Map<String, Object> totalMap = easUtil.getTotalMap();
+                    Map<String, Object> totalMap = new HashMap<>();
+                    totalMap.putAll(easUtil.getTotalMap());
                     input.put("head",head);
                     totalMap.put("input",input);
                     // 调用金蝶关闭接口
@@ -1698,7 +1698,7 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
                 count++;
                 int saleOrderId= amsSaleOrderService.addSteelSaleOrderLoading(map);
                 if (map.get("isUploadEas") != null && saleOrderId != 0) {
-                    amsSaleOrderService.uploadSaleOrder(new BigDecimal(saleOrderId));
+                    //amsSaleOrderService.uploadSaleOrder(new BigDecimal(saleOrderId));
                 }
             }
         } catch (Exception e) {

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

@@ -1130,7 +1130,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
                 BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(map1.get("saleOrderMaterialId"));
                 //判断该车序号下有没有运单,如果有,直接删除
                 BigDecimal orderId = DataChange.dataToBigDecimal(map1.get("orderId"));
-                if(orderId != null && orderId.intValue() != 0) {
+                if(orderId != null && orderId.intValue() != 0 && previousOrderId.compareTo(orderId) != 0) {
                     saleLogUtil.logOrder(orderId,"执行合并操作,删除运单,车牌号为:" + map1.get("capacityNo"),map1, SaleLogUtil.DELETE);
                     amsSaleOrderMaterialMapper.deleteToMergeOrder(orderId);
                     amsSaleOrderMaterialMapper.deleteToMergeOrderMaterial(orderId);
@@ -1159,7 +1159,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             amsSaleOrderMaterial.setPreviousOrderNumber(previousOrderNo);
             amsSaleOrderMaterial.setInsertUpdateRemark("进行合并操作,操作人" + map.get("userName"));
             amsSaleOrderMaterialMapper.updateByPrimaryKeySelective(amsSaleOrderMaterial);
-            if(netWeightSaleOrderMaterialId != null) {
+            if(netWeightSaleOrderMaterialId != null || previousOrderId != null) {
                 responseMap.put("orderNumber",previousOrderNo);
                 responseMap.put("saleOrderMaterialId",toMergeSaleOrderMaterialID);
                 responseMap.put("saleOrderId",saleOrderId);

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

@@ -1519,7 +1519,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             // 获得金蝶接口配置:正式
 //            Map<String, Object> totalMap = easUtil.getTotalMap();
             // 获得金蝶接口配置:测试
-            Map<String, Object> totalMap = easUtil.getTotalMap();
+            Map<String, Object> totalMap = new HashMap<>();
+            totalMap.putAll(easUtil.getTotalMap());
             // 组装报文
             totalMap.put("input",input);
             System.out.println(totalMap);
@@ -2840,7 +2841,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
 
     @Override
     public List<String> getEasPrimaryIds(Map<String, Object> map) {
-        System.out.println("获取制单日期------------" + new Date());
         List<String> easPrimaryIds = amsSaleOrderMapper.getEasPrimaryIds(map);
         String easPrimaryList = "";
         for (String easPrimaryId :easPrimaryIds) {
@@ -2857,7 +2857,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         totalMap.put("outerSystem","DG");
         JSONObject jsonObject = new JSONObject(totalMap);
         Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
-        System.out.println(resultMap);
         try {
             newFileTool.newFile("deleteSaleOrderToEas："+totalMap,"金蝶通讯报文");
         }catch (Exception e){
@@ -2869,7 +2868,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         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;