|
|
|
@ -83,7 +83,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
|
|
|
|
|
if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) {
|
|
|
|
|
Integer produceSeq = 0;
|
|
|
|
|
if (null != result && result.getProduceSeq() != null) {
|
|
|
|
|
produceSeq = result.getProduceSeq();
|
|
|
|
|
produceSeq = Math.toIntExact(result.getProduceSeq());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//生成工单号
|
|
|
|
@ -92,7 +92,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
|
|
|
|
|
|
|
|
|
|
MesWorkOrder copyMesWorkOrder = new MesWorkOrder();
|
|
|
|
|
BeanUtils.copyProperties(bean, copyMesWorkOrder);
|
|
|
|
|
copyMesWorkOrder.setProduceSeq(produceSeq + 1);
|
|
|
|
|
copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1));
|
|
|
|
|
copyMesWorkOrder.setQty(1D);
|
|
|
|
|
copyMesWorkOrder.setWorkOrderNo(resultList.get(0));
|
|
|
|
|
ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser());
|
|
|
|
@ -113,9 +113,9 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
|
|
|
|
|
genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
|
|
|
|
|
Integer produceSeq = 0;
|
|
|
|
|
if (null != result && result.getProduceSeq() != null) {
|
|
|
|
|
produceSeq = result.getProduceSeq();
|
|
|
|
|
produceSeq = Math.toIntExact(result.getProduceSeq());
|
|
|
|
|
}
|
|
|
|
|
bean.setProduceSeq(produceSeq + 1);
|
|
|
|
|
bean.setProduceSeq((long) (produceSeq + 1));
|
|
|
|
|
GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ);
|
|
|
|
|
List<String> resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
|
|
|
|
|
bean.setWorkOrderSeq(resultList.get(0));
|
|
|
|
|