clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-05-09 09:03:24 +08:00
parent 806e5e700e
commit a22d60f23a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -435,7 +435,7 @@ public class OrderController extends BaseController {
orderGoods.setGoodsName(goodsStandard.getGoodsStandardName());
orderGoods.setOrderDetailId(od.getId());
orderGoods.setServerGoodsNum(0);
orderGoods.setOrderId(om.getId());
// orderGoods.setOrderId(om.getId());
orderGoodsService.insertOrderGoods(orderGoods);
});

5
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -1190,8 +1190,9 @@ public class OrderDetailController extends BaseController {
orderMaster2Update.setId(od.getOrderMasterId());
orderMaster2Update.setOrderStatus(OrderStatus.PLAIN.code());
// 查询是否还有派单记录，没有的话需要重置主单是否自己承接的字段为NULL
List<OrderGoods> existOrderGoods = orderGoodsService.selectByOrderMasterId(od.getOrderMasterId());
if (CollectionUtils.isNotEmpty(existOrderGoods)&&existOrderGoods.size()==1) {
// List<OrderGoods> existOrderGoods = orderGoodsService.selectByOrderMasterId(od.getOrderMasterId());
List<OrderDetail> orderDetailList=orderDetailService.selectByOrderMasterId(od.getOrderMasterId());
if (CollectionUtils.isEmpty(orderDetailList)) {
orderMaster2Update.setResetAllSelfAssigned(true);
}
// 更新主单是否全部派完