jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

SPS物料拉动 生成拉动单JOB-2

Browse Source
tags/yfai-mes-ext-v2.3
gsz 8 months ago
parent 36f5c4c736
commit 26b7ad8a28
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File

15
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesWhiteListController.java
Unescape Escape View File

@ -76,6 +76,8 @@ public class MesWhiteListController extends MesBaseController {
private MesEquipmentRepository mesEquipmentRDao;
@Autowired
private IMesPullingOrderInfoService pullingOrderInfoService;
@Autowired
private IMesDowntimeRecordService downtimeRecordService;
@PostMapping(value = "/meter/main-data")
@ApiOperation(value = "Maximo仪表主数据", notes = "Maximo仪表主数据")
@ -277,4 +279,17 @@ public class MesWhiteListController extends MesBaseController {
}
return ResultBean.success("执行成功");
}
@GetMapping(value = "/doCreatePullOrder")
@ApiOperation(value = "根据拉动组和生产工单产生拉动单")
public ResultBean doCreatePullOrder(String organizeCode, String equ) {
//统计数据
try {
pullingOrderInfoService.doCreatePullOrderByPullGroupAndWorkOrder(organizeCode,"test");
} catch (ImppBusiException imppException) {
return ResultBean.fail(imppException);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
return ResultBean.success("执行成功");
}
}

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesCreatePullOrderByPullGroupAndWorkOrderJob.java
Unescape Escape View File

@ -29,7 +29,7 @@ public class MesCreatePullOrderByPullGroupAndWorkOrderJob extends BaseMesSchedul
public static final Logger LOGGER = LoggerFactory.getLogger(MesCreatePullOrderByPullGroupAndWorkOrderJob.class);
private static final long serialVersionUID = 9072058154235836696L;
private static final long serialVersionUID = -321526601595924818L;
@Autowired
private IMesPullingOrderInfoService pullingOrderInfoService;

20
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java
Unescape Escape View File

@ -51,6 +51,8 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
private ICoreUtilCloud sysOrderNoRuleCloud;
@Autowired
private MesWorkCenterRepository mesWorkCenterRepository;
@Autowired
private MesPullingOrderExtendsRepository mesPullingOrderExtendsRepository;
protected void setPackQueryBean(MesPullingOrderInfo bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getPullCode(), "pullCode", packBean);
@ -97,7 +99,6 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
return;
}
Map<String, List<MesPartPull>> pullCodeMap = pulliGroupList.stream().collect(Collectors.groupingBy(MesPartPull::getPullCode));
Map<String, List<MesPartPull>> pullCodeCenterMap = pulliGroupList.stream().collect(Collectors.groupingBy(p -> p.getWorkCenterCode() + "=" + p.getPullCode()));
DdlPackBean ddlPackBeanDetail = DdlPackBean.getDdlPackBean(organizeCode);
List<MesPartPullDetail> pullDetailList = mesPartPullDetailRDao.findByHqlWhere(ddlPackBeanDetail);
@ -121,7 +122,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
//4.生产工单 在加工状态 [PULLING_STATUS] =0 未创建
DdlPackBean packBeanWorkOrder = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getInPackList(workCenterList, "workCenterCode", packBeanWorkOrder);
DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue(), "workOrderStatus", packBeanWorkOrder);
DdlPreparedPack.getInPackList(Arrays.asList(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue(),MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()), "workOrderStatus", packBeanWorkOrder);
DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.WORK_ORDER_PULLING_STATUS.NOTCREATE.getValue(), "pullingStatus", packBeanWorkOrder);
List<MesWorkOrder> workOrderList = mesWorkOrderRepository.findByHqlWhere(packBeanWorkOrder);
if (CollectionUtils.isEmpty(workOrderList)) {
@ -194,6 +195,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
.build();
}
MesPullingOrderInfo pullingOrder = new MesPullingOrderInfo();
pullingOrder.setOrganizeCode(organizeCode);
pullingOrder.setPullingOrderNo(orderNo);
pullingOrder.setPullOrderType(mesPartPull.getPullOrderType());
pullingOrder.setPullGroupFid(mesPartPull.getId());
@ -205,6 +207,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
pullingOrder.setPullOrderStatus(MesExtEnumUtil.PULL_ORDER_STATUS.KITTING_PULL.getValue());
pullingOrder.setWorkCenterCode(mesPartPull.getWorkCenterCode());
pullingOrder.setPullCode(mesPartPull.getPullCode());
pullingOrder.setPartNo(mesWorkOrder.getPartNo());
pullingOrder.setCustPartNo(mesWorkOrder.getCustPartNo());
pullingOrder.setProduceSeq(StringUtil.isEmpty(mesWorkOrder.getProduceSeq()) ? 0 : mesWorkOrder.getProduceSeq());
@ -213,6 +216,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
for (MesPartPullDetail partInfo : mesPartPullDetails) {
MesPullingOrderPartInfo pullingOrderPartInfo = new MesPullingOrderPartInfo();
pullingOrderPartInfo.setOrganizeCode(organizeCode);
pullingOrderPartInfo.setPullCode(partInfo.getPullCode());
pullingOrderPartInfo.setPullingOrderNo(pullingOrder.getPullingOrderNo());
pullingOrderPartInfo.setWorkOrderNo(pullingOrder.getWorkOrderNo());
@ -234,12 +238,20 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
ConvertBean.serviceModelInitialize(pullingOrderPartInfo, userName);
mesPullingOrderPartInfoRepository.insert(pullingOrderPartInfo);
}
//7.拉动组+加工单号+生成拉动单状态的对应关系中间表，每次新增都要记录
MesPullingOrderExtends mesPullingOrderExtends= new MesPullingOrderExtends();
mesPullingOrderExtends.setOrganizeCode(organizeCode);
mesPullingOrderExtends.setPullCode(pullingOrder.getPullCode());
mesPullingOrderExtends.setPullingOrderNo(pullingOrder.getPullingOrderNo());
mesPullingOrderExtends.setWorkOrderNo(pullingOrder.getWorkOrderNo());
mesPullingOrderExtends.setPullOrderStatus(pullingOrder.getPullOrderStatus());
ConvertBean.serviceModelInitialize(mesPullingOrderExtends, userName);
mesPullingOrderExtendsRepository.insert(mesPullingOrderExtends);
}
//6.产生拉动单后更新工单拉动状态为已拉动
mesWorkOrder.setPullingStatus(MesExtEnumUtil.WORK_ORDER_PULLING_STATUS.SUBMIT.getValue());
mesWorkOrderRepository.update(mesWorkOrder);
//7.拉动组+加工单号+生成拉动单状态的对应关系中间表，每次新增都要记录
}

Write Preview
Loading…
Cancel
Save