From 63a4bc1fb7e870d43f33e020891495997d27d6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Mon, 27 Apr 2026 20:57:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=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 --- .../java/org/springblade/system/controller/DeptController.java | 2 +- .../java/org/springblade/system/controller/PostController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java index a679090e..74a53333 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java @@ -134,7 +134,7 @@ public class DeptController extends BladeController { /** * 懒加载列表 */ - @PreAuth(menu = "dept") +// @PreAuth(menu = "dept") @GetMapping("/lazy-list") @Parameters({ @Parameter(name = "deptName", description = "部门名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/PostController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/PostController.java index 7550e6b0..f70b1549 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/PostController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/PostController.java @@ -60,7 +60,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; @NonDS @RestController @AllArgsConstructor -@PreAuth(menu = "post") +//@PreAuth(menu = "post") @RequestMapping("/post") @Tag(name = "岗位", description = "岗位") public class PostController extends BladeController { From be1a3c8356e442fd815cd04e4a2a8f45e6e1a6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Mon, 27 Apr 2026 21:11:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=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 --- .../java/org/springblade/system/controller/DeptController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java index 74a53333..26ae381c 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java @@ -99,7 +99,7 @@ public class DeptController extends BladeController { /** * 列表 */ - @PreAuth(menu = "dept") +// @PreAuth(menu = "dept") @GetMapping("/list") @Parameters({ @Parameter(name = "deptName", description = "部门名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), From 1bbdb72287672509852e6d620d4f62bbff8f11e4 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Mon, 27 Apr 2026 21:20:44 +0800 Subject: [PATCH 3/6] =?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 --- .../wms/mapper/StExpireSubmissionMapper.xml | 8 +++++++- .../wms/mapper/StGoodsClassMapper.xml | 8 ++++++++ .../springblade/wms/mapper/StGoodsExtMapper.xml | 9 +++++++++ .../wms/service/impl/StBuyOrderServiceImpl.java | 2 ++ .../service/impl/StGlassCakeOutServiceImpl.java | 16 ++++++++++++++++ .../wms/service/impl/StHttpRequestService.java | 9 ++++++--- .../wms/service/impl/StLendServiceImpl.java | 3 +-- .../impl/StOtherReceiptRecordServiceImpl.java | 17 ++++++++++++++++- 8 files changed, 65 insertions(+), 7 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.xml index 2b20d6a8..998660bc 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StExpireSubmissionMapper.xml @@ -25,7 +25,12 @@ select * from ST_GOODS_CLASS where is_deleted = 0 + + and gc_code like '%' || #{stGoodsClass.gcCode} || '%' + + + + + and gc_name like '%' || #{stGoodsClass.gcName} || '%' + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml index d371d911..4b369cea 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml @@ -75,6 +75,15 @@ AND se.goods_status = #{param2.goodsStatus} + + + AND se.delivery = #{param2.delivery} + + + + AND se.special = #{param2.special} + + ORDER BY se.create_time DESC 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 2df3982e..f68df69a 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 @@ -26,6 +26,7 @@ import org.springblade.wms.pojo.entity.StGoods; import org.springblade.wms.pojo.vo.StBuyOrderVO; import org.springblade.wms.service.IStBuyOrderService; import org.springblade.wms.service.IStGoodsService; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,6 +47,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl partRelationEntityList = partClient.getSubPart(partOne.getId()); List glassCakePartList = new ArrayList<>(); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StHttpRequestService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StHttpRequestService.java index 4ba371eb..2154b610 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StHttpRequestService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StHttpRequestService.java @@ -8,8 +8,10 @@ import okhttp3.*; import org.springblade.wms.pojo.dto.ErpStPurOtherDTO; import org.springblade.wms.pojo.dto.StPdmPartDTO; import org.springblade.wms.pojo.dto.StPdmPartResponseDTO; +import org.springblade.wms.service.IStBuyOrderService; import org.springblade.wms.service.ISyDockingLogService; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.io.IOException; @@ -41,8 +43,9 @@ public class StHttpRequestService { @Resource private ISyDockingLogService syDockingLogService; - // @Resource -// private IStBuyOrderService stBuyOrderService; + @Resource + @Lazy + private IStBuyOrderService stBuyOrderService; // private final ISyDockingLogService syDockingLogService; // // private final IStBuyOrderService stBuyOrderService; @@ -215,7 +218,7 @@ public class StHttpRequestService { // 4. 处理响应结果（和原逻辑一致） if (result != null && "200".equals(result.getString("retCode"))) { // 成功：更新额外单号 -// stBuyOrderService.httpUpdateBo(erpStPurOtherDto.getBoId(), result.getString("responseBody")); + stBuyOrderService.httpUpdateBo(erpStPurOtherDto.getBoId(), result.getString("responseBody")); } else { // 失败：记录日志并跳过 String errorDesc = result != null ? result.getString("errorDesc") : "未知错误"; diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StLendServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StLendServiceImpl.java index 6f5d6765..bcfc611d 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StLendServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StLendServiceImpl.java @@ -85,7 +85,7 @@ public class StLendServiceImpl extends BaseServiceImpl imp } // 统一赋值公共属性 stLend.setDeptId(user.getDeptId()); - stLend.setLeMan(user.getUserId()); // 经手人也赋值为当前登录用户 + stLend.setLeMan(stLend.getLeMan()); stLend.setMemo(stLend.getMemo()); } @@ -104,7 +104,6 @@ public class StLendServiceImpl extends BaseServiceImpl imp return batchFlag; } - // ========== 完全复用你的【物料借出核心方法】lendInterface 只改 PfUserInfo → BladeUser，逻辑一行不变 ========== private void lendInterface(Long leId, BladeUser user) throws Exception { List storeBillList = new ArrayList<>(); StLend stLend = this.getById(leId); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java index d3b786e4..8fbc6dfa 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java @@ -292,9 +292,24 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl list = baseMapper.selectByWoCode(woCode); WorkOrder workOrder = baseMapper.getByWoCode(woCode); - YieldOrder yieldOrder = baseMapper.getByYoId(workOrder.getYoId()); + if (workOrder == null) { + throw new RuntimeException("根据工单编号【" + woCode + "】未查询到工单信息"); + } + + Long yoId = workOrder.getYoId(); + if (yoId == null) { + throw new RuntimeException("工单【" + woCode + "】未查到生产订单ID"); + } + + YieldOrder yieldOrder = baseMapper.getByYoId(yoId); + if (yieldOrder == null) { + throw new RuntimeException("根据生产订单ID【" + yoId + "】未查询到生产订单信息"); + } DsPartEntity partOne = partClient.getPart(workOrder.getPartCode(),yieldOrder.getPartVersion()); + if (partOne == null) { + throw new RuntimeException("根据零件编号【" + workOrder.getPartCode() + "】未查询到零件信息"); + } List partRelationEntityList = partClient.getSubPart(partOne.getId()); List glassCakePartList = new ArrayList<>(); From 8fdb3204174a1bcbccee4106dfd27bae4cdb4292 Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Tue, 28 Apr 2026 10:13:32 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/SalaryStandardMapper.xml | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml index 7e37c0b0..ba52ccbe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml @@ -104,11 +104,40 @@ PROCESS_NAME, NULL AS minStep, NULL AS maxStep, - TO_NUMBER(STEP_SETTLEMENT_PRICE) AS PRICE + NULL AS PRICE FROM STEP_DATA WHERE - STEP_TYPE IN ( 1, 2 ) UNION ALL + STEP_TYPE = 1 + UNION ALL + SELECT + ID, + STANDARD_TYPE, + PROCESS_ID, + PART_NO, + SETTLEMENT_PRICE, + SETTLEMENT_UNIT, + STEP_TYPE, + STEP, + STEP_UNIT, + STEP_SETTLEMENT_PRICE, + STEP_SETTLEMENT_UNIT, + CREATE_USER, + CREATE_DEPT, + CREATE_TIME, + UPDATE_USER, + UPDATE_TIME, + STATUS, + IS_DELETED, + PROCESS_NAME, + TO_NUMBER( STEP ) AS minStep, + NULL AS maxStep, + TO_NUMBER( STEP_SETTLEMENT_PRICE ) AS PRICE + FROM + STEP_DATA + WHERE + STEP_TYPE = 2 + UNION ALL SELECT sd.ID, sd.STANDARD_TYPE, From 3cd929cce5afc27bd22951ce2e3edf8fd80fa8c1 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Tue, 28 Apr 2026 11:28:01 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=80=A7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/pojo/enums/MoldDemandEnum.java | 2 +- .../order/service/impl/YieldOrderServiceImpl.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java index d3db907c..e20dfb32 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java @@ -30,7 +30,7 @@ public enum MoldDemandEnum { * 状态枚举; 11001、新建，11002:已下发，11003、已完成 */ MAF_STATUS_CREATE("新建", 11001), - MAF_STATUS_SEND("已下发", 11002), + MAF_STATUS_SEND("已申报", 11002), MAF_STATUS_DONE("已关闭", 11003), /** 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 d5a49d29..5cd7e928 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 @@ -533,12 +533,15 @@ public class YieldOrderServiceImpl extends BaseServiceImpl Date: Tue, 28 Apr 2026 11:38:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/desk/order/pojo/entity/YieldOrder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index 2dae3922..74b267bc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -482,8 +482,7 @@ public class YieldOrder extends BaseEntity { /** * 计划部门 */ -// @TableField(value = "plan_deptcode") - @TableField(exist = false) + @TableField(value = "plan_deptcode") private String planDeptCode; /**