From 3d6d1bbe1d325f9acdb0559c698ba76ee5330898 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 15 Apr 2026 17:09:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=A7=E7=BB=93=E6=A8=A1=E5=85=B7=E8=AE=A1?= =?UTF-8?q?=E5=88=92-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/pojo/entity/MoldDemand.java | 6 + .../desk/order/pojo/vo/MoldDemandVo.java | 3 +- .../controller/MoldDemandController.java | 10 +- .../controller/YieldOrderController.java | 10 ++ .../desk/order/mapper/MoldApplyMapper.java | 2 + .../desk/order/mapper/MoldApplyMapper.xml | 8 ++ .../desk/order/mapper/MoldDemandMapper.java | 2 + .../desk/order/mapper/MoldDemandMapper.xml | 117 +++++++++++++++++- .../desk/order/service/IMoldApplyService.java | 2 + .../order/service/IMoldDemandService.java | 4 + .../order/service/IYieldOrderService.java | 3 + .../service/impl/MoldApplyServiceImpl.java | 5 + .../service/impl/MoldDemandServiceImpl.java | 36 ++++++ .../service/impl/YieldOrderServiceImpl.java | 19 ++- 14 files changed, 214 insertions(+), 13 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemand.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemand.java index 82e678d3..83a1c05f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemand.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemand.java @@ -3,6 +3,8 @@ package org.springblade.desk.order.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; import org.springframework.format.annotation.DateTimeFormat; @@ -55,18 +57,21 @@ public class MoldDemand extends BaseEntity { * 需求数量 */ @TableField(value = "DEMAND_NUM") + @JsonSerialize(nullsUsing = NullSerializer.class) private Double demandNum; /** * 库存量 */ @TableField(value = "STOCK_NUM") + @JsonSerialize(nullsUsing = NullSerializer.class) private Integer stockNum; /** * 占用量 */ @TableField(value = "OCCUPY_NUM") + @JsonSerialize(nullsUsing = NullSerializer.class) private Integer occupyNum; /** @@ -91,6 +96,7 @@ public class MoldDemand extends BaseEntity { * 数量 */ @TableField(value = "QUANTITY") + @JsonSerialize(nullsUsing = NullSerializer.class) private Long quantity; /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java index 6f2dab8c..b67557fa 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import org.springblade.desk.order.pojo.entity.MoldDemand; +import org.springblade.desk.order.pojo.entity.YieldOrder; import java.io.Serial; import java.util.List; @@ -53,7 +54,7 @@ public class MoldDemandVo extends MoldDemand { /** * 关联订单 */ - List linkOrderList; + List linkOrderList; /** * 申报记录 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java index 25921e52..79e36281 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java @@ -18,6 +18,7 @@ import org.springblade.desk.order.pojo.enums.MoldDemandEnum; import org.springblade.desk.order.pojo.vo.MoldDemandVo; import org.springblade.desk.order.service.IMoldDemandDetailService; import org.springblade.desk.order.service.IMoldDemandService; +import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.order.wrapper.MoldDemandWrapper; import org.springframework.web.bind.annotation.*; @@ -34,6 +35,8 @@ public class MoldDemandController extends BladeController { private final IMoldDemandService moldDemandService; private final IMoldDemandDetailService moldDemandDetailService; + private final IYieldOrderService orderService; + /** * 分页 */ @@ -54,12 +57,9 @@ public class MoldDemandController extends BladeController { @GetMapping("/detail") @Operation(summary = "详情", description = "") public R detail(String id) { - MoldDemand detail = moldDemandService.getById(id); + MoldDemandVo vo = moldDemandService.detail(id); + - MoldDemandVo vo = MoldDemandWrapper.build().entityVO(detail); - vo.setLinkOrderList(null); - vo.setToolUseList(null); - vo.setNearlyApplyList(null); return R.data(vo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index fdc1228a..9103eeda 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -180,6 +180,16 @@ public class YieldOrderController extends BladeController { return R.status(result); } + /** + * 订单接收 + */ + @PostMapping("/confirm") + @Operation(summary = "订单接收", description = "传入流程卡号") + public R confirm(@Parameter(description = "流程卡号", required = true) @RequestParam String cardNo) { + List list = yieldOrderService.confirm(cardNo); + return R.data(list); + } + /** * 批量确认 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.java index 8e4b1fa6..98cc8019 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.java @@ -31,4 +31,6 @@ public interface MoldApplyMapper extends BaseMapper { * @return */ List pageNearlyMonth(IPage page, MoldApply entity); + + MoldApply getDetailByPartCode(String partCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.xml index 5b19fd76..270e39ff 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.xml @@ -33,4 +33,12 @@ AND TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%')) + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java index e8364ec5..b55a8948 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java @@ -31,4 +31,6 @@ public interface MoldDemandMapper extends BaseMapper { * @return */ List pageNearlyMonth(IPage page, MoldDemand entity); + + MoldDemand getDetailById(String id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml index ac3675f1..99c763d6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml @@ -10,14 +10,63 @@ @@ -32,4 +81,60 @@ AND TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%')) + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldApplyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldApplyService.java index d2febd8d..05aa6dce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldApplyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldApplyService.java @@ -71,4 +71,6 @@ public interface IMoldApplyService extends BaseService { String keeper, String createMan, String memo); + + MoldApply getDetailByPartCode(String partCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java index d25a2431..d8b8e941 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java @@ -3,6 +3,7 @@ package org.springblade.desk.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.order.pojo.entity.MoldDemand; +import org.springblade.desk.order.pojo.vo.MoldDemandVo; import java.util.List; @@ -36,4 +37,7 @@ public interface IMoldDemandService extends BaseService { * @return */ boolean createByOderId(String orderId); + + + MoldDemandVo detail(String id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java index 65974d00..07762700 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java @@ -8,6 +8,7 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; import org.springblade.desk.order.pojo.entity.YieldOrder; +import org.springblade.desk.order.pojo.entity.YieldOrderCraft; import org.springblade.desk.order.pojo.entity.YieldPlan; import java.util.List; @@ -287,4 +288,6 @@ public interface IYieldOrderService extends BaseService { List getToolByPartCode(String partCode); void calculateCoatingMaterial(); + + List confirm(String cardNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldApplyServiceImpl.java index bfb8b891..bbab0953 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldApplyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldApplyServiceImpl.java @@ -86,4 +86,9 @@ public class MoldApplyServiceImpl extends BaseServiceImpl selectPage(IPage page, MoldDemand entity) { @@ -97,4 +111,26 @@ public class MoldDemandServiceImpl extends BaseServiceImpl orderIdList = Arrays.stream(vo.getLinkOrderIds().split(",")) + .map(String::trim) + .filter(s ->!s.isEmpty()) + .map(Long::valueOf) + .collect(Collectors.toList()); + List orderList = orderService.list(Wrappers.lambdaQuery().in(BaseEntity::getId,orderIdList)); + vo.setLinkOrderList(orderList); + } + MoldApply moldApply = moldApplyService.getDetailByPartCode(detail.getPartCode()); + MoldApplyVo moldApplyVo = MoldApplyWrapper.build().entityVO(moldApply); + List moldApplyList = new ArrayList<>(); + moldApplyList.add(moldApplyVo); + vo.setToolUseList(null); + vo.setNearlyApplyList(moldApplyList); + return vo; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index c26694eb..ea7834c4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -50,6 +50,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.text.MessageFormat; import java.time.LocalDate; import java.time.LocalDateTime; @@ -449,6 +450,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl confirm(String cardNo) { + YieldOrder yieldOrder = this.getOne(Wrappers.lambdaQuery().eq(YieldOrder::getCardNo,cardNo)); + if(yieldOrder != null){ + boolean result = this.verifyYieldOrderResource(yieldOrder); + if(result){ + List list = yieldOrderCraftService.list(Wrappers.lambdaQuery().eq(YieldOrderCraft::getYoId,yieldOrder.getId())); + return list; + } + } + return new ArrayList<>(); + } + /** * 验证零件子件信息 *