@@ -1756,7 +1756,6 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
public RESTfulResult getMakeOrderDate(@RequestBody(required = false) Map<String,Object> map) {
List <String> easPrimaryIds = amsSaleOrderService.getEasPrimaryIds(map);
return success(easPrimaryIds);
-
}
@ApiOperation("执行合并操作")
@@ -262,8 +262,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
head.put("status","");
// 获得金蝶接口配置:正式
Map<String, Object> totalMap = new HashMap<>();
- totalMap.putAll(easUtil.getTotalMap());
+ //totalMap.putAll(easUtil.getTotalMap());
+
// 获得金蝶接口配置:测试
+ totalMap.putAll(easSaleOrderUtil.getTotalMap());
//Map<String, Object> totalMap = easSaleOrderUtil.getTotalMap();
// 组装报文
totalMap.put("input",input);