suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

Browse Source
liweidong
pangyang 2 weeks ago
parent a2418325a6 1503d12429
commit 955f244812
20 changed files with 272 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
  2. 9
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java
  3. 91
      blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java
  4. 71
      blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java
  5. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java
  6. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java
  7. 9
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml
  8. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java
  9. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java
  10. 103
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
  11. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java
  12. 71
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java
  13. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml
  14. 28
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
  15. 8
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataProduceClient.java
  16. 2
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.java
  17. 6
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml
  18. 3
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java
  19. 5
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java
  20. 1
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

2
blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
Unescape View File

@ -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";
/**

9
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java
Unescape View File

@ -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<YieldPlan> yieldOrderList);
void saveList(@RequestBody List<YieldPlan> yieldOrderList);
@GetMapping(GET_CRAFT_LIST)
List<DsCraftEntity> getDsCraftList();
@GetMapping(GET_PLAN_LIST)
List<YieldPlan> getPlanList();
@GetMapping(GET_PART_LIST_BY_PARAM)
List<DsPartEntity> getPartListByParam(List<String> partCodeList);
List<DsPartEntity> getPartListByParam(@RequestParam("partCodeList") List<String> partCodeList);
@GetMapping(GET_PART_LIST)
List<DsPartEntity> getPartList();
@GetMapping(UPDATE_BY_ID)
@ -69,7 +70,7 @@ public interface IApsOrderClient {
@GetMapping(GET_CRAFT_CODE)
List<DsPartEntity> getDsCraftListByCode(@RequestParam("prtno") String prtno);
@PostMapping(SAVE_ORDER_LIST)
void saveOrderList(List<YieldOrder> yieldOrderList);
void saveOrderList(@RequestBody List<YieldOrder> 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<YieldOrder> yieldOrderList);
void saveOrder(@RequestBody List<YieldOrder> yieldOrderList);
}

91
blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java
Unescape View File

@ -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<QueryBatchVO> queryBatch(@RequestParam("partCode") String partCode);
@GetMapping(QUERY_BATCH)
R<QueryBatchVO> queryBatch(@RequestParam("partCode") String partCode);
/**
* 返工订单
*/
@GetMapping(REWORK_ORDER)
R<IPage<ReworkProcessVO>> loadReworkOrder(ReworkProcessDTO query);
/**
* 返工订单
*/
@GetMapping(REWORK_ORDER)
R<List<ReworkProcessVO>> 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<Map<String, String>> getProductAppareaByPartCode(@RequestParam("partCode") String partCode);
/**
* 获取产品区域
*/
@GetMapping(PRODUCT_APP_AREA)
R<Map<String, String>> getProductAppareaByPartCode(@RequestParam("partCode") String partCode);
/**
* 获取产品版本
*/
@GetMapping(VERSION)
R<String> getVersionByPartCode(@RequestParam("partCode") String partCode);
/**
* 获取产品版本
*/
@GetMapping(VERSION)
R<String> getVersionByPartCode(@RequestParam("partCode") String partCode);
/**
* 获取保管员
*/
@GetMapping(CUSTODIAN)
R<String> getCustodianByRecDept(@RequestParam("partCode") String partCode, @RequestParam("recDept") String recDept);
/**
* 获取保管员
*/
@GetMapping(CUSTODIAN)
R<String> getCustodianByRecDept(@RequestParam("partCode") String partCode, @RequestParam("recDept") String recDept);
/**
* 验证是订单是否通过首件鉴定
*/
@GetMapping(CHK_SJJD)
R<String> chkSjjd(@RequestParam("ypCode")String ypCode, @RequestParam("batchNo")String batchNo);
/**
* 验证是订单是否通过首件鉴定
*/
@GetMapping(CHK_SJJD)
R<String> chkSjjd(@RequestParam("ypCode") String ypCode, @RequestParam("batchNo") String batchNo);
/**
* 验证是订单是否通过首件审核
*/
@GetMapping(CHK_SHJH)
R<String> 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<String> 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);
}

71
blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java
Unescape View File

