Skip to content

J
jiedao-api-boot-master
Commit 611f4776 authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-07-03提交

parent b69c740e
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 117 deletions
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/order/listener/BpmOrderWarehousingModificationResultListener.java
View file @ 611f4776
......@@ -26,7 +26,6 @@ public class BpmOrderWarehousingModificationResultListener extends BpmProcessIns
@Override
protected void onEvent(BpmProcessInstanceResultEvent event) {
//lanbm 2024-05-31 处理异常
log.info("-------------------入仓修改回调-------------------------{},{}",
event.getBusinessKey(), event.getResult());
orderWarehouseInService.updateApplyCallback(event.getBusinessKey(),
......
yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
View file @ 611f4776
......@@ -97,7 +97,7 @@ public class BpmTaskController {
}
/*
lanbm 2024-05-20 add
add
*/
@PutMapping("/approve2")
@ApiOperation("批量审批通过任务")
......
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customerContacts/CustomerContactsMapper.java
View file @ 611f4776
......@@ -136,7 +136,7 @@ public interface CustomerContactsMapper extends BaseMapperX<CustomerContactsDO>
"order by cc.update_time desc ",
"</script>"
})
//lanbm 2024-05-22 过滤客户经理函数
//过滤客户经理函数
IPage<CustomerContactsDto> selectBySearchKey2(IPage page,
@Param("searchKey") String searchKey,
@Param("type") String type,
......
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerServiceImpl.java
View file @ 611f4776
......@@ -176,7 +176,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
/*
lanbm 2024-05-28 添加注释，发货人带来的收货人，
发货人带来的收货人，
改为进入待分配列表
*/
@Override
......@@ -541,7 +541,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
applicationContext.publishEvent(new AssignConfirmedCustomerEvent(customerId, customerNew.getCustomerService()));
//完善客户信息顺便确认接收，对客户类型做逻辑运算
//lanbm 2024-05-08 添加接收确认后判断客户是新客户还是老客户逻辑
// 添加接收确认后判断客户是新客户还是老客户逻辑
//前面的逻辑有可能改了客户的业绩类型，需要再次获取客户信息
CustomerDO customer2 = customerMapper.selectById(customerId);
ReceiveCustomerCalTypeEvent event = new ReceiveCustomerCalTypeEvent();
......@@ -549,7 +549,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
event.setCustomerNumber(customer2.getNumber());
event.setIsNew(customer2.getIsNew());
applicationContext.publishEvent(event);
//end lanbm 2024-05-08 添加接收确认后判断客户是新客户还是老客户逻辑
//end 添加接收确认后判断客户是新客户还是老客户逻辑
} else {
......@@ -2601,7 +2601,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
event.setCustomerNumber(customer2.getNumber());
event.setIsNew(customer2.getIsNew());
applicationContext.publishEvent(event);
//end lanbm 2024-05-08 添加接收确认后判断客户是新客户还是老客户逻辑
//end 添加接收确认后判断客户是新客户还是老客户逻辑
}
private Date getEstimateTimeByCustomerStatus(CustomerDO customer, Date now) {
......@@ -2645,7 +2645,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
throw exception(ErrorCodeConstants.CUSTOMER_CATCH_ERROR);
}
// if (!user.getPostIds().contains(adminUserApi.getActiveCustomerServicePostId())) {
//判断当前用户的角色 lanbm 2024-05-07 添加注释
//判断当前用户的角色
if (!user.getPostIds().contains(2L) && !user.getPostIds().contains(19L)) {
throw exception(ErrorCodeConstants.CUSTOMER_CATCH_ERROR);
}
......@@ -2751,7 +2751,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
new AutoProcessNotCustomerServiceExceptionEvent(customer.getNumber()));
//lanbm 2024-05-07 添加捞取后修改客户是否为新客户的相关逻辑
//添加捞取后修改客户是否为新客户的相关逻辑
CalculateCustomerTypeEvent cevent = new CalculateCustomerTypeEvent();
cevent.setCustomerNumber(customer.getNumber());
cevent.setStatus(customer.getStatus());
......@@ -2759,11 +2759,11 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
cevent.setOldCustomerService(oldCustomerService);
cevent.setCustomerId(customer.getId());
applicationContext.publishEvent(cevent);
//end lanbm 2024-05-07 添加捞取后修改客户是否为新客户的相关逻辑
//end 添加捞取后修改客户是否为新客户的相关逻辑
}
/*
接收客户，lanbm 2024-05-08 添加客户业绩类型逻辑运算
接收客户， 添加客户业绩类型逻辑运算
*/
public void receiveCustomer(Long customerId, Long customerServiceId) {
CustomerDO customerDO = customerMapper.selectById(customerId);
......
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customerContacts/CustomerContactsService.java
View file @ 611f4776
......@@ -110,7 +110,7 @@ public interface CustomerContactsService extends IService<CustomerContactsDO> {
PageResult<CustomerContactsDto> selectBySearchKey(String searchKey, String type, Collection<Long> ids, Long customerId, PageParam page);
/*
lanbm 2024-05-23 添加的客户选择函数
添加的客户选择函数
*/
PageResult<CustomerContactsDto> selectBySearchKey2(
......
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/vo/CustomerUpdateReqVO.java
View file @ 611f4776
......@@ -113,7 +113,7 @@ public class CustomerUpdateReqVO extends CustomerBaseVO {
/*
lanbm 2024-06-03 处理开启到仓确认，就报发货人异常的BUG
处理开启到仓确认，就报发货人异常的BUG
*/
@ApiModelProperty(value = "到仓确认")
private Integer arrivalConfirm;
......
yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java
View file @ 611f4776
......@@ -338,7 +338,7 @@ public class CustomerController {
//完善信息要确认接收
updateReqVO.setIsCustomerServiceConfirmed(true);
//lanbm 2024-05-08 完善客户信息确认接收时要计算客户的业绩类型
//完善客户信息确认接收时要计算客户的业绩类型
return this.updateCustomer(updateReqVO);
}
......@@ -794,7 +794,7 @@ public class CustomerController {
@Idempotent(timeout = 5)
public CommonResult<Boolean> confirm(
@Valid @RequestBody CustomerConfirmReqVO customerConfirmReqVO) {
//lanbm 2024-05-08 添加接收确认后判断客户是新客户还是老客户逻辑
//添加接收确认后判断客户是新客户还是老客户逻辑
Long id = customerConfirmReqVO.getCustomerId();
customerService.confirmCustomer(id);
return success(true);
......
yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customerContacts/CustomerContactsController.java
View file @ 611f4776
......@@ -154,7 +154,7 @@ public class CustomerContactsController {
}
/*
lanbm 2024-05-23 添加的新的功能接口
添加的新的功能接口
用于报价单逻辑控制
*/
@GetMapping("/select2")
......@@ -172,7 +172,7 @@ public class CustomerContactsController {
@RequestParam(value = "customerId", required = false) Long customerId
, PageParam page) {
//lanbm 2024-05-22修改报价单联系人选择
//修改报价单联系人选择
/*
return success(customerContactsService.selectBySearchKey(searchKey,
type, ids, customerId, page));*/
......
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
View file @ 611f4776
......@@ -31,7 +31,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
/*
定时任务相关逻辑 lanbm 2024-05-19
定时任务相关逻辑
添加注释
*/
@Api(tags = "管理后台 - 定时任务")
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java
View file @ 611f4776
......@@ -607,19 +607,19 @@ public class OrderDO extends BaseDO {
/*
lanbm 2024-05-13 add
*/
@ApiModelProperty(value = "客户业绩类型：1 新客户业绩 0老客户业绩")
private Integer yejiType;
/*
业绩产生时间 lanbm 2024-05-13 add
业绩产生时间
*/
private Date yejiCreateDate;
/*
海运根据体积计算出的V值，空运根据重量计算出的V值
lanbm 2024-05-13 add
*/
private BigDecimal calVValue;
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java
View file @ 611f4776
......@@ -6000,7 +6000,6 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
/*
更新订单业绩类型 yeji_type,yeji_create_date,cal_v_value
lanbm 2024-05-13 add
*/
@Update("update ecw_order set yeji_type=#{yejiType} where order_id = #{orderId}")
void UpdateOrderYeJiType(@Param("orderId") Long orderId,
......@@ -6008,7 +6007,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
/*
更新订单V值 lanbm 2024-05-13 add
更新订单V值
yeji_create_date 业绩产生时间
简单的SQL语句用SQL注解来写比较方便
*/
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderMutual/OrderMutualMapper.java
View file @ 611f4776
......@@ -46,7 +46,7 @@ public interface OrderMutualMapper extends AbstractMapper<OrderMutualDO> {
return null;
}
/* lanbm 2024-06-05 修改BUG
/* 修改BUG
@Select("update ecw_order_mutual set deleted=0 where creator=#{query.creator} and create_time=#{query.createTime} " +
"and updater=#{query.updater} and update_time=#{query.updateTime} and mutual_order_id=#{query.mutualOrderId}")
void updateMutualBackByRelatId(OrderMutualDO item);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderTime/OrderTimeMapper.java
View file @ 611f4776
......@@ -61,9 +61,9 @@ public interface OrderTimeMapper extends AbstractMapper<OrderTimeDO> {
List<OrderTimeDO> newOrderTimeByOrderIdAndStatus(@Param("orderId") Long orderId, @Param("status") Integer status);
//lanbm 2024-06-13 添加根据订单ID获取柜号
// 添加根据订单ID获取柜号
long getShipment_id(long orderId);
//lanbm 2024-06-13 添加根据柜号获取卸柜时间
//添加根据柜号获取卸柜时间
Date getUlboxtime(long shipmentId);
}
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/OrderExceptionEnum.java
View file @ 611f4776
......@@ -4,7 +4,7 @@ import lombok.Getter;
/*
订单异常枚举类型
lanbm 2024-06-03 添加注释
*/
@Getter
public enum OrderExceptionEnum {
......@@ -38,7 +38,7 @@ public enum OrderExceptionEnum {
GOODS_OVERWEIGHT_EXCEPTION("overweight_exception", "商品重量超限异常", "overweight exception"),
CHANNEL_PACKAGING_OVERWEIGHT_EXCEPTION("channel_packaging_overweight_exception", "渠道包装重量超限异常", "channel packaging overweight exception"),
//不可出渠道异常，lanbm 2024-06-03 处理异常添加注释
//不可出渠道异常， 处理异常添加注释
NOT_SHIPPING_CHANNEL_EXCEPTION("not_shipping_channel_exception", "不可出渠道异常", "not shipping channel exception"),
GOODS_WEIGHT_EXCEPTION("goods_weight_exception", "货物重量异常", "goods weight exception"),
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/ProductPriceExceptionHandleListener.java
View file @ 611f4776
......@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
/**
* 未报价异常处理
* lanbm 2024-05-31 添加注释
*
*/
@Component("ProductPriceExceptionHandleListener")
@AllArgsConstructor
......@@ -107,7 +107,7 @@ public class ProductPriceExceptionHandleListener {
//修改这些订单的未报价异常为已处理
/*
if (productPriceDO.getNeedOrderInquiry() == 1) {
//lanbm 2024-06-06 把以前的注释开启
OrderExceptionResultHandlerVo orderExceptionResultHandlerVo =
new OrderExceptionResultHandlerVo();
orderExceptionResultHandlerVo.setOrderExceptionId(
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderBusinessService.java
View file @ 611f4776
......@@ -35,7 +35,7 @@ public interface OrderBusinessService extends IService<OrderDO> {
void handleOrderNoQuote(Long orderId);
/*
lanbm 2024-06-06 添加的函数
添加的函数
*/
void handleOrderNoQuote(Long orderId, ProductPriceDO productPriceDO);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderService.java
View file @ 611f4776
......@@ -364,14 +364,13 @@ public interface OrderService extends IService<OrderDO> {
/*
更新订单业绩类型 yeji_type,yeji_create_date,cal_v_value
lanbm 2024-05-13 add
yejiType 0是老客户业界，1 是新客户业绩
*/
void UpdateOrderYeJiType(Long orderId,int yejiType);
/*
更新订单V值 lanbm 2024-05-13 add
更新订单V值
yeji_create_date 业绩产生时间
*/
void UpdateOrderVValue( Long orderId, BigDecimal calVvalue, Date
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
View file @ 611f4776
......@@ -578,7 +578,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
return orderExceptionCreateReqVO;
}
//lanbm 2024-06-18 添加的逻辑日志记录
//添加的逻辑日志记录
private void saveLog(Collection<Long> orderIds,
BigDecimal freightFee,
Integer freightCurrencyId,
......@@ -694,7 +694,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
Integer clearanceCurrencyId,
Long clearanceUnitId) {
//lanbm 2024-06-18 添加的逻辑日志记录
//
saveLog(orderIds,
freightFee,
freightCurrencyId,
......@@ -2508,7 +2508,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderDO.getTransportId())) {
//没有待处理的清关费未报价异常，则需要生成
//生成清关费异常 lanbm 2024-06-06 添加参数type=6,是处理价格异常
//生成清关费异常 添加参数type=6,是处理价格异常
noQuoteOrAutomaticNoQuote =
this.createClearanceFeeNoQuiteException(orderDO,
noQuoteOrAutomaticNoQuote,
......@@ -2757,7 +2757,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
return noQuoteOrAutomaticNoQuote;
}
//查询有无未报价异常 lanbm 2024-06-06 添加注释
//查询有无未报价异常
List<OrderExceptionDO> orderNoQuoteExceptionDOList =
orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndProdIdAndExceptionKey(
orderDO.getOrderId(),
......@@ -2774,7 +2774,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
"getTransportId=" + orderDO.getTransportId().toString() +
"getNeedOrderInquiry=" + orderItemDO.getNeedOrderInquiry();
//lanbm 2024-06-06 添加的逻辑点 海运和空运只要是单询价都按同一套逻辑来处理
// 添加的逻辑点 海运和空运只要是单询价都按同一套逻辑来处理
if (orderItemDO.getNeedOrderInquiry() == 1) {
//处理未报价异常，且是空运,且是单询价
if (CollectionUtil.isNotEmpty(orderNoQuoteExceptionDOList)) {
......@@ -2908,7 +2908,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
}
/*
生成单询价异常 lanbm 2024-06-06 添加注释
生成单询价异常
*/
private void createOrderInquiryException(OrderDO orderDO,
OrderItemDO orderItemDO,
......@@ -2969,7 +2969,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
}
/*
清关价异常处理 lanbm 2024-06-06 添加注释
清关价异常处理
*/
private int createClearanceFeeNoQuiteException(OrderDO orderDO,
int noQuoteOrAutomaticNoQuote,
......@@ -2980,7 +2980,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
z22.setCreatedate(new Date());
zTestMapper.insert(z22);
//lanbm 2024-06-17 添加的是否为空判断逻辑
// 添加的是否为空判断逻辑
if (orderDO == null) {
return noQuoteOrAutomaticNoQuote;
}
......@@ -3004,7 +3004,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderDO.getTransportId().toString() +
" NeedOrderInquiry=" + orderItemDO.getNeedOrderInquiry().toString();
//lanbm 2024-06-06 添加的逻辑点 海运和空运设置了单询价都用同一套逻辑
// 海运和空运设置了单询价都用同一套逻辑
if (orderItemDO.getNeedOrderInquiry() == 1) {
//根据订单号查询是否有清关费异常
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java
View file @ 611f4776
......@@ -269,7 +269,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
OrderBackVO order = orderQueryService.getOrder(orderFeeApplicationDO.getOrderId());
//生成应收
DictDataRespDTO dictDto = DictFrameworkUtils.getDictDataFromCache("receivable_fee_type", String.valueOf(orderFeeApplicationDO.getFeeType()));
//lanbm 2024-05-16 修复应收款记录不存在的BUG,
//修复应收款记录不存在的BUG,
//添加应收款记录是否存在的判断
ReceivableDO rDo = null;
if (orderFeeApplicationDO.getReceivableId() != null &&
......@@ -277,14 +277,14 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
long idTemp = (long) orderFeeApplicationDO.getReceivableId();
rDo = receivableService.getReceivable(idTemp);
}
//end lanbm 2024-05-16 修复应收款记录不存在的BUG
//end 修复应收款记录不存在的BUG
if (orderFeeApplicationDO.getReceivableId() != null &&
orderFeeApplicationDO.getReceivableId() > 0 &&
rDo != null) {
ReceivableDO receivableDO = new ReceivableDO();
//orderFeeApplicationDO 审批信息关联的应收款ID
//lanbm 2024-05-15 添加的注释
// 添加的注释
receivableDO.setId(Long.valueOf(orderFeeApplicationDO.getReceivableId()));
receivableDO.setTitleZh(dictDto.getLabel());
receivableDO.setTitleEn(dictDto.getLabelEn());
......@@ -348,7 +348,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
}
}
/* lanbm 2024-05-11 添加注释
/*
//result
1, "处理中",
2, "通过",
......@@ -374,7 +374,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
DictDataRespDTO dictDto = DictFrameworkUtils.getDictDataFromCache("receivable_fee_type", String.valueOf(feeApplicationDO.getFeeType()));
if (feeApplicationDO.getReceivableId() != null && feeApplicationDO.getReceivableId() > 0) {
ReceivableDO receivableDO = new ReceivableDO();
//应收款ID lanbm 2024-05-11 添加注释
//应收款ID
receivableDO.setId(Long.valueOf(feeApplicationDO.getReceivableId()));
receivableDO.setTitleZh(dictDto.getLabel());
receivableDO.setTitleEn(dictDto.getLabelEn());
......@@ -391,7 +391,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
receivableDO.setFeeSource(2);
receivableDO.setAuthor(feeApplicationDO.getApplicationAuthor());
receivableDO.setRemark(feeApplicationDO.getRemarks());
//lanbm 2024-05-11 添加注释，订单费用申请，是申请付给我们的费用，
//订单费用申请，是申请付给我们的费用，
// 所以要更新应收款信息
receivableService.updateReceivableById(receivableDO);
} else {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java
View file @ 611f4776
......@@ -762,7 +762,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
}
/*
lanbm 2024-06-11 添加的函数
添加的函数
*/
private void getDaoCanTiam(List<OrderTimeDO> orderTimeList) {
if (CollectionUtil.isEmpty(orderTimeList)) {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 611f4776
......@@ -187,7 +187,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
/*
后台创建订单 memberUserDO 信息为空
lanbm 2024-05-27 添加注释
ecw_admin_client 临时放置创建的收货人，发货人联系人信息
*/
@Override
......@@ -2164,21 +2164,21 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderBusinessService.addOrderOperateLog(updateObj.getOrderId(),
"编辑订单", null);
//lanbm 2024-04-13 修改，在创建完订单号，计算订单业绩类型
//修改，在创建完订单号，计算订单业绩类型
Long orderId = updateReqVO.getOrderId();
CalculateOrderYeJiTypeEvent even = new CalculateOrderYeJiTypeEvent();
even.setOrderId(orderId);
applicationContext.publishEvent(even);
//end lanbm 2024-04-13 修改，在创建完订单号，计算订单业绩类型
//end 在创建完订单号，计算订单业绩类型
//入仓完成，计算V值 lanbm 2024-05-13 add
//入仓完成，计算V值
/*27号注释
CalculateOrderVValueEvent event=new CalculateOrderVValueEvent();
event.setOrderId(updateObj.getOrderId());
applicationContext.publishEvent(event);
*/
//end 入仓完成，计算V值 lanbm 2024-05-13 add
//end 入仓完成，计算V值
}
......@@ -2970,7 +2970,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
CustomerDO newCustomerDO = customerService.getCustomer(orderConsignorBackVO.getCustomerId());
infoVO = new ApplyInfoVO();
infoVO.setName("新规则，控货订单客户归属不变动/Change in customer ownership for orders");
//lanbm 2024-06-18 出掉控货改变业绩归属的逻辑点
// 出掉控货改变业绩归属的逻辑点
//infoVO.setOrgValue(Objects.nonNull(orgCustomerDO) ? ((StringUtils.isNotBlank(orgCustomerDO.getName()) ? orgCustomerDO.getName() : "无") + "/" + (StringUtils.isNotBlank(orgCustomerDO.getNameEn()) ? orgCustomerDO.getNameEn() : "empty")) : "无/not have");
//infoVO.setNewValue(Objects.nonNull(newCustomerDO) ? ((StringUtils.isNotBlank(newCustomerDO.getName()) ? newCustomerDO.getName() : "无") + "/" + (StringUtils.isNotBlank(newCustomerDO.getNameEn()) ? newCustomerDO.getNameEn() : "empty")) : "无/not have");
//vo.setCustomerId(orderConsignorBackVO.getCustomerId());
......@@ -6546,7 +6546,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
/*
更新订单业绩类型 yeji_type,yeji_create_date,cal_v_value
lanbm 2024-05-13 add
yejiType 0是老客户业界，1 是新客户业绩
*/
public void UpdateOrderYeJiType(Long orderId, int yejiType) {
......@@ -6554,7 +6554,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
/*
更新订单V值 lanbm 2024-05-13 add
更新订单V值
yeji_create_date 业绩产生时间,方便报表统计
*/
public void UpdateOrderVValue(Long orderId, BigDecimal calVvalue, Date
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderSplit/OrderSplitServiceImpl.java
View file @ 611f4776
......@@ -1562,7 +1562,7 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
// 根据母订单id删除相关拆单信息
splitItemMapper.deleteByOrderId(parentOrder.getOrderId());
splitMapper.deleteByOrderId(parentOrder.getOrderId());
// 删除已撤销的拆单 lanbm 2024-06-05 处理审批流BUG
// 删除已撤销的拆单 处理审批流BUG
orderService.deleteOrderByParentOrderId(parentOrder.getOrderId(),
childrenOrderList);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
View file @ 611f4776
......@@ -497,7 +497,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
List<String> pictureUrls, boolean isDeleteNotInWarehouseIn,
boolean isUpdateWarehouseProdAttrIds) {
//lanbm 2024-05-21 添加注释
//
boolean isAddNewOrderItem = createReqVO.getType() != 0;
OrderItemDO orderItemDO;
String unit = null;
......@@ -1283,7 +1283,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
finishReqVO.getIsSumVolumeNoChange(), finishReqVO.getIsSumWeightNoChange(), finishStocked);
// 处理发货人异常
//需要到仓确认，需要自动生成发货人异常信息 lanbm 2024-06-03 add
//需要到仓确认，需要自动生成发货人异常信息
processConsignorException(finishReqVO, orderId, orderDO);
// 重新调用计算订单价格, 订单信息和订单项信息需要重新查询，
......@@ -1462,7 +1462,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
applicationContext.publishEvent(event);
*/
// end 入仓完成，计算V值 lanbm 2024-05-13 add
// end 入仓完成，计算V值
// 返回是否包含异常
return exceptionNum > 0;
}
......@@ -2245,7 +2245,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
BigDecimal chargeWeight = BigDecimal.ZERO;
BigDecimal chargeQuantity = BigDecimal.ZERO;
for (OrderItemDO item : orderItemDOList) {
//lanbm 2024-05-04 添加短信发送体积数异常问题分析注释
// 添加短信发送体积数异常问题分析注释
//计价体积和最小计量体积做对比
chargeVolume = chargeVolume.add((Objects.nonNull(item.getChargeVolume()) && item.getChargeVolume().compareTo(item.getMinMeteringVolume()) > 0)
|| item.getChargeVolume().compareTo(BigDecimal.ZERO) == 0 ? item.getChargeVolume() : item.getMinMeteringVolume());
......@@ -2731,7 +2731,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
@Override
@Transactional(rollbackFor = {Exception.class})
public String updateOrUpdateApply(@Valid OrderWarehouseInUpdateApplyReqVO updateReqVO) {
//lanbm 2024-05-21 处理删除记录失效的问题
// 处理删除记录失效的问题
Long orderId = updateReqVO.getOrderId();
Long orderItemId = updateReqVO.getOrderItemId();
Long prodId = updateReqVO.getProdId();
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/task/CreateConsigneeCustomerJob.java
View file @ 611f4776
......@@ -22,7 +22,7 @@ import java.util.List;
/**
* 创建收货人客户任务
* lanbm 2024-05-27 添加注释 创建收货人客户
* 添加注释 创建收货人客户
*/
@Component
@TenantJob
......@@ -54,7 +54,7 @@ public class CreateConsigneeCustomerJob implements JobHandler {
*/
@Override
public String execute(String param) throws Exception {
//获取14天未入库的订单的收货人 lanbm 2024-05-28 添加注释
//获取14天未入库的订单的收货人
List<OrderDO> noConsigeeCustomerOrderList =
orderQueryService.getNoConsigeeCustomerOrderList(14);
......
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderTimeMapper.xml
View file @ 611f4776
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.order.dal.mysql.orderTime.OrderTimeMapper">
<!--根据订单获取柜号 lanbm 2024-06-13 add-->
<!--根据订单获取柜号 -->
<select id="getShipment_id" resultType="java.lang.Long">
SELECT DISTINCT shipment_id from ecw_box_load_info
where order_id=#{orderId} limit 1
</select>
<!--根据柜号获取卸柜时间 lanbm 2024-06-13 add-->
<!--根据柜号获取卸柜时间-->
<select id="getUlboxtime" resultType="java.util.Date">
<!--
select ul_box_time from ecw_box_cabinet_unload
......
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderCargoControl/OrderCargoControlController.java
View file @ 611f4776
......@@ -87,7 +87,7 @@ public class OrderCargoControlController {
/*
控货订单列表 lanbm 2024-06-05 添加注释
控货订单列表
*/
@GetMapping("/cargo/control/order")
@ApiOperation("获得控货订单列表查询订单分页")
......
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderExceptionResult/orderException/OrderExceptionController.java
View file @ 611f4776
......@@ -109,7 +109,7 @@ public class OrderExceptionController {
}
/*
根据订单ID获取订单异常处理记录 lanbm 2024-06-04 添加注释
根据订单ID获取订单异常处理记录
*/
@GetMapping("/getExceptionListByOrderId")
@ApiOperation("根据订单ID获取所有的订单异常列表")
......@@ -119,7 +119,7 @@ public class OrderExceptionController {
orderExceptionService.getOrderExceptionListByOrderId(orderId);
for (OrderExceptionBackVO v : list
) {
//lanbm 2024-06-23 处理少箱异常，创建时间和处理时间一致
// 处理少箱异常，创建时间和处理时间一致
if (v.getHandlerRemark() != null
&& v.getOrderExceptionType() != null) {
if (v.getHandlerRemark().equals("系统自动处理 处理人admin") &&
......
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderWarehouseIn/OrderWarehouseInController.java
View file @ 611f4776
......@@ -109,7 +109,7 @@ public class OrderWarehouseInController {
// }
/*
入仓记录修改 lanbm 2024-05-28 添加注释
入仓记录修改
*/
@PutMapping("/update-or-updateApply")
@ApiOperation("入仓中直接入仓修改，完成入仓的发起修改请求")
......
yudao-module-sale/yudao-module-sale-rest/src/main/java/cn/iocoder/yudao/module/sale/controller/admin/offer/OfferController.java
View file @ 611f4776
......@@ -265,7 +265,7 @@ public class OfferController {
@GetMapping("/select")
@ApiOperation(value = "获得可以关联的报价单列表下拉框数据", notes = "获取订单关联的报价单列表，当订单已关联报价单时会给错误提示，不能再关联其他报价单")
public CommonResult<List<OfferRespVO>> getOfferSelect(@Valid OrderAssociationOfferQueryVO queryVO) {
//lanbm 2024-05-29 核查订单关联报价单异常，添加注释
// 核查订单关联报价单异常
queryVO.setUserType(2);
List<OfferRespVO> respVOList = offerService.getOfferSelect(queryVO);
return success(respVOList);
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxCost/BoxCostBackVO.java
View file @ 611f4776
......@@ -73,13 +73,13 @@ public class BoxCostBackVO {
private String payPriceBz;
/*
付款单单号 lanbm 2024-05-16 add
付款单单号
*/
@ExcelProperty("付款单单号")
private String payableNo;
/*
付款单费用明细ID lanbm 2024-05-16 add
付款单费用明细ID
*/
private long payableId;
......
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/download/DownloadTypeEnum.java
View file @ 611f4776
......@@ -165,12 +165,12 @@ public enum DownloadTypeEnum implements IntArrayValuable {
ACHIEVEMENT_DETAIL_EXCEL_EXPORT(30),
/*
客户分析报表导出 lanbm 2024-05-01 add
客户分析报表导出
*/
REPORT_CSSTOMER_ANALYSIS(31),
/*
销售分析报表导出 lanbm 2024-05-01 add
销售分析报表导出
*/
REPORT_SALES_ANALYSIS(32),
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/downloadLog/DownloadLogServiceImpl.java
View file @ 611f4776
......@@ -273,7 +273,7 @@ public class DownloadLogServiceImpl extends AbstractService<DownloadLogMapper, D
break;
// ......不同类型的文件制作
case SHIPMENT_PRELOAD_EXCEL_EXPORT:
//预装单导出 lanbm 2024-05-22 添加注释
//预装单导出
shipmentPreloadExcelExportPushEvent(downloadLog);
break;
//异常订单导出
......@@ -283,10 +283,10 @@ public class DownloadLogServiceImpl extends AbstractService<DownloadLogMapper, D
//已装单导出
case SHIPMENT_LOAD_EXCEL_EXPORT:
shipmentLoadExcelExportPushEvent(downloadLog);
//lanbm 2024-06-10 总体切换
//总体切换
//shipmentLoadExcelExportPushEvent2(downloadLog);
break;
//应收汇总导出 lanbm 2024-05-24 修改导出Excel样式
//应收汇总导出修改导出Excel样式
case SHIPMENT_RECEIVABLE_EXCEL_EXPORT:
//老模板导出方式
//shipmentReceivableExcelExportPushEvent(downloadLog);
......@@ -633,7 +633,7 @@ public class DownloadLogServiceImpl extends AbstractService<DownloadLogMapper, D
}
/*
lanbm 2024-05-25 add
*/
private void shipmentReceivableExcelExportPushEvent2(DownloadLogDO downloadLog) {
ShipmentReceivableExcelExportPushEvent2 event =
......@@ -854,7 +854,7 @@ public class DownloadLogServiceImpl extends AbstractService<DownloadLogMapper, D
}
/*
lanbm 2024-05-01 add
客户分析
*/
private void REPORT_CSSTOMER_ANALYSIS_Event(DownloadLogDO downloadLog) {
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
View file @ 611f4776
......@@ -201,7 +201,7 @@ public interface AdminUserService {
List<AdminUserDO> getUsersByStatus(Integer status);
/*
获取所有用户信息 lanbm 2024-05-17 add
获取所有用户信息
*/
List<AdminUserDO> getUsersList();
......
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
View file @ 611f4776
......@@ -446,7 +446,7 @@ public class AdminUserServiceImpl implements AdminUserService {
}
/*
lanbm 2024-05-17 add
*/
public List<AdminUserDO> getUsersList() {
return userMapper.selectList();
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/payable/PayableDO.java
View file @ 611f4776
......@@ -134,7 +134,7 @@ public class PayableDO extends BaseDO {
private Long shippingFeeId;
/*
费用产生时间 lanbm 2024-05-17 add
费用产生时间
*/
private Date freecsdate;
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/payment/PaymentDO.java
View file @ 611f4776
......@@ -160,17 +160,17 @@ public class PaymentDO extends BaseDO {
private String fkren;
/*
核销时间 lanbm 2024-05-17 add
核销时间
*/
private Date hexiaodate;
/*
编辑付款单时的备注 lanbm 2024-05-30 add
编辑付款单时的备注
*/
private String editreason;
/*
附件路径 lanbm 2024-05-30 add
附件路径
*/
private String filepath;
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/receipt/ReceiptDO.java
View file @ 611f4776
......@@ -210,12 +210,12 @@ public class ReceiptDO extends BaseDO {
private String financeRemark;
/*
订单ID lanbm 2024-05-20 add
订单ID
*/
private long orderId;
/*
订单编号 lanbm 2024-05-20 add
订单编号
*/
private String orderNo;
}
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/enums/ErrorCodeConstants.java
View file @ 611f4776
......@@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
* member 系统，使用 1-004-000-000 段
*/
public interface ErrorCodeConstants {
//lanbm 2024-05-15 处理过此异常
// 处理过此异常
ErrorCode RECEIVABLE_NOT_EXISTS = new ErrorCode(1004520001, "wealth.receivable_not_exists");
ErrorCode RECEIPT_NOT_EXISTS = new ErrorCode(1004520002, "wealth.receipt_not_exists");
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/FinanceReceiptApproveService.java
View file @ 611f4776
......@@ -77,7 +77,7 @@ public class FinanceReceiptApproveService {
throw exception(RECEIPT_NOT_FOUND);
}
ReceiptDO updateReceipt = new ReceiptDO();
//lanbm 2024-05-20 add 添加订单ID的修改，不然订单ID就丢失了
//添加订单ID的修改，不然订单ID就丢失了
updateReceipt.setOrderId(receiptDO.getOrderId());
updateReceipt.setId(receiptDO.getId());
......@@ -131,7 +131,7 @@ public class FinanceReceiptApproveService {
throw exception(RECEIPT_NOT_FOUND);
}
ReceiptDO updateReceipt = new ReceiptDO();
//lanbm 2024-05-20 add 添加订单ID的修改，不然订单ID就丢失了
// 添加订单ID的修改，不然订单ID就丢失了
updateReceipt.setOrderId(receiptDO.getOrderId());
updateReceipt.setId(receiptDO.getId());
updateReceipt.setBmpStatus(result);
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/payable/PayableServiceImpl.java
View file @ 611f4776
......@@ -45,7 +45,7 @@ public class PayableServiceImpl extends AbstractService<PayableMapper, PayableDO
private PayableMapper payableMapper;
/*
lanbm 2024-05-17 add
*/
@Autowired
private AdminUserService adminUserService;
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/payment/PaymentServiceImpl.java
View file @ 611f4776
......@@ -178,10 +178,10 @@ public class PaymentServiceImpl extends AbstractService<PaymentMapper, PaymentDO
}
//lanbm 2024-05-31 add
//
String sFilePath= JSONUtil.toJsonStr(updateReqVO.getFilelist()) ;
updateObj.setFilepath(sFilePath);
//end lanbm 2024-05-31 add
//end
paymentMapper.updateById(updateObj);
//修改应付明细里面的付款单信息
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receipt/ReceiptServiceImpl.java
View file @ 611f4776
......@@ -444,7 +444,7 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
page.setField("er.id");
IPage<ReceiptBackVO> mpPage = MyBatisUtils.buildPage(page);
receiptMapper.getReceiptBackPage(mpPage, query);
//lanbm 2024-05-14 添加明细状态计算列表
//添加明细状态计算列表
//MxStatus
//获取List指定字段的List
List<Long> idList = mpPage.getRecords().stream()
......@@ -584,7 +584,7 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
}
/*
lanbm 2024-06-06 add
实收金额
*/
private String getSSShow(List<ReceiptItemDO> listItemList,
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/payable/PayableBackVO.java
View file @ 611f4776
......@@ -148,7 +148,7 @@ public class PayableBackVO {
/*
运输方式 lanbm 2024-05-17 add
运输方式
*/
private String transportTypeName;
......@@ -164,7 +164,7 @@ public class PayableBackVO {
private Integer shipmentStatusAir;
/*
费用产生时间 lanbm 2024-05-17 add
费用产生时间
日期格式转换
*/
@ApiModelProperty(value = "费用产生日期")
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/payable/PayableBaseVO.java
View file @ 611f4776
......@@ -99,7 +99,7 @@ public class PayableBaseVO {
/*
费用产生时间 lanbm 2024-05-17 add
费用产生时间
一定要加格式转换注解，不然前端过来的字符串就会报异常
*/
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/payment/FinancePaymentVo.java
View file @ 611f4776
......@@ -19,7 +19,7 @@ public class FinancePaymentVo {
private String paymentNo;
/*
lanbm 2024-05-17 add
原来的付款备注没有保存
*/
@ApiModelProperty(value = "付款备注")
......@@ -30,19 +30,19 @@ public class FinancePaymentVo {
/*
实际付款时间 lanbm 2024-05-17 add
实际付款时间
*/
@ApiModelProperty(value = "实际付款时间")
private Date sjfkdate;
/*
付款人，核销操作人 lanbm 2024-05-17 add
付款人，核销操作人
*/
@ApiModelProperty(value = "付款人")
private String fkren;
/*
核销时间 lanbm 2024-05-17 add
核销时间
*/
@ApiModelProperty(value = "核销时间")
private Date hexiaodate;
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/payment/PaymentBaseVO.java
View file @ 611f4776
......@@ -106,25 +106,25 @@ public class PaymentBaseVO {
private Integer settlementType;
/*
实际付款时间 lanbm 2024-05-17 add
实际付款时间
*/
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private Date sjfkdate;
/*
编辑付款单时的备注 lanbm 2024-05-30 add
编辑付款单时的备注
*/
@ApiModelProperty(value = "备注信息")
private String editreason;
/*
附件路径 lanbm 2024-05-30 add
附件路径
*/
@ApiModelProperty(value = "附件路径")
private String filepath;
/*
文件列表 lanbm 2024-05-31 add
文件列表
*/
private List<FileModel> filelist;
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receipt/ReceiptBaseVO.java
View file @ 611f4776
......@@ -153,12 +153,12 @@ public class ReceiptBaseVO {
/*
订单ID lanbm 2024-05-20 add
订单ID
*/
private long orderId;
/*
订单编号 lanbm 2024-05-20 add
订单编号
*/
private String orderNo;
......
yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/payment/PaymentController.java
View file @ 611f4776
......@@ -97,7 +97,7 @@ public class PaymentController {
Collectors.toMap((AdminUserDO::getId),
AdminUserDO::getNickname));
//lanbm 2024-05-17 修改问题点
//修改问题点
PaymentDO payment = paymentService.getPayment(id);
if (payment.getFkren()!=null&& payment.getFkren().length() > 0) {
payment.setFkren(userMap.get(Long.parseLong(payment.getFkren())));
......@@ -170,7 +170,7 @@ public class PaymentController {
@Idempotent(timeout = 5)
/*//@PreAuthorize("@ss.hasPermission('ecw:receipt:query')")*/
public CommonResult<Boolean> verification(@RequestBody FinancePaymentVo financePaymentVo) {
//核销 lanbm 2024-05-17 update
//核销
Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
financePaymentVo.setFkren(loginUserId.toString());
paymentService.verification(financePaymentVo);
......
yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/receipt/ReceiptController.java
View file @ 611f4776
......@@ -135,7 +135,7 @@ public class ReceiptController {
/*
批量收款单反审核 lanbm 2024-05-29 add
批量收款单反审核
*/
@PostMapping("/financeApproveNo2")
@ApiOperation("收款单发起反审核")
......
yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/receiptItem/ReceiptItemController.java
View file @ 611f4776
......@@ -56,13 +56,13 @@ public class ReceiptItemController {
private ReceiptItemMapper receiptItemMapper;
/*
币种 lanbm 2024-06-10 add
币种
*/
@Resource
CurrencyApi currencyApi;
/*
lanbm 2024-05-17 add
*/
@Autowired
private AdminUserService adminUserService;
......@@ -101,7 +101,7 @@ public class ReceiptItemController {
public CommonResult<ReceiptItemBackVO> getReceiptItem(@RequestParam("id") Long id) {
ReceiptItemDO receiptItem = receiptItemService.getReceiptItem(id);
ReceiptItemBackVO v = ReceiptItemConvert.INSTANCE.convert(receiptItem);
//计算剩余金额 lanbm 2024-06-10 add
//计算剩余金额
//BigDecimal p = receiptItemService.getWriteOffAmountByReceiptId(id);
//BigDecimal t = receiptAccountMapper.getWriteOffAmountByReceiptId(id);
getSY(v, v.getReceiptId());
......@@ -227,7 +227,7 @@ public class ReceiptItemController {
}
/*
lanbm 2024-05-30 批量提交审核功能
批量提交审核功能
{
"receiptId": "12",
"receiptNo": "SKD00000011",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment