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

工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变

Browse Source
tags/yfai-mes-ext-v2.3
王杰 7 months ago
parent 99afee831f
commit e9a9e7827a
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

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

@ -216,7 +216,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
pullingOrder.setPartNo(mesWorkOrder.getPartNo()); pullingOrder.setPartNo(mesWorkOrder.getPartNo());
pullingOrder.setPartName(mesWorkOrder.getPartName()); pullingOrder.setPartName(mesWorkOrder.getPartName());
pullingOrder.setCustPartNo(mesWorkOrder.getCustPartNo()); pullingOrder.setCustPartNo(mesWorkOrder.getCustPartNo());
pullingOrder.setProduceSeq(StringUtil.isEmpty(mesWorkOrder.getProduceSeq()) ? 0 : mesWorkOrder.getProduceSeq()); pullingOrder.setProductSeq(StringUtil.isEmpty(mesWorkOrder.getProductSeq()) ? 0L : mesWorkOrder.getProductSeq());
pullingOrder.setOrderFlag(StringUtil.isEmpty(mesWorkOrder.getOrderFlag())?"":mesWorkOrder.getOrderFlag().substring(0,1)); pullingOrder.setOrderFlag(StringUtil.isEmpty(mesWorkOrder.getOrderFlag())?"":mesWorkOrder.getOrderFlag().substring(0,1));
ConvertBean.serviceModelInitialize(pullingOrder, userName); ConvertBean.serviceModelInitialize(pullingOrder, userName);
@ -236,7 +236,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
pullingOrderPartInfo.setPullQty(mesWorkOrderPart.getItemQty()); pullingOrderPartInfo.setPullQty(mesWorkOrderPart.getItemQty());
pullingOrderPartInfo.setCustOrderNo(pullingOrder.getCustOrderNo()); pullingOrderPartInfo.setCustOrderNo(pullingOrder.getCustOrderNo());
pullingOrderPartInfo.setWorkOrderSeq(pullingOrder.getWorkOrderSeq()); pullingOrderPartInfo.setWorkOrderSeq(pullingOrder.getWorkOrderSeq());
pullingOrderPartInfo.setWaterSeq(pullingOrder.getProduceSeq()); pullingOrderPartInfo.setWaterSeq(pullingOrder.getProductSeq());
pullingOrderPartInfo.setWorkCellCode(mesWorkOrderPart.getWorkCellCode()); pullingOrderPartInfo.setWorkCellCode(mesWorkOrderPart.getWorkCellCode());
pullingOrderPartInfo.setEquipment(partInfo.getEquipment()); pullingOrderPartInfo.setEquipment(partInfo.getEquipment());
pullingOrderPartInfo.setLocation(partInfo.getPullAddr());//todo pullingOrderPartInfo.setLocation(partInfo.getPullAddr());//todo

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

@ -156,7 +156,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", orderPackBean); DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", orderPackBean);
DdlPreparedPack.getStringEqualPack(bean.getOrderFlag(), "orderFlag", orderPackBean); DdlPreparedPack.getStringEqualPack(bean.getOrderFlag(), "orderFlag", orderPackBean);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"produceSeq"}, orderPackBean); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"productSeq"}, orderPackBean);
MesWorkOrder result = baseRDao.getByProperty(orderPackBean); MesWorkOrder result = baseRDao.getByProperty(orderPackBean);
//插入前构造数据 //插入前构造数据
@ -164,13 +164,13 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
//若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1 //若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1
if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) {
Long produceSeq = 0L; Long productSeq = 0L;
if (null != result && result.getProduceSeq() != null) { if (null != result && result.getProductSeq() != null) {
produceSeq = (long) Math.toIntExact(result.getProduceSeq()); productSeq = (long) Math.toIntExact(result.getProductSeq());
} }
MesWorkOrder copyMesWorkOrder = new MesWorkOrder(); MesWorkOrder copyMesWorkOrder = new MesWorkOrder();
BeanUtils.copyProperties(bean, copyMesWorkOrder); BeanUtils.copyProperties(bean, copyMesWorkOrder);
copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1)); copyMesWorkOrder.setProductSeq((long) (productSeq + 1));
copyMesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); copyMesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser());
@ -178,11 +178,11 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
workOrderLogService.saveMesWorkOrderLog(copyMesWorkOrder,MesExtEnumUtil.WORK_ORDER_LOG_TYPE.INSERT,copyMesWorkOrder.getQty()); workOrderLogService.saveMesWorkOrderLog(copyMesWorkOrder,MesExtEnumUtil.WORK_ORDER_LOG_TYPE.INSERT,copyMesWorkOrder.getQty());
return bean; return bean;
} else if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) { } else if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) {
Long produceSeq = 0L; Long productSeq = 0L;
if (null != result && result.getProduceSeq() != null) { if (null != result && result.getProductSeq() != null) {
produceSeq = (long) Math.toIntExact(result.getProduceSeq()); productSeq = (long) Math.toIntExact(result.getProductSeq());
} }
bean.setProduceSeq(produceSeq + 1); bean.setProductSeq(productSeq + 1);
GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ); GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ);
List<String> resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel.organizeCode(bean.getOrganizeCode()), bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); List<String> resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel.organizeCode(bean.getOrganizeCode()), bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
bean.setWorkOrderSeq(resultList.get(0)); bean.setWorkOrderSeq(resultList.get(0));
@ -590,18 +590,18 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getWorkOrderStatus(), "workOrderStatus", orderPackBean); DdlPreparedPack.getNumEqualPack(item.getWorkOrderStatus(), "workOrderStatus", orderPackBean);
DdlPreparedPack.getStringEqualPack(item.getOrderFlag(), "orderFlag", orderPackBean); DdlPreparedPack.getStringEqualPack(item.getOrderFlag(), "orderFlag", orderPackBean);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"produceSeq"}, orderPackBean); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"productSeq"}, orderPackBean);
MesWorkOrder result = baseRDao.getByProperty(orderPackBean); MesWorkOrder result = baseRDao.getByProperty(orderPackBean);
//若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1 //若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1
if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) {
Long produceSeq = 0L; Long productSeq = 0L;
if (null != result && result.getProduceSeq() != null) { if (null != result && result.getProductSeq() != null) {
produceSeq = (long) Math.toIntExact(result.getProduceSeq()); productSeq = (long) Math.toIntExact(result.getProductSeq());
} }
MesWorkOrder copyMesWorkOrder = new MesWorkOrder(); MesWorkOrder copyMesWorkOrder = new MesWorkOrder();
BeanUtils.copyProperties(item, copyMesWorkOrder); BeanUtils.copyProperties(item, copyMesWorkOrder);
copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1)); copyMesWorkOrder.setProductSeq(productSeq + 1);
copyMesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); copyMesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
ConvertBean.serviceModelInitialize(copyMesWorkOrder, item.getCreateUser()); ConvertBean.serviceModelInitialize(copyMesWorkOrder, item.getCreateUser());
index++; index++;
@ -616,11 +616,11 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
continue; continue;
} else if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) { } else if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) {
Long produceSeq = 0L; Long productSeq = 0L;
if (null != result && result.getProduceSeq() != null) { if (null != result && result.getProductSeq() != null) {
produceSeq = (long) Math.toIntExact(result.getProduceSeq()); productSeq = (long) Math.toIntExact(result.getProductSeq());
} }
item.setProduceSeq(produceSeq + 1); item.setProductSeq(productSeq + 1);
item.setWorkOrderSeq(seqList.get(index)); item.setWorkOrderSeq(seqList.get(index));
} }
item.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); item.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
Unescape Escape View File

