Skip to content

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

Merge branch 'dev' 

# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/BpmCreateServiceFactoryImpl.java
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
#	yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
parents cf0ca276 72fdc215
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 406 additions and 649 deletions
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/BpmCreateServiceFactoryImpl.java
View file @ 52c72085
......@@ -34,13 +34,15 @@ public class BpmCreateServiceFactoryImpl implements BpmCreateServiceFactory {
* @param copyUserId 抄送人列表,不需要传null
* @return 流程实例ID，需回写到表单对象中
*/
public String createBmp(Long userId, Long orderFormId, String workFlowKey, String businessNo, String[] copyUserId) {
public String createBmp(Long userId, Long orderFormId, String workFlowKey,
String businessNo, String[] copyUserId) {
Map<String, Object> processInstanceVariables = new HashMap<>();
if (StrUtil.isNotBlank(businessNo)) {
processInstanceVariables.put("businessNo", businessNo);
}
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(workFlowKey).setVariables(processInstanceVariables).setBusinessKey(String.valueOf(orderFormId)).setCopyUserIds(copyUserId));
String processInstanceId =
processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(workFlowKey).setVariables(processInstanceVariables).setBusinessKey(String.valueOf(orderFormId)).setCopyUserIds(copyUserId));
return processInstanceId;
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
View file @ 52c72085
......@@ -2226,8 +2226,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
// 没有待处理的清关费未报价异常，则需要生成
//生成清关费异常 lanbm 2024-06-06 添加参数type=6,是处理价格异常
noQuoteOrAutomaticNoQuote =
this.createClearanceFeeNoQuiteException(
orderDO,
this.createClearanceFeeNoQuiteException(orderDO,
noQuoteOrAutomaticNoQuote,
orderItemDO, type);
// 这里可能因为自动处理未报价异常(包括未报价清关费异常)时，
......@@ -2443,7 +2442,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
}
//lanbm 2024-06-06 添加的逻辑点
*/
noQuoteOrAutomaticNoQuote=1;
if (orderItemDO.getItemStatus() == -1 && !orderItemDO.getIsProd()) {
if (CollectionUtil.isEmpty(orderNoQuoteExceptionDOList)) {
......@@ -2608,22 +2607,16 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
// 查询是否有重量超限异常，如果有则不生成清关费异常
// TODO 查询是否有重量超限异常和渠道包装重量超限异常，如果有则不生成清关费异常
List<OrderExceptionDO> goodsOverweightExceptionDOList =
orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndProdIdAndExceptionKeys(
orderDO.getOrderId(),
orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndProdIdAndExceptionKeys(orderDO.getOrderId(),
null,
orderItemDO.getProdId(),
CollectionUtil.newArrayList(
OrderExceptionEnum.GOODS_OVERWEIGHT_EXCEPTION.getKey(),
OrderExceptionEnum.LINE_WEIGHT_EXCEPTION.getKey()));
CollectionUtil.newArrayList(OrderExceptionEnum.GOODS_OVERWEIGHT_EXCEPTION.getKey(), OrderExceptionEnum.LINE_WEIGHT_EXCEPTION.getKey()));
/*
String s = "type=" + type.toString() + " TransportId=" +
orderDO.getTransportId().toString() +
" NeedOrderInquiry=" + orderItemDO.getNeedOrderInquiry().toString();
//lanbm 2024-06-06 添加的逻辑点
//空运，单询价
if (orderDO.getTransportId() == 3
&& orderItemDO.getNeedOrderInquiry() == 1) {
......@@ -2635,8 +2628,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
OrderExceptionEnum.CUSTOMS_FEE_NOT_QUOTE_EXCEPTION.getKey());
if (CollectionUtil.isNotEmpty(orderClearanceFeeNoQuoteExceptionDOList)) {
// 当其他业务补充了品名空运清关费价格后，
// 如果还有待处理的清关费未报价异常，需要同步处理掉
// 当其他业务补充了品名空运清关费价格后，如果还有待处理的清关费未报价异常，需要同步处理掉
orderExceptionService.autoProcessException(orderDO.getOrderId(),
orderItemDO.getOrderItemId(),
OrderExceptionEnum.CUSTOMS_FEE_NOT_QUOTE_EXCEPTION,
......@@ -2655,7 +2647,6 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
zTest z = new zTest();
z.setTestname(s);
z.setCreatedate(new Date());
zTestMapper.insert(z);
}*/
//end lanbm 2024-06-06 添加的逻辑点
......@@ -2670,7 +2661,6 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderItemDO.getOrderItemId(),
OrderExceptionEnum.CUSTOMS_FEE_NOT_QUOTE_EXCEPTION.getKey());
//运费加清关价才生成清关费异常 lanbm 2024-06-06 添加注释
//计费方式：0 运费/清关费 1 全包价
if (orderItemDO.getCharging() == 0 &&
(Objects.isNull(orderItemDO.getOriginalClearanceFreight()) ||
orderItemDO.getOriginalClearanceFreight().compareTo(BigDecimal.ZERO) == 0)
......@@ -2716,7 +2706,6 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
}
}
return noQuoteOrAutomaticNoQuote;
}
private void createFeeChangeException(OrderDO orderDO, Integer type, BigDecimal oldFreightAndClearanceFee, BigDecimal newFreightAndClearanceFee) {
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
View file @ 52c72085
......@@ -218,8 +218,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
if (null != createReqVO.getNeedBackend() && createReqVO.getNeedBackend()) {
OrderDO orderDo = orderService.getById(createReqVO.getOrderId());
OrderObjectiveDO orderObjectiveDO =
orderObjectiveService.getByOrderId(orderDo.getOrderId());
OrderObjectiveDO orderObjectiveDO = orderObjectiveService.getByOrderId(orderDo.getOrderId());
/*BoxDO box = boxService.getBox(shipmentId);
......@@ -265,8 +264,8 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
orderService.selectOne(OrderDO::getOrderId,
createReqVO.getOrderId());
//创建审批流
/* lanbm 2024-06-13 不创建审批流程
//lanbm 2024-06-13 取消流程的创建
/*
String bpmProcessId =
bpmCreateServiceFactory.createBmp(
SecurityFrameworkUtils.getLoginUserId(),
......@@ -275,8 +274,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
orderDO.getOrderNo(),
createReqVO.getCopyUserId());
makeBillOfLading.setBpmProcessId(bpmProcessId);
*/
*/
//lanbm 2024-05-24 修改为自动审批通过
//ecw_make_bill_of_lading
/*
......
yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/MakeBillOfLadingController.java
View file @ 52c72085
......@@ -193,7 +193,8 @@ public class MakeBillOfLadingController {
MakeBillOfLadingBackVO vResult =
MakeBillOfLadingConvert.INSTANCE.convert(lading);
//前端是根据 status 来判断的，此处逻辑可以不用理会
//lanbm 2024-06-13 添加注释
if (lading.getBpmProcessId() == null ||
lading.getBpmProcessId().length() == 0) {
vResult.setBpmStatus("-1");
......
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptItem/ReceiptItemReq.java
View file @ 52c72085
......@@ -76,4 +76,9 @@ public class ReceiptItemReq extends PageParam {
*/
private String accountNo;
/*
审批状态 lanbm 2024-06-13 add
*/
private String status;
}
yudao-module-wealth/yudao-module-wealth-rest/src/main/resources/mapper/ReceiptItem/BankReceiptDetailsMapper.xml
View file @ 52c72085
......@@ -17,6 +17,9 @@
<sql id="WherePage">
<where>
p.deleted=0
<if test="status != null and status != ''">
AND p.status=#{status}
</if>
<if test="accountNo != null and accountNo != ''">
AND p.account_no=#{accountNo}
</if>
......@@ -38,7 +41,7 @@
<!--收款明细提交审批日期-->
<if test="sDate2 != null and sDate2 != '' and
eDate2 != null and eDate2 != ''">
AND a.create_time BETWEEN #{sDate2} and #{eDate2})
AND a.create_time BETWEEN #{sDate2} and #{eDate2}
</if>
<!--收款明细提交审批通过日期-->
......
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