@ -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<QueryBatchVO> queryBatch(String partCode) {
return R.fail("获取数据失败");
}
@Override
public R<IPage<ReworkProcessVO>> loadReworkOrder(ReworkProcessDTO query) {
return R.fail("获取数据失败");
}
@Override
public R<Map<String, String>> getProductAppareaByPartCode(String partCode) {
return R.fail("获取数据失败");
}
@Override
public R<String> getVersionByPartCode(String partCode) {
return R.fail("获取数据失败");
}
@Override
public R<String> getCustodianByRecDept(String partCode, String recDept) {
return R.fail("获取数据失败");
}
@Override
public R<String> chkSjjd(String ypCode, String batchNo) {
return R.fail("获取数据失败");
}
@Override
public R<String> chkShjh(String woCode, String ypCode, String partCode, String productIdent, Double makeQty, String memo) {
return R.fail("获取数据失败");
}
@Override
public R<QueryBatchVO> queryBatch(String partCode) {
return R.fail("获取数据失败");
}
@Override
public R<List<ReworkProcessVO>> loadReworkOrder(String reworkCode, String partCode, String batchNo) {
return R.fail("获取数据失败");
}
@Override
public R<Map<String, String>> getProductAppareaByPartCode(String partCode) {
return R.fail("获取数据失败");
}
@Override
public R<String> getVersionByPartCode(String partCode) {
return R.fail("获取数据失败");
}
@Override
public R<String> getCustodianByRecDept(String partCode, String recDept) {
return R.fail("获取数据失败");
}
@Override
public R<String> chkSjjd(String ypCode, String batchNo) {
return R.fail("获取数据失败");
}
@Override
public R<String> chkShjh(String woCode, String ypCode, String partCode, String productIdent, Double makeQty, String memo) {
return R.fail("获取数据失败");
}
}

3
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java
Unescape View File

@ -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));
}

2
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java
Unescape View File

@ -75,4 +75,6 @@ public interface DsProcessMapper extends BaseMapper<DsProcessEntity> {
List<DsProcessEntity> selectDsProcessByIds(@Param("processIds")List<Long> processIds);
List<DsProcessEntity> selectOldMesProcessByOldMesCraftId(@Param("oldMesCraftId") Long oldMesCraftId);
List<DsProcessEntity> selectDsProcessByCraftIdList(@Param("craftIds") List<Long> craftIds);
}

9
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml
Unescape View File

@ -52,5 +52,14 @@
resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessEntity">
select * from P_RB_SYNC_PROCESS where CRAFT_ID = #{oldMesCraftId}
</select>
<select id="selectDsProcessByCraftIdList"
resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessEntity">
select * from DS_PROCESS where is_deleted = 0
AND CRAFT_ID IN
<foreach collection="craftIds" item="craftId" open="(" close=")" separator=",">
#{craftId}
</foreach>
</select>
</mapper>

2
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java
Unescape View File

@ -286,5 +286,5 @@ public interface IDsPartService extends BaseService<DsPartEntity> {
* @param partVersion
* @return
*/
List<DsPartEntity> getClassCake(String partCode,String roamNo,String partVersion);
List<DsProcessMoldToolEntity> getClassCakeWork(String partCode,String roamNo,String partVersion);
}

7
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java
Unescape View File

@ -97,4 +97,11 @@ public interface IDsProcessService extends BaseService<DsProcessEntity> {
* @return
*/
List<DsProcessEntity> selectOldMesProcessByOldMesCraftId(Long oldMesCraftId);
/**
* 根据工艺ID集合查询
* @param craftIds
* @return
*/
List<DsProcessEntity> selectDsProcessByCraftIdList(List<Long> craftIds);
}

103
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
Unescape View File

