angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 调整立即发货排序；

This commit is contained in:
cabbage 2025-05-14 13:27:19 +08:00
parent 9ee145b9fd
commit 09bba7b5d1
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java
View File

@ -6,7 +6,6 @@ import com.hzs.common.core.annotation.AccessPermissions;
import com.hzs.common.core.annotation.Log;
import com.hzs.common.core.annotation.RepeatSubmitSimple;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.constant.msg.CommonMsgConstants;
import com.hzs.common.core.constant.msg.SaOrderMsgConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.DateUtils;

23
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java
View File

@ -269,10 +269,6 @@ public class SaDeliverHandledController extends BaseController {
Map<Integer, String> areaMap = iAreaServiceApi.getAllAreaNoCache(pkCountry).getData();
String deliverCode = "";
String recName = "";
String recPhone = "";
String recAddress = "";
DeliverWmsVO vo = null;
// 合并 key： 发货单号 + 仓储编号 + 规格，一样的累计数量
String key = null;
@ -293,22 +289,19 @@ public class SaDeliverHandledController extends BaseController {
vo.setDeliverCode(deliverHandled.getDeliverCode());
vo.setRecName(deliverHandled.getRecName());
vo.setRecPhone(deliverHandled.getRecPhone());
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliverHandled);
String address = deliverHandled.getRecProvinceVal()
+ (StringUtils.isNotEmpty(deliverHandled.getRecCityVal()) ? deliverHandled.getRecCityVal() : "")
+ (StringUtils.isNotEmpty(deliverHandled.getRecCountyVal()) ? deliverHandled.getRecCountyVal() : "")
+ deliverHandled.getRecAddress();
vo.setRecAddress(address);
}
voList.add(vo);
} else {
vo.setQuantity(vo.getQuantity() + deliverHandled.getQuantity());
}
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliverHandled);
String address = deliverHandled.getRecProvinceVal()
+ (StringUtils.isNotEmpty(deliverHandled.getRecCityVal()) ? deliverHandled.getRecCityVal() : "")
+ (StringUtils.isNotEmpty(deliverHandled.getRecCountyVal()) ? deliverHandled.getRecCountyVal() : "")
+ deliverHandled.getRecAddress();
if (!recAddress.equals(address)) {
recAddress = address;
vo.setRecAddress(address);
}
}
}
ExcelUtil<DeliverWmsVO> util = new ExcelUtil<>(DeliverWmsVO.class);

2
bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml
View File

@ -405,7 +405,7 @@
#{item}
</foreach>
</if>
order by sd.creation_time desc, so.order_code desc
order by sd.creation_time desc, sd.deliver_code desc, so.order_code desc
</select>
<!-- 批量发货 -->