java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' into pre-production

pre-production
zhaoqiaobo 2 weeks ago
parent
286ea49bec 59f843ab32
commit
ae4bf277eb
1 changed files with 6 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java

8
blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
Unescape View File

@ -341,7 +341,9 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
snArray.add(jsonObject); snArray.add(jsonObject);
} }
entries.set("snList", snArray); entries.set("snList", snArray);
String post = HttpUtil.post(entity.getSendUrl(), JSONUtil.toJsonStr(entries)); JSONArray objects = new JSONArray();
objects.add(entries);
String post = HttpUtil.post(entity.getSendUrl(), JSONUtil.toJsonStr(objects));
FactoryNodeAllPushEntity pushAllEntity = new FactoryNodeAllPushEntity(); FactoryNodeAllPushEntity pushAllEntity = new FactoryNodeAllPushEntity();
BeanUtil.copyProperties(entity, pushAllEntity); BeanUtil.copyProperties(entity, pushAllEntity);
pushAllEntity.setId(null); pushAllEntity.setId(null);
@ -403,7 +405,9 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
snArray.add(jsonObject); snArray.add(jsonObject);
} }
entries.set("snList", snArray); entries.set("snList", snArray);
String post = HttpUtil.post(oldProperties.getPushNodeUrl(), JSONUtil.toJsonStr(entries)); JSONArray objects = new JSONArray();
objects.add(entries);
String post = HttpUtil.post(oldProperties.getPushNodeUrl(), JSONUtil.toJsonStr(objects));
FactoryNodeAllPushEntity pushAllEntity = new FactoryNodeAllPushEntity(); FactoryNodeAllPushEntity pushAllEntity = new FactoryNodeAllPushEntity();
pushAllEntity.setWarehouse(entries.getStr("nodeName")); pushAllEntity.setWarehouse(entries.getStr("nodeName"));
pushAllEntity.setWorkBatch(orderCode); pushAllEntity.setWorkBatch(orderCode);

Write Preview
Loading…
Cancel
Save