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

暂时注释掉 ProduceSeq

Browse Source
tags/yfai-mes-ext-v1.0
administrator 11 months ago
parent 8dc060da00
commit c651fa000b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -81,10 +81,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
GenSerialNoModel genSerialNoModel = new GenSerialNoModel(); GenSerialNoModel genSerialNoModel = new GenSerialNoModel();
//若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1 //若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1
if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) {
Long produceSeq = 0L; // Long produceSeq = 0L;
if (null != result && result.getProduceSeq() != null) { // if (null != result && result.getProduceSeq() != null) {
produceSeq = (long) Math.toIntExact(result.getProduceSeq()); // produceSeq = (long) Math.toIntExact(result.getProduceSeq());
} // }
//生成工单号 //生成工单号
genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
@ -92,7 +92,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
MesWorkOrder copyMesWorkOrder = new MesWorkOrder(); MesWorkOrder copyMesWorkOrder = new MesWorkOrder();
BeanUtils.copyProperties(bean, copyMesWorkOrder); BeanUtils.copyProperties(bean, copyMesWorkOrder);
copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1)); // copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1));
copyMesWorkOrder.setQty(1D); copyMesWorkOrder.setQty(1D);
copyMesWorkOrder.setWorkOrderNo(resultList.get(0)); copyMesWorkOrder.setWorkOrderNo(resultList.get(0));
ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser());
@ -111,11 +111,11 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
} else { } else {
//生成工单号 //生成工单号
genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
Long produceSeq = 0L; // Long produceSeq = 0L;
if (null != result && result.getProduceSeq() != null) { // if (null != result && result.getProduceSeq() != null) {
produceSeq = (long) Math.toIntExact(result.getProduceSeq()); // produceSeq = (long) Math.toIntExact(result.getProduceSeq());
} // }
bean.setProduceSeq((long) (produceSeq + 1)); // bean.setProduceSeq((long) (produceSeq + 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, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); List<String> resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
bean.setWorkOrderSeq(resultList.get(0)); bean.setWorkOrderSeq(resultList.get(0));

Write Preview
Loading…
Cancel
Save