|
@@ -176,6 +176,9 @@ public class AwaitSendController {
|
|
|
@RequestParam("salesId") Integer salesId,
|
|
|
HttpServletRequest request) {
|
|
|
SalesOrder salesOrderInfo = salesOrderService.getSalesOrderById(salesId);
|
|
|
+ // 替换
|
|
|
+ post = salesOrderInfo.getSalesPostFirm();
|
|
|
+
|
|
|
StoreShip storeShip = null;
|
|
|
if(salesOrderInfo.getSalesStoreId() != null){
|
|
|
storeShip = storeShipService.getStoreShipByStoreId(salesOrderInfo.getSalesStoreId());
|
|
@@ -260,10 +263,10 @@ public class AwaitSendController {
|
|
|
List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
|
|
|
// 整个产品的重量
|
|
|
Double colorIsWeight = 0.00;
|
|
|
- String goodName = "";
|
|
|
+ StringBuilder goodName = new StringBuilder();
|
|
|
int Goodsquantity = 0;
|
|
|
for (SalesOrderItem temp : items) {
|
|
|
- goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
|
|
|
+ goodName.append(temp.getProductAbbreviation()).append("(").append(temp.getColorAbbreviation()).append(")*").append(temp.getItemNum()).append(";");
|
|
|
if(temp.getColorIsWeight() != null){
|
|
|
colorIsWeight += temp.getColorIsWeight();
|
|
|
}
|
|
@@ -287,7 +290,7 @@ public class AwaitSendController {
|
|
|
boolean flag = jsonObject.getBoolean("Success");
|
|
|
if (flag) {
|
|
|
// 替换产品名称
|
|
|
- json = json.replace(uuid, goodName);
|
|
|
+ json = json.replace(uuid, goodName.toString());
|
|
|
// 获取电子面单成功
|
|
|
String code = jsonObject.getJSONObject("Order").getString("LogisticCode");
|
|
|
// 订单发货
|