修复出库单保存问题

This commit is contained in:
zccbbg 2023-05-05 23:11:28 +08:00
parent 586e649017
commit 94209e3f73
2 changed files with 28 additions and 20 deletions

View File

@ -97,6 +97,10 @@ public class ShipmentOrderController extends BaseController {
@Log(title = "出库单", businessType = BusinessType.INSERT)
@PostMapping("add-or-update")
public ResponseEntity<Integer> addOrUpdate(@RequestBody ShipmentOrderFrom order) {
return ResponseEntity.ok(service.addOrUpdate(order));
if(order.getId()==null){
return ResponseEntity.ok(service.add(order));
}else {
return ResponseEntity.ok(service.update(order));
}
}
}

View File

@ -40,7 +40,6 @@ import org.springframework.util.CollectionUtils;
/**
* 出库单Service业务层处理
*
*
* @author zcc
*/
@Service
@ -192,20 +191,25 @@ public class ShipmentOrderService {
Long[] ids = {id};
return shipmentOrderMapper.updateDelFlagByIds(ids);
}
@Transactional
public int addOrUpdate(ShipmentOrderFrom order) {
public int add(ShipmentOrderFrom order) {
int res;
// 1. 新增
if (order.getId() == null) {
order.setDelFlag(0);
order.setCreateTime(LocalDateTime.now());
res = shipmentOrderMapper.insert(order);
saveDetails(order.getId(), order.getDetails());
if (order.getReceivableAmount() != null && order.getCustomerId() != null) {
//保存订单金额到客户流水表
saveOrUpdatePayAmount(order);
return res;
}
// 2. 编辑
return res;
}
public int update(ShipmentOrderFrom order) {
int res;
QueryWrapper<ShipmentOrderDetail> qw = new QueryWrapper<>();
qw.eq("shipment_order_id", order.getId());
@ -263,9 +267,10 @@ public class ShipmentOrderService {
// 2.1 先删除details 再重新保存
shipmentOrderDetailMapper.delete(qw);
saveDetails(order.getId(), order.getDetails());
if (order.getReceivableAmount() != null && order.getCustomerId() != null) {{
//保存订单金额到客户流水表
saveOrUpdatePayAmount(order);
}}
// 2.2 更新出库单
//判断出库单的整体状态
@ -277,7 +282,6 @@ public class ShipmentOrderService {
}
res = shipmentOrderMapper.updateById(order);
return res;
}
/**