|
@@ -248,22 +248,24 @@ public class AwaitSendController {
|
|
|
List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
|
|
|
Double colorIsWeight = 0.00; //克
|
|
|
String goodName = "";
|
|
|
+ int Goodsquantity = 0;
|
|
|
for (SalesOrderItem temp : items) {
|
|
|
goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
|
|
|
-
|
|
|
if(temp.getColorIsWeight() != null){
|
|
|
colorIsWeight += temp.getColorIsWeight();
|
|
|
}
|
|
|
+ Goodsquantity += temp.getItemNum();
|
|
|
}
|
|
|
String uuid = UUIDGenerator.getUUID();
|
|
|
Map<String, Object> product1 = new HashMap<String, Object>();
|
|
|
product1.put("GoodsName", uuid);
|
|
|
+ product1.put("Goodsquantity", Goodsquantity);
|
|
|
// 计算产品重量
|
|
|
product1.put("GoodsWeight", colorIsWeight/1000);
|
|
|
Commodity.add(product1);
|
|
|
|
|
|
eOrderRequestData.setCommodity(Commodity);
|
|
|
- eOrderRequestData.setWeight(1.0);
|
|
|
+ eOrderRequestData.setWeight(colorIsWeight/1000);
|
|
|
eOrderRequestData.setQuantity(1);
|
|
|
eOrderRequestData.setIsReturnPrintTemplate(1);
|
|
|
|