|
|
|
@ -91,6 +91,9 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
|
|
|
|
|
@Autowired
|
|
|
|
|
private MesWorkOrderService mesWorkOrderService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private MesWorkCenterRepository workCenterRao;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void execute(MesPartProdGroup partProdGroup, List<MesCustSortInfo> sortInfoList, List<MesPartProdGroupDetail> details) {
|
|
|
|
|
try {
|
|
|
|
@ -195,6 +198,13 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
|
|
|
|
|
mesWorkOrder.setWorkOrderSeq(sortInfo.getCustInfoSeq().toString());
|
|
|
|
|
mesWorkOrder.setOrganizeCode(sortInfo.getOrganizeCode());
|
|
|
|
|
mesWorkOrder.setWorkCenterCode(partProdGroup.getWorkCenterCode());
|
|
|
|
|
//根据产线查找区域代码
|
|
|
|
|
DdlPackBean centerPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(partProdGroup.getWorkCenterCode(),"workCenterCode", centerPackBean);
|
|
|
|
|
List<MesWorkCenter> workCenterList = workCenterRao.findByHqlTopWhere(centerPackBean, 1);
|
|
|
|
|
if (!workCenterList.isEmpty()){
|
|
|
|
|
mesWorkOrder.setAreaCode(workCenterList.get(0).getAreaCode());
|
|
|
|
|
}
|
|
|
|
|
mesWorkOrder.setWorkCellCode(mesPartProdGroupDetail.getWorkCellCode());
|
|
|
|
|
|
|
|
|
|
//来源
|
|
|
|
@ -470,6 +480,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
|
|
|
|
|
orderAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue());
|
|
|
|
|
orderAssembly.setOrganizeCode(organizeCode);
|
|
|
|
|
orderAssembly.setProductSn(mesWorkOrder.getWorkOrderNo());
|
|
|
|
|
orderAssembly.setAreaCode(mesWorkOrder.getAreaCode());
|
|
|
|
|
ConvertBean.saveOrUpdate(orderAssembly, "MES-JOB");
|
|
|
|
|
}
|
|
|
|
|
workOrderAssemblyRao.saveAll(assemblyList);
|
|
|
|
@ -496,6 +507,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
|
|
|
|
|
mesQueueOrder.setCustPartNo(mesWorkOrder.getCustPartNo());
|
|
|
|
|
mesQueueOrder.setCustOrderNo(mesWorkOrder.getCustOrderNo());
|
|
|
|
|
mesQueueOrder.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
|
|
|
|
|
mesQueueOrder.setAreaCode(mesWorkOrder.getAreaCode());
|
|
|
|
|
ConvertBean.saveOrUpdate(mesQueueOrder, "MES-JOB");
|
|
|
|
|
queueOrderRao.insert(mesQueueOrder);
|
|
|
|
|
}
|
|
|
|
@ -522,6 +534,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
|
|
|
|
|
mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue());
|
|
|
|
|
mesProduceSn.setSnType(MesExtEnumUtil.PRODUCE_SN_TYPE.STANDARD.getValue());
|
|
|
|
|
mesProduceSn.setFid(UUID.randomUUID().toString());
|
|
|
|
|
mesProduceSn.setAreaCode(mesWorkOrder.getAreaCode());
|
|
|
|
|
ConvertBean.saveOrUpdate(mesProduceSn, "MES-JOB");
|
|
|
|
|
mesProduceSnRao.insert(mesProduceSn);
|
|
|
|
|
|
|
|
|
|