|
@@ -173,12 +173,16 @@ public class AwaitSendController {
|
|
|
SalesOrderItem item = new SalesOrderItem();
|
|
|
item.setItemOrderId(salesOrderInfo.getSalesId());
|
|
|
List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
|
|
|
+ String goodName = "";
|
|
|
for (SalesOrderItem temp : items) {
|
|
|
- Map<String, Object> product1 = new HashMap<String, Object>();
|
|
|
- product1.put("GoodsName", temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum());
|
|
|
- product1.put("GoodsWeight", 10.0);
|
|
|
- Commodity.add(product1);
|
|
|
+ goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
|
|
|
}
|
|
|
+ Map<String, Object> product1 = new HashMap<String, Object>();
|
|
|
+ product1.put("GoodsName", goodName);
|
|
|
+ product1.put("GoodsWeight", 10.0);
|
|
|
+ Commodity.add(product1);
|
|
|
+
|
|
|
+
|
|
|
eOrderRequestData.setCommodity(Commodity);
|
|
|
eOrderRequestData.setWeight(1.0);
|
|
|
eOrderRequestData.setQuantity(1);
|