From 09d5aad1fad9fcdcd19b140f3474c3f5d3247fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Wed, 25 Mar 2026 19:29:26 +0800 Subject: [PATCH 1/3] =?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 --- .../desk/produce/mapper/WorkOrderMapper.xml | 2 +- .../service/impl/WorkOrderServiceImpl.java | 25 +++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml index ea47b6d7..3c4768ce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml @@ -54,7 +54,7 @@ mwo.MES_CARD_NO mesCardNo, myo.PLATE plate, myo.PRODUCT_TYPE productType, - myo.PRIORITY_ERP priority, + mwo.PRIORITY priority, myo.USE_DEPT useDept, ROUND(myo.YP_AREA * mwo.MAKE_QTY,10) totalArea, myo.YP_AREA area, diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index 5ede1dc8..0fed617b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -18,12 +18,10 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.basic.constant.FlowConst; +import org.springblade.desk.basic.pojo.entity.BsAssignEntity; import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity; import org.springblade.desk.basic.pojo.entity.WorkCenter; -import org.springblade.desk.basic.service.IOemCraftAbilityService; -import org.springblade.desk.basic.service.IOemService; -import org.springblade.desk.basic.service.IProcessAbilityService; -import org.springblade.desk.basic.service.IWorkCenterService; +import org.springblade.desk.basic.service.*; import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity; import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; @@ -142,6 +140,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl selectWorkOrderPage(IPage page, WorkOrderDTO workOrder) { return page.setRecords(baseMapper.selectWorkOrderPage(page, workOrder)); @@ -413,8 +413,19 @@ public class WorkOrderServiceImpl extends BaseServiceImpl 0) { + wpr.setReason("工序不可外协"); + } else { + oemCraftAbilityService.count(Wrappers.lambdaQuery(OemCraftAbilityEntity.class).eq(OemCraftAbilityEntity::getCraftAbilityId, wp.getCaId())); + if (count == 0) { + wpr.setReason("无对应工艺能力厂商"); + } + } wprList.add(wpr); } @@ -1689,7 +1700,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl Date: Wed, 25 Mar 2026 19:29:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E8=89=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DsTaskingServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 0836496d..78012227 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -1787,6 +1787,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl processProjectList = processProjectService.selectOldMesByPid(oldMesProcessId); - processProjectList.forEach(item -> item.setId(null)); + processProjectList.forEach(item -> { + item.setId(null); + item.setProcessId(dsProcessEntity.getId()); + }); if(CollectionUtils.isEmpty(processProjectList)){ log.info("零件 {} 没有检验项目数据", newPart.getPartCode()); return true; @@ -1810,7 +1814,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl processMeasuringToolList = processMeasuringToolService.selectOldMesByPid(oldMesProcessId); - processMeasuringToolList.forEach(item -> item.setId(null)); + processMeasuringToolList.forEach(item -> { + item.setId(null); + item.setProcessId(dsProcessEntity.getId()); + }); if(CollectionUtils.isEmpty(processMeasuringToolList)){ log.info("零件 {} 没有尺寸量具数据", newPart.getPartCode()); return true; @@ -1824,7 +1831,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl processMoldToolEntityList = processMoldToolService.selectOldMesByPid(oldMesProcessId); - processMoldToolEntityList.forEach(item -> item.setId(null)); + processMoldToolEntityList.forEach(item -> { + item.setId(null); + item.setProcessId(dsProcessEntity.getId()); + }); if(CollectionUtils.isEmpty(processMoldToolEntityList)){ log.info("零件 {} 没有工装数据", newPart.getPartCode()); return true; From 895696fcd05d301d7c16d1b953c770273d00604e Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 25 Mar 2026 19:38:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduling/mapper/EquipAbilityMapper.xml | 2 +- .../scheduling/service/impl/WorkOrderServiceImpl.java | 2 +- .../wms/controller/StComboxController.java | 6 ++---- .../springblade/wms/controller/StGoodsController.java | 2 +- .../wms/service/impl/StBuyOrderServiceImpl.java | 11 ++++++++--- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml index e23f32b4..2d81bdb3 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml @@ -38,7 +38,7 @@ and equip_code = #{param2.equipCode} - order by update_time desc + order by work_center_id,equip_name,equip_code,equip_type,update_time desc diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index d51b4028..3959aea1 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -643,7 +643,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl page = stGoodsService.page(Condition.getPage(query), qw); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java index b59ac600..46aa678c 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java @@ -92,7 +92,7 @@ public class StGoodsController extends BladeController { @ApiOperationSupport(order = 4) @ApiLog("物料信息表 新增") @Operation(summary = "新增", description = "传入stGoods") - public R save(@Valid @RequestBody String goodsCode) throws Exception{ + public R save(@RequestParam String goodsCode) throws Exception{ stGoodsService.saveGoods(goodsCode); return R.success(); } 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 5bed33a7..2e9f7832 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 @@ -106,10 +106,15 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName()); + R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); String roleId = roleIdResp.getData(); approvalRecord.setNextRoleId(Long.valueOf(roleId)); mesApprovalRecordClient.save(approvalRecord);