@ -482,7 +482,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
prodSeqSerialNoModel.setProdLocation(mesWorkOrder.getWorkCenterCode()); prodSeqSerialNoModel.setProdLocation(mesWorkOrder.getWorkCenterCode());
List<String> proSeqResultList = syncFuncService.syncSerialNo(prodSeqSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList(); List<String> proSeqResultList = syncFuncService.syncSerialNo(prodSeqSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList();
String proSeqStr = proSeqResultList.get(0); String proSeqStr = proSeqResultList.get(0);
mesWorkOrder.setProduceSeq(Long.parseLong(proSeqStr.replace("MES_WORK_ORDER_SEQ_WU_HAN", ""))); mesWorkOrder.setProductSeq(Long.parseLong(proSeqStr.replace("MES_WORK_ORDER_SEQ_WU_HAN", "")));
mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName()); mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName());
ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB"); ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
mesWorkOrderRao.insert(mesWorkOrder); mesWorkOrderRao.insert(mesWorkOrder);
@ -525,7 +525,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
mesQueueOrder.setProductSn(mesWorkOrder.getWorkOrderNo()); mesQueueOrder.setProductSn(mesWorkOrder.getWorkOrderNo());
mesQueueOrder.setCustSn(mesWorkOrder.getCustSn()); mesQueueOrder.setCustSn(mesWorkOrder.getCustSn());
mesQueueOrder.setStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue()); mesQueueOrder.setStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue());
mesQueueOrder.setProduceSeq(mesWorkOrder.getProduceSeq()); mesQueueOrder.setProductSeq(mesWorkOrder.getProductSeq());
mesQueueOrder.setWorkOrderSeq(mesWorkOrder.getWorkOrderSeq()); mesQueueOrder.setWorkOrderSeq(mesWorkOrder.getWorkOrderSeq());
mesQueueOrder.setCustPartNo(mesWorkOrder.getCustPartNo()); mesQueueOrder.setCustPartNo(mesWorkOrder.getCustPartNo());
mesQueueOrder.setCustOrderNo(mesWorkOrder.getCustOrderNo()); mesQueueOrder.setCustOrderNo(mesWorkOrder.getCustOrderNo());

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java
Unescape Escape View File

@ -136,7 +136,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy {
proSeqGenSerialNoModel.setDynamicRule("#"); proSeqGenSerialNoModel.setDynamicRule("#");
List<String> seqList = syncFuncService.syncSerialNo(proSeqGenSerialNoModel.organizeCode(detail.getOrganizeCode()), "edi", detail.getOrganizeCode(), 1).getResultList(); List<String> seqList = syncFuncService.syncSerialNo(proSeqGenSerialNoModel.organizeCode(detail.getOrganizeCode()), "edi", detail.getOrganizeCode(), 1).getResultList();
String prodSeqStr = seqList.get(0); String prodSeqStr = seqList.get(0);
mesWorkOrder.setProduceSeq(Long.parseLong(prodSeqStr.substring(prodSeqStr.indexOf("#")+1))); mesWorkOrder.setProductSeq(Long.parseLong(prodSeqStr.substring(prodSeqStr.indexOf("#")+1)));
mesWorkOrder.setCustPartNo(sortInfos.get(0).getCustPartNo()); mesWorkOrder.setCustPartNo(sortInfos.get(0).getCustPartNo());
//标识 -空 //标识 -空
//状态 --- 根据零件发运组看是自动发布 //状态 --- 根据零件发运组看是自动发布

Write Preview
Loading…
Cancel
Save