|
|
|
@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
|
import cn.hutool.http.HttpUtil; |
|
|
|
|
import cn.hutool.json.JSONArray; |
|
|
|
|
import cn.hutool.json.JSONObject; |
|
|
|
|
import cn.hutool.json.JSONUtil; |
|
|
|
|
import com.logpm.factorydata.base.feign.IFactoryDataBaseClient; |
|
|
|
@ -244,7 +245,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
|
|
|
|
|
advance.set("senderMobile", vo.getSenderTelephone()); |
|
|
|
|
advance.set("senderAddress", vo.getSenderDetailAddress()); |
|
|
|
|
|
|
|
|
|
List<JSONObject> packageList = new ArrayList<>(); |
|
|
|
|
JSONArray packageList = new JSONArray(); |
|
|
|
|
for (PackageInfoVO orderPackageDTO : packages) { |
|
|
|
|
advance.set("firstPackName", orderPackageDTO.getMaterialName()); |
|
|
|
|
advance.set("firstPackCode", orderPackageDTO.getMaterialCode()); |
|
|
|
@ -296,7 +297,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
|
|
|
|
|
JSONObject entries = JSONUtil.parseObj(advanceDetailEntity); |
|
|
|
|
packageList.add(entries); |
|
|
|
|
} |
|
|
|
|
advance.set("details", JSONUtil.toJsonStr(packageList)); |
|
|
|
|
advance.set("details", packageList); |
|
|
|
|
if (ObjectUtil.isAllNotEmpty(linsyProperties.getOldSystemHost(), linsyProperties.getOldSystemAdvanceUrl())) { |
|
|
|
|
log.info("推送老系统暂存单:{}", JSONUtil.toJsonStr(advance)); |
|
|
|
|
String post = HttpUtil.post(linsyProperties.getOldSystemHost() + linsyProperties.getOldSystemAdvanceUrl(), JSONUtil.toJsonStr(advance)); |
|
|
|
|