diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 23d5edf0..4dec1f26 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -15,7 +15,7 @@ public interface LauncherConstant { // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; - // 测试环境 +// 测试环境 // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java index 2c7800f0..bc1200d9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java @@ -8,6 +8,7 @@ import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -43,14 +44,14 @@ public interface IApsOrderClient { String UP_DATE_MAX = API_PREFIX + "/upByDateMax"; @PostMapping(SYNC_PLAN_FROM_SAVE) - void saveList(List yieldOrderList); + void saveList(@RequestBody List yieldOrderList); @GetMapping(GET_CRAFT_LIST) List getDsCraftList(); @GetMapping(GET_PLAN_LIST) List getPlanList(); @GetMapping(GET_PART_LIST_BY_PARAM) - List getPartListByParam(List partCodeList); + List getPartListByParam(@RequestParam("partCodeList") List partCodeList); @GetMapping(GET_PART_LIST) List getPartList(); @GetMapping(UPDATE_BY_ID) @@ -69,7 +70,7 @@ public interface IApsOrderClient { @GetMapping(GET_CRAFT_CODE) List getDsCraftListByCode(@RequestParam("prtno") String prtno); @PostMapping(SAVE_ORDER_LIST) - void saveOrderList(List yieldOrderList); + void saveOrderList(@RequestBody List yieldOrderList); @GetMapping (UP_DATE_MAX) void upByDateMax(@RequestParam("max") String max,@RequestParam("code") String code); @@ -83,5 +84,5 @@ public interface IApsOrderClient { * @param yieldOrderList */ @PostMapping(SAVE_ORDER) - void saveOrder(List yieldOrderList); + void saveOrder(@RequestBody List yieldOrderList); } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java index f19d21ea..a879a1ea 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java @@ -1,16 +1,15 @@ package org.springblade.erpdata.feign; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.common.constant.LauncherConstant; import org.springblade.core.tool.api.R; -import org.springblade.erpdata.pojo.dto.ReworkProcessDTO; import org.springblade.erpdata.pojo.vo.QueryBatchVO; import org.springblade.erpdata.pojo.vo.ReworkProcessVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; import java.util.Map; /** @@ -19,58 +18,60 @@ import java.util.Map; * @author Chill */ @FeignClient( - value = LauncherConstant.APPLICATION_ERP_DATA_NAME + value = LauncherConstant.APPLICATION_ERP_DATA_NAME ) public interface IErpDataProduceClient { - String API_PREFIX = "/feign/erpdata/produce"; - String QUERY_BATCH = API_PREFIX + "/queryBatch"; - String REWORK_ORDER = API_PREFIX + "/loadReworkOrder"; - String PRODUCT_APP_AREA = API_PREFIX + "/productAppArea"; - String VERSION = API_PREFIX + "/version"; - String CUSTODIAN = API_PREFIX + "/getCustodian"; - String CHK_SJJD = API_PREFIX + "/chkSjjd"; - String CHK_SHJH = API_PREFIX + "/chkShjh"; + String API_PREFIX = "/feign/erpdata/produce"; + String QUERY_BATCH = API_PREFIX + "/queryBatch"; + String REWORK_ORDER = API_PREFIX + "/loadReworkOrder"; + String PRODUCT_APP_AREA = API_PREFIX + "/productAppArea"; + String VERSION = API_PREFIX + "/version"; + String CUSTODIAN = API_PREFIX + "/getCustodian"; + String CHK_SJJD = API_PREFIX + "/chkSjjd"; + String CHK_SHJH = API_PREFIX + "/chkShjh"; - /** - * 缺件申报-通过零件号获取批次号 + /** + * 缺件申报-通过零件号获取批次号 */ - @GetMapping(QUERY_BATCH) - R queryBatch(@RequestParam("partCode") String partCode); + @GetMapping(QUERY_BATCH) + R queryBatch(@RequestParam("partCode") String partCode); - /** - * 返工订单 - */ - @GetMapping(REWORK_ORDER) - R> loadReworkOrder(ReworkProcessDTO query); + /** + * 返工订单 + */ + @GetMapping(REWORK_ORDER) + R> loadReworkOrder(@RequestParam(value = "reworkCode", required = false) String reworkCode, + @RequestParam(value = "partCode", required = false) String partCode, + @RequestParam(value = "batchNo", required = false) String batchNo); - /** - * 获取产品区域 - */ - @GetMapping(PRODUCT_APP_AREA) - R> getProductAppareaByPartCode(@RequestParam("partCode") String partCode); + /** + * 获取产品区域 + */ + @GetMapping(PRODUCT_APP_AREA) + R> getProductAppareaByPartCode(@RequestParam("partCode") String partCode); - /** - * 获取产品版本 - */ - @GetMapping(VERSION) - R getVersionByPartCode(@RequestParam("partCode") String partCode); + /** + * 获取产品版本 + */ + @GetMapping(VERSION) + R getVersionByPartCode(@RequestParam("partCode") String partCode); - /** - * 获取保管员 - */ - @GetMapping(CUSTODIAN) - R getCustodianByRecDept(@RequestParam("partCode") String partCode, @RequestParam("recDept") String recDept); + /** + * 获取保管员 + */ + @GetMapping(CUSTODIAN) + R getCustodianByRecDept(@RequestParam("partCode") String partCode, @RequestParam("recDept") String recDept); - /** - * 验证是订单是否通过首件鉴定 - */ - @GetMapping(CHK_SJJD) - R chkSjjd(@RequestParam("ypCode")String ypCode, @RequestParam("batchNo")String batchNo); + /** + * 验证是订单是否通过首件鉴定 + */ + @GetMapping(CHK_SJJD) + R chkSjjd(@RequestParam("ypCode") String ypCode, @RequestParam("batchNo") String batchNo); - /** - * 验证是订单是否通过首件审核 - */ - @GetMapping(CHK_SHJH) - R chkShjh(@RequestParam("woCode")String woCode, @RequestParam("ypCode")String ypCode, @RequestParam("partCode")String partCode, @RequestParam("productIdent")String productIdent, @RequestParam("makeQty")Double makeQty, @RequestParam("memo")String memo); + /** + * 验证是订单是否通过首件审核 + */ + @GetMapping(CHK_SHJH) + R chkShjh(@RequestParam("woCode") String woCode, @RequestParam("ypCode") String ypCode, @RequestParam("partCode") String partCode, @RequestParam("productIdent") String productIdent, @RequestParam("makeQty") Double makeQty, @RequestParam("memo") String memo); } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java index 9be84656..8a31e2f5 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java @@ -1,12 +1,11 @@ package org.springblade.erpdata.feign; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.tool.api.R; -import org.springblade.erpdata.pojo.dto.ReworkProcessDTO; import org.springblade.erpdata.pojo.vo.QueryBatchVO; import org.springblade.erpdata.pojo.vo.ReworkProcessVO; import org.springframework.stereotype.Component; +import java.util.List; import java.util.Map; /** @@ -18,38 +17,38 @@ import java.util.Map; @Component public class IErpDataProduceClientFallback implements IErpDataProduceClient { - @Override - public R queryBatch(String partCode) { - return R.fail("获取数据失败"); - } - - @Override - public R> loadReworkOrder(ReworkProcessDTO query) { - return R.fail("获取数据失败"); - } - - @Override - public R> getProductAppareaByPartCode(String partCode) { - return R.fail("获取数据失败"); - } - - @Override - public R getVersionByPartCode(String partCode) { - return R.fail("获取数据失败"); - } - - @Override - public R getCustodianByRecDept(String partCode, String recDept) { - return R.fail("获取数据失败"); - } - - @Override - public R chkSjjd(String ypCode, String batchNo) { - return R.fail("获取数据失败"); - } - - @Override - public R chkShjh(String woCode, String ypCode, String partCode, String productIdent, Double makeQty, String memo) { - return R.fail("获取数据失败"); - } + @Override + public R queryBatch(String partCode) { + return R.fail("获取数据失败"); + } + + @Override + public R> loadReworkOrder(String reworkCode, String partCode, String batchNo) { + return R.fail("获取数据失败"); + } + + @Override + public R> getProductAppareaByPartCode(String partCode) { + return R.fail("获取数据失败"); + } + + @Override + public R getVersionByPartCode(String partCode) { + return R.fail("获取数据失败"); + } + + @Override + public R getCustodianByRecDept(String partCode, String recDept) { + return R.fail("获取数据失败"); + } + + @Override + public R chkSjjd(String ypCode, String batchNo) { + return R.fail("获取数据失败"); + } + + @Override + public R chkShjh(String woCode, String ypCode, String partCode, String productIdent, Double makeQty, String memo) { + return R.fail("获取数据失败"); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java index b8162a64..a6c8302a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java @@ -279,9 +279,10 @@ public class DsPartController extends BladeController { */ @GetMapping("/test") public R test(@RequestParam String partCode, + @RequestParam String roamNo, @RequestParam String partVersion) { - return R.data(dsPartService.getPartSubList(partCode,partVersion)); + return R.data(dsPartService.getClassCakeWork(partCode,roamNo,partVersion)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java index 0d359039..f978c354 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java @@ -75,4 +75,6 @@ public interface DsProcessMapper extends BaseMapper { List selectDsProcessByIds(@Param("processIds")List processIds); List selectOldMesProcessByOldMesCraftId(@Param("oldMesCraftId") Long oldMesCraftId); + + List selectDsProcessByCraftIdList(@Param("craftIds") List craftIds); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml index 82d6ebd3..0d1134d1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml @@ -52,5 +52,14 @@ resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessEntity"> select * from P_RB_SYNC_PROCESS where CRAFT_ID = #{oldMesCraftId} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java index 47ed052d..18de1a05 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java @@ -286,5 +286,5 @@ public interface IDsPartService extends BaseService { * @param partVersion * @return */ - List getClassCake(String partCode,String roamNo,String partVersion); + List getClassCakeWork(String partCode,String roamNo,String partVersion); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java index 4f727183..dcea70e1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java @@ -97,4 +97,11 @@ public interface IDsProcessService extends BaseService { * @return */ List selectOldMesProcessByOldMesCraftId(Long oldMesCraftId); + + /** + * 根据工艺ID集合查询 + * @param craftIds + * @return + */ + List selectDsProcessByCraftIdList(List craftIds); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 7835442d..b9e0035d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -100,6 +100,9 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsPartPage(IPage page, DsPartVO dsPart) { @@ -432,29 +435,31 @@ public class DsPartServiceImpl extends BaseServiceImpl partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); - List idList = partRelationEntityList.stream() - .map(DsPartRelationEntity::getChildPartId) - .collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(partRelationEntityList)){ + List idList = partRelationEntityList.stream() + .map(DsPartRelationEntity::getChildPartId) + .collect(Collectors.toList()); - List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); + List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); - List dsPartVOList = dsPartEntityList.stream() - .map(entity -> { - DsPartVO vo = new DsPartVO(); - BeanUtils.copyProperties(entity, vo); + List dsPartVOList = dsPartEntityList.stream() + .map(entity -> { + DsPartVO vo = new DsPartVO(); + BeanUtils.copyProperties(entity, vo); - if (vo.getUpdateUser() != null) { - String userName = userClient.userInfo(Func.toLong(vo.getUpdateUser())) - .getData() - .getUser() - .getName(); - vo.setUpdateUserStr(userName); - } - return vo; - }) - .collect(Collectors.toList()); + if (vo.getUpdateUser() != null) { + String userName = userClient.userInfo(Func.toLong(vo.getUpdateUser())) + .getData() + .getUser() + .getName(); + vo.setUpdateUserStr(userName); + } + return vo; + }) + .collect(Collectors.toList()); - dsPartSynthesisVO.setDsPartVOList(dsPartVOList); + dsPartSynthesisVO.setDsPartVOList(dsPartVOList); + } } dsPartSynthesisVO.setDsPartEntity(partEntity); @@ -718,12 +723,12 @@ public class DsPartServiceImpl extends BaseServiceImpl getPartSubList(String partCode, String partVersion) { //校验零件号 if(StringUtils.isEmpty(partCode)){ - throw new ServiceException("零件号不能为空"); + return null; } //查询零件是否存在 List dsPartEntityList = this.selectDsPartByPatCode(partCode); if(CollectionUtils.isEmpty(dsPartEntityList)){ - throw new ServiceException("零件不存在"); + return null; } //查询零件 @@ -742,7 +747,61 @@ public class DsPartServiceImpl extends BaseServiceImpl getClassCake(String partCode, String roamNo, String partVersion) { + public List getClassCakeWork(String partCode, String roamNo, String partVersion) { + + //校验零件号 + if(StringUtils.isEmpty(partCode)){ + return null; + } + + //查询零件是否存在 + List dsPartEntityList = this.selectDsPartByPatCode(partCode); + if(CollectionUtils.isEmpty(dsPartEntityList)){ + return null; + } + + //查询零件 + DsPartEntity partEntity = this.selectDsPartByPatCodeAndVersion(partCode, partVersion); + + //不是玻璃饼 + if(null == partEntity.getSinTerType()){ + return null; + } + + //校验是否是玻璃饼 + if (DsPartSub.SIN_TER_TYPE_BLB.intValue() == partEntity.getSinTerType()) { + List dsCraftEntityList = null; + if(!StringUtils.isEmpty(roamNo)){ + dsCraftEntityList = craftService.selectDsCraftByPartIdAndRoamNo(partEntity.getId(), roamNo); + }else { + dsCraftEntityList = craftService.listByPartId(partEntity.getId()); + } + + if(CollectionUtils.isEmpty(dsCraftEntityList)){ + return null; + } + List craftIds = dsCraftEntityList.stream() + .map(DsCraftEntity::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + //查询工序 + List processList = processService.selectDsProcessByCraftIdList(craftIds); + if(CollectionUtils.isEmpty(processList)){ + return null; + } + + List processIds = processList.stream() + .map(DsProcessEntity::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + //查询工装 + List processMoldToolEntityList = processMoldToolService.selectDsProcessMoldToolByProcessIds(processIds); + + return processMoldToolEntityList; + } + return null; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java index 37ca2a90..6e21aa07 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java @@ -165,4 +165,9 @@ public class DsProcessServiceImpl extends BaseServiceImpl selectDsProcessByCraftIdList(List craftIds) { + return processMapper.selectDsProcessByCraftIdList(craftIds); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java index d59ac32a..c0d65b55 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -13,11 +14,11 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.desk.produce.pojo.dto.MesRbRedoRoutDTO; import org.springblade.desk.produce.service.IPdaSaveService; +import org.springblade.erpdata.feign.IErpDataProduceClient; import org.springblade.erpdata.pojo.dto.ReworkProcessDTO; import org.springblade.erpdata.pojo.vo.ReworkProcessVO; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; /** @@ -33,41 +34,49 @@ public class ReworkProcessController extends BladeController { private final IPdaSaveService pdaSaveService; + @Resource + private IErpDataProduceClient erpDataProduceClient; + @GetMapping("/loadReworkOrder") @ApiOperationSupport(order = 1) @Operation(summary = "erp查询返工订单", description = "传入ReworkProcessDTO") public R> page(ReworkProcessDTO prReworkProcess, Query query) { - prReworkProcess.setQuery(query); +// prReworkProcess.setQuery(query); +// IPage page = Condition.getPage(query); +// List records = new ArrayList<>(); +// ReworkProcessVO reworkProcessVO = new ReworkProcessVO(); +// reworkProcessVO.setRedono("返修单号"); +// reworkProcessVO.setSeqno(1); +// reworkProcessVO.setSeqdept("处理单位"); +// reworkProcessVO.setPrtno("物料号"); +// reworkProcessVO.setExcstatus(1); +// reworkProcessVO.setAmount(1.0); +// reworkProcessVO.setReqdate("2026-02-04"); +// reworkProcessVO.setReqqty("需求数量"); +// reworkProcessVO.setRecdate("2026-02-04"); +// reworkProcessVO.setRecman("接收人"); +// reworkProcessVO.setRecqty("接收数量"); +// reworkProcessVO.setEnddat("2026-02-04"); +// reworkProcessVO.setEndman("完成人"); +// reworkProcessVO.setEndqty("完成数量"); +// reworkProcessVO.setSplcode("批次号"); +// reworkProcessVO.setRemark("备注"); +// reworkProcessVO.setHrecdate("2026-02-04"); +// reworkProcessVO.setBfqty(1); +// reworkProcessVO.setUsedept("发生单位"); +// reworkProcessVO.setDetail("处理意见"); +// reworkProcessVO.setPrtlotno("生产标识"); +// reworkProcessVO.setDeptcode("工艺路线"); +// reworkProcessVO.setSono("开单车间订单号"); +// records.add(reworkProcessVO); +// page.setRecords(records); +// return R.data(page); IPage page = Condition.getPage(query); - List records = new ArrayList<>(); - ReworkProcessVO reworkProcessVO = new ReworkProcessVO(); - reworkProcessVO.setRedono("返修单号"); - reworkProcessVO.setSeqno(1); - reworkProcessVO.setSeqdept("处理单位"); - reworkProcessVO.setPrtno("物料号"); - reworkProcessVO.setExcstatus(1); - reworkProcessVO.setAmount(1.0); - reworkProcessVO.setReqdate("2026-02-04"); - reworkProcessVO.setReqqty("需求数量"); - reworkProcessVO.setRecdate("2026-02-04"); - reworkProcessVO.setRecman("接收人"); - reworkProcessVO.setRecqty("接收数量"); - reworkProcessVO.setEnddat("2026-02-04"); - reworkProcessVO.setEndman("完成人"); - reworkProcessVO.setEndqty("完成数量"); - reworkProcessVO.setSplcode("批次号"); - reworkProcessVO.setRemark("备注"); - reworkProcessVO.setHrecdate("2026-02-04"); - reworkProcessVO.setBfqty(1); - reworkProcessVO.setUsedept("发生单位"); - reworkProcessVO.setDetail("处理意见"); - reworkProcessVO.setPrtlotno("生产标识"); - reworkProcessVO.setDeptcode("工艺路线"); - reworkProcessVO.setSono("开单车间订单号"); - records.add(reworkProcessVO); - page.setRecords(records); - return R.data(page); -// return erpDataProduceClient.loadReworkOrder(prReworkProcess); + String reworkCode = prReworkProcess.getReworkCode(); + String partCode = prReworkProcess.getPartCode(); + String batchNo = prReworkProcess.getBatchNo(); + R> listR = erpDataProduceClient.loadReworkOrder(reworkCode, partCode, batchNo); + return R.data(page.setRecords(listR.getData())); } // @GetMapping("/treeProcess") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml index 816fffb4..6a881b6b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml @@ -62,7 +62,7 @@ INNER JOIN MES_WORK_ORDER b ON a.WO_ID = b.ID INNER JOIN MES_YIELD_ORDER c ON b.yo_id = c.id LEFT JOIN BS_PROCESS_SET d ON a.PPS_ID = d.ID - LEFT JOIN BA_TEAM_SET e ON a.MAKE_TEAM = e.ID + LEFT JOIN BS_TEAM_SET e ON a.MAKE_TEAM = e.ID WHERE a.WO_ID = #{id}