From bc57b72ca8fef2cf901343073408e576c8b64046 Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Sat, 13 Jun 2026 16:24:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E-?= =?UTF-8?q?=E6=A7=BD=E6=B6=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/service/impl/LiquidTankTaskServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java index 7bb1adc47..8007ef85c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java @@ -160,6 +160,10 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl list) { for (LiquidTankTask task : list) { + LiquidTank liquidTank = liquidTankService.getById(task.getLiquidTankId()); + if (liquidTank == null) { + return R.fail("槽液信息不存在"); + } task = basicChangeTaskStatus(task, LiquidTankTaskConst.S_PENDING_REVIEW); // task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_REVIEW); // todo:计算加药量,通过公式 公式尚未实现 公式计算的 需加药量。 @@ -169,6 +173,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl Date: Sat, 13 Jun 2026 16:54:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/wms/feign/WmsTaskClient.java | 21 ++++++++++- .../wms/StBuyOrderApprovalServiceImpl.java | 32 +++++++++++++++++ .../StClassRequestApprovalServiceImpl.java | 34 ++++++++++++++++++ .../StMoldApplyForApprovalServiceImpl.java | 35 ++++++++++++++++++ .../StOtherOutRecordApprovalServiceImpl.java | 36 +++++++++++++++++++ .../wms/controller/StBuyOrderController.java | 2 +- .../wms/feign/WmsTaskClientImpl.java | 28 ++++++++++++++- .../wms/mapper/StBuyOrderMapper.java | 2 ++ .../wms/mapper/StBuyOrderMapper.xml | 30 ++++++++++++++++ .../wms/mapper/StClassRequestMapper.java | 2 ++ .../wms/mapper/StClassRequestMapper.xml | 17 +++++++++ .../wms/mapper/StMoldApplyForMapper.java | 2 ++ .../wms/mapper/StMoldApplyForMapper.xml | 17 +++++++++ .../wms/mapper/StOtherOutRecordMapper.xml | 5 ++- .../wms/service/IStBuyOrderService.java | 2 ++ .../wms/service/IStClassRequestService.java | 2 ++ .../wms/service/IStMoldApplyForService.java | 2 ++ .../service/impl/StBuyOrderServiceImpl.java | 5 +++ .../impl/StClassRequestServiceImpl.java | 6 +++- .../impl/StMoldApplyForServiceImpl.java | 5 +++ .../impl/StOtherOutRecordServiceImpl.java | 4 --- 21 files changed, 280 insertions(+), 9 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StBuyOrderApprovalServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StClassRequestApprovalServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StMoldApplyForApprovalServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StOtherOutRecordApprovalServiceImpl.java diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java index 426dad17f..4622fa618 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java @@ -4,7 +4,7 @@ import org.springblade.core.tool.api.R; import org.springblade.wms.pojo.dto.StGraphiteMoldOutDTO; import org.springblade.wms.pojo.entity.StGraphiteMoldOut; import org.springblade.wms.pojo.entity.StUserRight; -import org.springblade.wms.pojo.vo.GraphiteStockKitVO; +import org.springblade.wms.pojo.vo.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.format.annotation.DateTimeFormat; @@ -41,6 +41,14 @@ public interface WmsTaskClient { String GET_STOREKEEPERS_BY_GOODS_CODE = API_PREFIX + "/getStorekeepersByGoodsCode"; + String BUY_ORDER_DETAIL = API_PREFIX + "/buyOrderDetail"; + + String CLASS_REQUEST_DETAIL = API_PREFIX + "/classRequestDetail"; + + String MOLD_APPLY_FOR_DETAIL = API_PREFIX + "/moldApplyForDetail"; + + String OTHER_OUT_RECORD_DETAIL = API_PREFIX + "/otherOutRecordDetail"; + /** * 物料状态监控同步erp */ @@ -83,4 +91,15 @@ public interface WmsTaskClient { @PostMapping(GET_STOREKEEPERS_BY_GOODS_CODE) R getStorekeepersByGoodsCode(@RequestParam String goodsCode); + @PostMapping(BUY_ORDER_DETAIL) + StBuyOrderVO buyOrderDetail(@RequestParam Long id); + + @PostMapping(CLASS_REQUEST_DETAIL) + StClassRequestVO classRequestDetail(@RequestParam Long id); + + @PostMapping(MOLD_APPLY_FOR_DETAIL) + StMoldApplyForVO moldApplyForDetail(@RequestParam Long id); + + @PostMapping(OTHER_OUT_RECORD_DETAIL) + StOtherOutRecordVO otherOutRecordDetail(@RequestParam Long id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StBuyOrderApprovalServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StBuyOrderApprovalServiceImpl.java new file mode 100644 index 000000000..051735d4d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StBuyOrderApprovalServiceImpl.java @@ -0,0 +1,32 @@ +package org.springblade.desk.wms; + +import jakarta.annotation.Resource; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; +import org.springblade.desk.common.service.ApprovalRecordDetailStrategy; +import org.springblade.wms.feign.WmsTaskClient; +import org.springblade.wms.pojo.vo.StBuyOrderVO; +import org.springframework.stereotype.Service; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName StBuyOrderServiceImpl + * @description: + * @autor: WuSiYu + * @create 2026-06-13 15:15 + **/ +@Service +public class StBuyOrderApprovalServiceImpl implements ApprovalRecordDetailStrategy { + @Resource + private WmsTaskClient wmsTaskClient; + + @Override + public String getBizType() { + return MesApprovalRecordBizTypeEnum.WMS_EXTRA_PLAN.getDesc(); + } + + @Override + public StBuyOrderVO getDetail(Long bizId) { + return wmsTaskClient.buyOrderDetail(bizId); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StClassRequestApprovalServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StClassRequestApprovalServiceImpl.java new file mode 100644 index 000000000..734253f3b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StClassRequestApprovalServiceImpl.java @@ -0,0 +1,34 @@ +package org.springblade.desk.wms; + +import jakarta.annotation.Resource; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; +import org.springblade.desk.common.service.ApprovalRecordDetailStrategy; +import org.springblade.wms.feign.WmsTaskClient; +import org.springblade.wms.pojo.vo.StClassRequestVO; +import org.springframework.stereotype.Service; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName StClassRequestServiceImpl + * @description: + * @autor: WuSiYu + * @create 2026-06-13 16:06 + **/ +@Service +public class StClassRequestApprovalServiceImpl implements ApprovalRecordDetailStrategy { + + @Resource + private WmsTaskClient wmsTaskClient; + + @Override + public String getBizType() { + return MesApprovalRecordBizTypeEnum.TEAM_GROUP_PROCESS_AUDIT.getDesc(); + } + + @Override + public StClassRequestVO getDetail(Long bizId) { + return wmsTaskClient.classRequestDetail(bizId); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StMoldApplyForApprovalServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StMoldApplyForApprovalServiceImpl.java new file mode 100644 index 000000000..a292d8a0b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StMoldApplyForApprovalServiceImpl.java @@ -0,0 +1,35 @@ +package org.springblade.desk.wms; + +import jakarta.annotation.Resource; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; +import org.springblade.desk.common.service.ApprovalRecordDetailStrategy; +import org.springblade.wms.feign.WmsTaskClient; +import org.springblade.wms.pojo.vo.StMoldApplyForVO; +import org.springframework.stereotype.Service; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName st + * @description: + * @autor: WuSiYu + * @create 2026-06-13 16:38 + **/ + +@Service +public class StMoldApplyForApprovalServiceImpl implements ApprovalRecordDetailStrategy { + + @Resource + private WmsTaskClient wmsTaskClient; + + @Override + public String getBizType() { + return MesApprovalRecordBizTypeEnum.TOOL_PLAN_APPLY_AUDIT.getDesc(); + } + + @Override + public StMoldApplyForVO getDetail(Long bizId) { + return wmsTaskClient.moldApplyForDetail(bizId); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StOtherOutRecordApprovalServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StOtherOutRecordApprovalServiceImpl.java new file mode 100644 index 000000000..002907d29 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/wms/StOtherOutRecordApprovalServiceImpl.java @@ -0,0 +1,36 @@ +package org.springblade.desk.wms; + +import jakarta.annotation.Resource; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; +import org.springblade.desk.common.service.ApprovalRecordDetailStrategy; +import org.springblade.wms.feign.WmsTaskClient; +import org.springblade.wms.pojo.vo.StOtherOutRecordVO; +import org.springframework.stereotype.Service; + +/** + * @version 1.0 + * @program: jonhon-mes-svr + * @ClassName StOtherOutRecordApprovalServiceImpl + * @description: + * @autor: WuSiYu + * @create 2026-06-13 16:50 + **/ + +@Service +public class StOtherOutRecordApprovalServiceImpl implements ApprovalRecordDetailStrategy { + + @Resource + private WmsTaskClient wmsTaskClient; + + @Override + public String getBizType() { + // 替换为对应的业务枚举 + return MesApprovalRecordBizTypeEnum.WMS_SCRAP_AUDIT.getDesc(); + } + + @Override + public StOtherOutRecordVO getDetail(Long bizId) { + return wmsTaskClient.otherOutRecordDetail(bizId); + } + +} diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java index 40d9e5b6d..4a6166738 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java @@ -50,7 +50,7 @@ public class StBuyOrderController extends BladeController { private final IStBuyOrderService stBuyOrderService; /** - * 采购申请单 详情 + * 采购跟踪 详情 */ @GetMapping("/detail") @ApiOperationSupport(order = 1) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java index 85ab54d50..9dcb503d7 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java @@ -8,7 +8,7 @@ import org.springblade.core.tool.api.R; import org.springblade.wms.pojo.dto.StGraphiteMoldOutDTO; import org.springblade.wms.pojo.entity.StGraphiteMoldOut; import org.springblade.wms.pojo.entity.StUserRight; -import org.springblade.wms.pojo.vo.GraphiteStockKitVO; +import org.springblade.wms.pojo.vo.*; import org.springblade.wms.service.*; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -41,6 +41,12 @@ public class WmsTaskClientImpl implements WmsTaskClient{ private final IStUserRightService stUserRightService; + private final IStClassRequestService stClassRequestService; + + private final IStMoldApplyForService stMoldApplyForService; + + private final IStOtherOutRecordService stOtherOutRecordService; + @Override public boolean executeGoodsStatusUpdate() { stGoodsExtService.executeGoodsStatusUpdate(); @@ -72,4 +78,24 @@ public class WmsTaskClientImpl implements WmsTaskClient{ public R getStorekeepersByGoodsCode(@RequestParam String goodsCode) { return R.data(stUserRightService.getStorekeepersByMaterialCode(goodsCode)); } + + @Override + public StBuyOrderVO buyOrderDetail(@RequestParam Long id) { + return stBuyOrderService.buyOrderDetail(id); + } + + @Override + public StClassRequestVO classRequestDetail(@RequestParam Long id) { + return stClassRequestService.classRequestDetail(id); + } + + @Override + public StMoldApplyForVO moldApplyForDetail(@RequestParam Long id) { + return stMoldApplyForService.moldApplyForDetail(id); + } + + @Override + public StOtherOutRecordVO otherOutRecordDetail(@RequestParam Long id) { + return stOtherOutRecordService.getDetail(id); + } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java index 7779e27fa..28c0d070f 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.java @@ -52,6 +52,8 @@ public interface StBuyOrderMapper extends BaseMapper { StBuyOrder getByExtraBill(String extraBill); + StBuyOrderVO buyOrderDetail(Long id); + // JSONObject listByRecordDetail(Long boId, String goodsCode); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.xml index 1a9eaa92b..4c9d43136 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StBuyOrderMapper.xml @@ -293,6 +293,36 @@ AND ROWNUM = 1 + + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.java index 48fcdf1ad..4d443ac66 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.java @@ -46,5 +46,7 @@ public interface StClassRequestMapper extends BaseMapper { StClassRequest getByCrCode(String crCode); List selectStTeamRequestPage(IPage page, StClassRequestVO stClassRequest); + + StClassRequestVO classRequestDetail(Long id); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml index fff863f16..f0a586196 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StClassRequestMapper.xml @@ -177,6 +177,23 @@ ORDER BY CREATE_TIME ASC + + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.java index 555fcd651..7a277d53c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.java @@ -58,6 +58,8 @@ public interface StMoldApplyForMapper extends BaseMapper { @Param("v_toolid1") String erpWoCode); void deleteMoldPlan(@Param("v_toolid") String erpWoCode); + + StMoldApplyForVO moldApplyForDetail(Long id); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml index 5e6b1e579..a6162a173 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StMoldApplyForMapper.xml @@ -119,6 +119,23 @@ )} + + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml index 511eca71a..a5162ea04 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml @@ -116,6 +116,10 @@ SELECT -- 主表：其他出库表所有字段 soor.*, + CASE + WHEN soor.bf_type = -1 THEN NULL + ELSE soor.bf_type + END AS bfType, -- 出库凭证表：出库单号、出库日期、出库原因、领料人ID g.goods_code , -- 物料编码 g.goods_name , -- 物料名称 @@ -130,7 +134,6 @@ sir.quantity, sir.pi_no, sir.stove_pi_no, - soor.picker , -- 库房表：出库仓库名称 sh.sh_name AS shName, -- 制单人姓名（主表create_by关联用户表） diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java index 8add626e2..fd334ce87 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java @@ -62,6 +62,8 @@ public interface IStBuyOrderService extends BaseService { StBuyOrder getDetail(Long id); + StBuyOrderVO buyOrderDetail(Long id); + // JSONObject otherPlanDetail(Long id, String prtno); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java index 150a0f1de..95ccb96c9 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStClassRequestService.java @@ -53,6 +53,8 @@ public interface IStClassRequestService extends BaseService { StClassRequest getByCrCode(String crCode); + StClassRequestVO classRequestDetail(Long id); + IPage selectStTeamRequestPage(IPage page, StClassRequestVO stClassRequest); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java index 5e4b31ee0..de6291dec 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStMoldApplyForService.java @@ -30,6 +30,8 @@ public interface IStMoldApplyForService extends BaseService { IPage selectStMoldApplyForPage(IPage page, StMoldApplyForVO stMoldApplyFor); + StMoldApplyForVO moldApplyForDetail(Long id); + /** * 导出数据 * diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java index e49042efc..c19c05d82 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java @@ -425,6 +425,11 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl exportStClassRequest(Wrapper queryWrapper) { List stClassRequestList = baseMapper.exportStClassRequest(queryWrapper); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java index 2b7fcf646..2e95c2844 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java @@ -200,6 +200,11 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl exportStMoldApplyFor(Wrapper queryWrapper) { List stMoldApplyForList = baseMapper.exportStMoldApplyFor(queryWrapper); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java index 60f7539e5..9379ee409 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java @@ -1,7 +1,5 @@ package org.springblade.wms.service.impl; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; @@ -11,10 +9,8 @@ import org.springblade.core.secure.BladeUser; import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; import org.springblade.desk.common.feign.IMesApprovalRecordClient; import org.springblade.desk.common.pojo.dto.MesApprovalRecordFeignDTO; -import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity; import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; -import org.springblade.system.pojo.entity.User; import org.springblade.wms.excel.StOtherOutRecordExcel; import org.springblade.wms.mapper.StOtherOutRecordMapper; import org.springblade.wms.mapper.StReturnRecordMapper;