feature: 补录报账单号提示

release
高荣琳 2 years ago
parent 13415bcde9
commit b4b51c8288
  1. 2
      order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java
  2. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
  3. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@ -236,6 +236,8 @@ public enum OrderInfoContentEnum {
INVOICE_BZDH_OPERATED("9645", "此报账单已做其他操作"),
INVOICE_BZDH_REPEAT_OPERATED("9646", "此报账单已关联其他发票,请注意重复补录"),
INVOICE_BILLING_ORDERITEM_XMMC_NULL_ERROR("2000", "发票明细中的商品名称为空!"),

@ -164,7 +164,7 @@ public class OrderInfoController {
@PostMapping("/updateBillNumber")
@ApiOperation(value = "发票列表", notes = "发票列表修改报账单号")
@SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理")
@SysLog(operation = "发票列表", operationDesc = "补录报账单号", key = "订单发票管理")
public R updateBillNumber(@RequestParam("bzdh") String bzdh,
@RequestParam("orderInfoId") String orderInfoId,
@RequestParam("fpqqlsh")String fpqqlsh,

@ -1764,9 +1764,15 @@ public class OrderInfoServiceImpl implements OrderInfoService {
}
if(orderProcessInfo != null){
if(!OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt())){
if(!OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt()) && OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){
throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_OPERATED);
}
if((OrderInfoEnum.ORDER_STATUS_5.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(orderProcessInfo.getDdzt()))
&&!OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){
throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_REPEAT_OPERATED);
}
OrderProcessInfo orderProcessInfo1 = new OrderProcessInfo();
orderProcessInfo1.setOrderStatus(OrderInfoEnum.ORDER_VALID_STATUS_1.getKey());
orderProcessInfo1.setOrderInfoId(orderProcessInfo.getOrderInfoId());

Loading…
Cancel
Save