From ac9a3c774d1250927f177186b94ee98415795385 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 24 Jan 2025 16:07:47 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E9=94=80=E5=94=AE=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsSupplierController.java | 2 +- .../modules/oms/entity/OmsSaleOrder.java | 5 +++ .../oms/service/OmsSaleOrderService.java | 2 + .../service/impl/OmsSaleOrderServiceImpl.java | 37 ++++++++++++++++++- .../tbs/controller/TbsActivityController.java | 3 +- .../controller/VtbVerificationController.java | 12 ++++-- .../java/com/qs/serve/task/TzcPolicyTask.java | 2 +- 7 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 71b55828..59bc918d 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -603,7 +603,7 @@ public class BmsSupplierController { bmsSupplier.setRegion2Label(region2.getName()); } List userVos = new ArrayList<>(); - if(bmsSupplier.getUserId()!=null){ + if(StringUtils.hasText(bmsSupplier.getUserId())){ SysUser sysUser = sysUserService.getById(bmsSupplier.getUserId()); SysUserSimpleVo simpleVo = sysUser.toSimpleVo(true); simpleVo.setSupplierMainFlag(1); diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java index 308b3df6..edf9f1ad 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java @@ -268,6 +268,11 @@ public class OmsSaleOrder implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private LocalDate preDeliveryDate; + /** + * preDeliveryState=1，不自动触发更新 + */ + private Integer preDeliveryState; + /** 生产备注 */ private String productionRemark; diff --git a/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java b/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java index ac43da5a..d217f8c1 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java +++ b/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java @@ -31,6 +31,8 @@ public interface OmsSaleOrderService extends IService { */ OmsPlanResult getPlanList(OmsPlanParam param); + void flushPreDelivery(String orderId); + BigDecimal getExpiredOrderRateById(String oaId); List> selectExpiredOrderRates(); diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index 53bd7b4b..369585c4 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -136,12 +136,12 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl omsSaleOrderItems = omsSaleOrderItemService.listByOrderId(Long.parseLong(param.getOmsOrderId())); for (OmsSaleOrderItem orderItem : omsSaleOrderItems) { for (OmsPlanResult.InvPlanItem planItem : itemList) { @@ -159,6 +159,26 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl omsSaleOrderItems = omsSaleOrderItemService.listByOrderId(Long.parseLong(orderId)); + OmsPlanParam omsPlanParam = new OmsPlanParam(); + omsPlanParam.setOmsOrderId(orderId); + List invItemList = new ArrayList<>(); + for (OmsSaleOrderItem orderItem : omsSaleOrderItems) { + OmsPlanParam.InvItem invItem = new OmsPlanParam.InvItem(); + invItem.setInvCode(orderItem.getSkuCode()); + invItem.setQty(orderItem.getQuantity()); + invItemList.add(invItem); + } + omsPlanParam.setInvItemList(invItemList); + this.getPlanList(omsPlanParam); + } + + } + @Override public BigDecimal getExpiredOrderRateById(String oaId) { return baseMapper.getExpiredOrderRates(oaId); @@ -432,6 +452,10 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl reset(@PathVariable("id") Long id){ tbsActivityDebugApplicationService.reset(id); - return R.ok(); + TbsActivity activity = tbsActivityService.getById(id); + return R.ok(activity.getActivityCode()+"=="+activity.getActTitle()); } @GetMapping("/resetList") diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 8cbcc86f..77282293 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -418,17 +418,23 @@ public class VtbVerificationController { * @return */ @GetMapping("/toPayRequest") - public R toPayRequest(Long verificationId,Integer fullState){ + public R toPayRequest(Long verificationId,Integer fullState,String verCode){ //预先调用伟成同步状态接口，减少查询记录数 String url = projectApisProperties.getCheckPayStatus(); HttpUtil.doGet(url,null); - if(fullState!=null&&fullState.equals(1)){ + //不在维护true + if(fullState!=null&&fullState.equals(1)&&false){ List vids = vtbVerificationMapper.listNotPayVerifyIds(); for (Long vid : vids) { vtbVerificationService.toPayRequest(vid); } }else { - vtbVerificationService.toPayRequest(verificationId); + VtbVerification verification = vtbVerificationMapper.selectById(verificationId); + if(verification.getVerificationCode().equals(verCode)){ + vtbVerificationService.toPayRequest(verificationId); + return R.ok(); + } + return R.error("missCode"); } return R.ok(); } diff --git a/src/main/java/com/qs/serve/task/TzcPolicyTask.java b/src/main/java/com/qs/serve/task/TzcPolicyTask.java index 55c392bc..7b1665fc 100644 --- a/src/main/java/com/qs/serve/task/TzcPolicyTask.java +++ b/src/main/java/com/qs/serve/task/TzcPolicyTask.java @@ -40,7 +40,7 @@ public class TzcPolicyTask { /** * 同步政策到销路通 */ - @Scheduled(cron="0 0 3 * * ?") + @Scheduled(cron="0 20 * * * ?") public void syncPolicyToXlt(){ AuthContextUtils.setTenant("001"); LambdaQueryWrapper itemLqw = new LambdaQueryWrapper<>();