@ -100,6 +100,9 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
@Autowired
IMesNotifyMessageService mesNotifyMessageService;
@Autowired
IDsProcessMoldToolService processMoldToolService;
@Override
public IPage<DsPartVO> selectDsPartPage(IPage<DsPartVO> page, DsPartVO dsPart) {
@ -432,29 +435,31 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
//查询子件信息
if (TaskingConstant.IS_SINTERING.equals(partEntity.getIsSintering())) {
List<DsPartRelationEntity> partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId());
List<Long> idList = partRelationEntityList.stream()
.map(DsPartRelationEntity::getChildPartId)
.collect(Collectors.toList());
if(!CollectionUtils.isEmpty(partRelationEntityList)){
List<Long> idList = partRelationEntityList.stream()
.map(DsPartRelationEntity::getChildPartId)
.collect(Collectors.toList());
List<DsPartEntity> dsPartEntityList = dsPartMapper.selectDsPartByIds(idList);
List<DsPartEntity> dsPartEntityList = dsPartMapper.selectDsPartByIds(idList);
List<DsPartVO> dsPartVOList = dsPartEntityList.stream()
.map(entity -> {
DsPartVO vo = new DsPartVO();
BeanUtils.copyProperties(entity, vo);
List<DsPartVO> 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<DsPartMapper, DsPartEntit
public List<DsPartEntity> getPartSubList(String partCode, String partVersion) {
//校验零件号
if(StringUtils.isEmpty(partCode)){
throw new ServiceException("零件号不能为空");
return null;
}
//查询零件是否存在
List<DsPartEntity> dsPartEntityList = this.selectDsPartByPatCode(partCode);
if(CollectionUtils.isEmpty(dsPartEntityList)){
throw new ServiceException("零件不存在");
return null;
}
//查询零件
@ -742,7 +747,61 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
}
@Override
public List<DsPartEntity> getClassCake(String partCode, String roamNo, String partVersion) {
public List<DsProcessMoldToolEntity> getClassCakeWork(String partCode, String roamNo, String partVersion) {
//校验零件号
if(StringUtils.isEmpty(partCode)){
return null;
}
//查询零件是否存在
List<DsPartEntity> 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<DsCraftEntity> 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<Long> craftIds = dsCraftEntityList.stream()
.map(DsCraftEntity::getId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
//查询工序
List<DsProcessEntity> processList = processService.selectDsProcessByCraftIdList(craftIds);
if(CollectionUtils.isEmpty(processList)){
return null;
}
List<Long> processIds = processList.stream()
.map(DsProcessEntity::getId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
//查询工装
List<DsProcessMoldToolEntity> processMoldToolEntityList = processMoldToolService.selectDsProcessMoldToolByProcessIds(processIds);
return processMoldToolEntityList;
}
return null;
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java
Unescape View File

@ -165,4 +165,9 @@ public class DsProcessServiceImpl extends BaseServiceImpl<DsProcessMapper, DsPro
return processMapper.selectOldMesProcessByOldMesCraftId(oldMesCraftId);
}
@Override
public List<DsProcessEntity> selectDsProcessByCraftIdList(List<Long> craftIds) {
return processMapper.selectDsProcessByCraftIdList(craftIds);
}
}

71
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java
Unescape View File

@ -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<IPage<ReworkProcessVO>> page(ReworkProcessDTO prReworkProcess, Query query) {
prReworkProcess.setQuery(query);
// prReworkProcess.setQuery(query);
// IPage<ReworkProcessVO> page = Condition.getPage(query);
// List<ReworkProcessVO> 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<ReworkProcessVO> page = Condition.getPage(query);
List<ReworkProcessVO> 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<List<ReworkProcessVO>> listR = erpDataProduceClient.loadReworkOrder(reworkCode, partCode, batchNo);
return R.data(page.setRecords(listR.getData()));
}
// @GetMapping("/treeProcess")

2
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml
Unescape View File

@ -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}
</select>
<select id="queryByWpIdlLst" resultType="org.springblade.desk.produce.pojo.entity.MakeRec">

28
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
Unescape View File

@ -23,13 +23,11 @@ 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.*;
import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity;
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
import org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity;
import org.springblade.desk.dashboard.pojo.entity.*;
import org.springblade.desk.dashboard.service.IBsProcessSetService;
import org.springblade.desk.dashboard.service.IBsTeamSetService;
import org.springblade.desk.dashboard.service.IDsPartService;
import org.springblade.desk.dashboard.service.IDsProcessMeasuringToolService;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
import org.springblade.desk.device.pojo.entity.RackSetEntity;
@ -144,6 +142,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
private final IBsAssignService bsAssignService;
private final IDsProcessMeasuringToolService processMeasuringToolService;
@Override
public IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderDTO workOrder) {
return page.setRecords(baseMapper.selectWorkOrderPage(page, workOrder));
@ -1605,6 +1605,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
// 保存检验项目
List<WorkPlanItem> workPlanItems = new ArrayList<>();
WorkPlanItem workPlanItem;
List<WorkPlanItemDetail> workPlanItemDetails = new ArrayList<>();
WorkPlanItemDetail workPlanItemDetail;
for (DsProcessProjectEntity project : projects) {
workPlanItem = new WorkPlanItem();
workPlanItem.setWpId(workPlan.getId());
@ -1621,6 +1623,24 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workPlanItems.add(workPlanItem);
}
workPlanItemService.saveBatch(workPlanItems);
for (WorkPlanItem planItem : workPlanItems) {
if ("尺寸检测".equals(planItem.getItemName())) {
List<DsProcessMeasuringToolEntity> toolEntities = processMeasuringToolService.selectDsProcessMeasuringToolByProcessId(projects.get(0).getProcessId());
if (CollectionUtils.isNotEmpty(toolEntities)) {
for (DsProcessMeasuringToolEntity toolEntity : toolEntities) {
workPlanItemDetail = new WorkPlanItemDetail();
workPlanItemDetail.setWorkPlanItemId(planItem.getId());
workPlanItemDetail.setTestType(toolEntity.getTestType());
workPlanItemDetail.setRuleSize(toolEntity.getToolSize());
workPlanItemDetail.setTools(toolEntity.getToolInfo());
workPlanItemDetail.setMtId(StringUtils.isNotBlank(toolEntity.getMtId()) ? Long.valueOf(toolEntity.getMtId()) : null);
workPlanItemDetails.add(workPlanItemDetail);
}
workPlanItemDetailService.saveBatch(workPlanItemDetails);
break;
}
}
}
// 修改车间订单为检验中
workOrder.setRunStatus(WorkOrder.RUN_STATUS_CHECK);
} else {

8
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataProduceClient.java
Unescape View File

@ -1,18 +1,16 @@
package org.springblade.erpdata.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
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.springblade.erpdata.service.IErpDataProduceService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@ -37,8 +35,8 @@ public class ErpDataProduceClient implements IErpDataProduceClient {
@Override
@GetMapping(REWORK_ORDER)
public R<IPage<ReworkProcessVO>> loadReworkOrder(ReworkProcessDTO query) {
return R.data(erpDataProduceService.loadReworkOrder(Condition.getPage(query.getQuery()), query));
public R<List<ReworkProcessVO>> loadReworkOrder(String reworkCode, String partCode, String batchNo) {
return R.data(erpDataProduceService.loadReworkOrder(reworkCode, partCode, batchNo));
}
@Override

2
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.java
Unescape View File

@ -18,7 +18,7 @@ public interface ErpDataProduceMapper extends Mapper {
QueryBatchVO queryBatch(String partCode);
List<ReworkProcessVO> loadReworkOrder(IPage<ReworkProcessVO> page, ReworkProcessDTO query);
List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo);
Map<String, String> getProductAppareaByPartCode(String partCode);

6
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml
Unescape View File

@ -50,13 +50,13 @@
dba_mgr.v_mes_rb_redo b
<where>
a.redono = b.redono AND a.splcode = b.splcode AND a.prtno = b.prtno AND a.amount = b.amount
<if test="query.reworkCode != null and query.reworkCode != ''">
<if test="reworkCode != null and reworkCode != ''">
AND a.redono LIKE concat(concat('%', #{query.reworkCode}),'%')
</if>
<if test="query.partCode != null and query.partCode != ''">
<if test="partCode != null and partCode != ''">
AND a.prtno LIKE concat(concat('%', #{query.partCode}),'%')
</if>
<if test="query.batchNo != null and query.batchNo != ''">
<if test="batchNo != null and batchNo != ''">
AND a.splcode LIKE concat(concat('%', #{query.batchNo}),'%')
</if>
</where>

3
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java
Unescape View File

@ -5,6 +5,7 @@ import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
import org.springblade.erpdata.pojo.vo.QueryBatchVO;
import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
import java.util.List;
import java.util.Map;
/**
@ -17,7 +18,7 @@ public interface IErpDataProduceService {
QueryBatchVO queryBatch(String partCode);
IPage<ReworkProcessVO> loadReworkOrder(IPage<ReworkProcessVO> page, ReworkProcessDTO query);
List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo);
Map<String, String> getProductAppareaByPartCode(String partCode);

5
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java
Unescape View File

@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
import java.sql.Types;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -37,8 +38,8 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService {
}
@Override
public IPage<ReworkProcessVO> loadReworkOrder(IPage<ReworkProcessVO> page, ReworkProcessDTO query) {
return page.setRecords(erpDataProduceMapper.loadReworkOrder(page, query));
public List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo) {
return erpDataProduceMapper.loadReworkOrder(reworkCode, partCode, batchNo);
}
@Override

1
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
Unescape View File

@ -566,6 +566,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
// }
yieldOrderList.add(yieldOrder);
});
log.info("qyl:同步工艺工单 data: {}", gson.toJson(yieldOrderList));
//调用通用保存方法，保存生产订单
// this.saveOrder(yieldOrderList);
apsOrderClient.saveOrderList(yieldOrderList);

Write Preview
Loading…
Cancel
Save