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

编码规则

Browse Source
tags/yfai-mes-ext-v1.0
王杰 12 months ago
parent 844dafc2ce
commit 80402f86f0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

@ -109,7 +109,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
//生成工单号
GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.LOADING_LIST_CODE);
// genSerialNoModel.setPartNo(bean.getPartNo());
List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(bean.getOrganizeCode()), bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
bean.setPartShippingGroupCode(partShippingGroup.getShippingGroupCode());
bean.setShippingGroupName(partShippingGroup.getShippingGroupName());

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

@ -152,7 +152,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
}
bean.setProduceSeq(produceSeq + 1);
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.organizeCode(bean.getOrganizeCode()), bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
bean.setWorkOrderSeq(resultList.get(0));
}
bean.setQty(bean.getQty());
@ -272,10 +272,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
if(item.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()){
GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO);
genSerialNoModel.setPartNo(item.getWorkCenterCode());
orderList = syncFuncService.syncSerialNo(genSerialNoModel, item.getCreateUser(), item.getOrganizeCode(), 1).getResultList();
orderList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(item.getOrganizeCode()), item.getCreateUser(), item.getOrganizeCode(), 1).getResultList();
}else {
GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
orderList = syncFuncService.syncSerialNo(genSerialNoModel, item.getCreateUser(), item.getOrganizeCode(), 1).getResultList();
orderList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(item.getOrganizeCode()), item.getCreateUser(), item.getOrganizeCode(), 1).getResultList();
}
String orderNo = orderList.get(0);
DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
@ -509,7 +509,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
List<String> seqList = new ArrayList<>();
if (MesExtEnumUtil.ORDER_TYPE.BTO.getValue() == next.getWorkOrderType()) {
GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ);
seqList = syncFuncService.syncSerialNo(orderSeqSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList();
seqList = syncFuncService.syncSerialNo(orderSeqSerialNoModel.organizeCode(next.getOrganizeCode()), next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList();
}
List<MesWorkOrderLog> mesWorkOrderLogList = new ArrayList<>();
int index = 0;
@ -611,10 +611,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
if(next.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()){
GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO);
genSerialNoModel.setPartNo(next.getWorkCenterCode());
orderList = syncFuncService.syncSerialNo(genSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), 1).getResultList();
orderList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(next.getOrganizeCode()), next.getCreateUser(), next.getOrganizeCode(), 1).getResultList();
}else {
GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
orderList = syncFuncService.syncSerialNo(genSerialNoModel, next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList();
orderList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(next.getOrganizeCode()), next.getCreateUser(), next.getOrganizeCode(), mesWorkOrderList.size()).getResultList();
}
//查询工单是否已经存在
DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(next.getOrganizeCode());
@ -1150,7 +1150,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
private String getStringList(MesWorkOrder mesWorkOrder) {
GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.REPORT_SN);
List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, mesWorkOrder.getCreateUser(), mesWorkOrder.getOrganizeCode(), 1).getResultList();
List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(mesWorkOrder.getOrganizeCode()), mesWorkOrder.getCreateUser(), mesWorkOrder.getOrganizeCode(), 1).getResultList();
return resultList.iterator().next();
}
@ -1294,7 +1294,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
List<String> orderList=new ArrayList<>();
GenSerialNoModel genSerialNoModel = new GenSerialNoModel("MES_WORK_CENTER_ORDER_NO");
genSerialNoModel.setPartNo(workCenterCode);
orderList = syncFuncService.syncSerialNo(genSerialNoModel,userName, organizeCode, 1).getResultList();
orderList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(organizeCode), userName, organizeCode, 1).getResultList();
String orderNo = orderList.get(0);
DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());

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

@ -112,7 +112,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy {
//工单号生成规则 【工厂号+yyyyMMdd+5位流水】
GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO);
genSerialNoModel.setPartNo(detail.getWorkCenterCode());
List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, "edi", detail.getOrganizeCode(), 1).getResultList();
List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(detail.getOrganizeCode()), "edi", detail.getOrganizeCode(), 1).getResultList();
mesWorkOrder.setWorkOrderNo(resultList.get(0));
mesWorkOrder.setWorkOrderType(MesExtEnumUtil.ORDER_TYPE.BTO.getValue());
mesWorkOrder.setWorkOrderSeq(createSeq.toString());
@ -121,7 +121,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy {
proSeqGenSerialNoModel.setCustProdLineCode(detail.getOrganizeCode());
proSeqGenSerialNoModel.setProdLocation(detail.getWorkCenterCode());
proSeqGenSerialNoModel.setDynamicRule("#");
List<String> seqList = syncFuncService.syncSerialNo(proSeqGenSerialNoModel, "edi", detail.getOrganizeCode(), 1).getResultList();
List<String> seqList = syncFuncService.syncSerialNo(proSeqGenSerialNoModel.organizeCode(detail.getOrganizeCode()), "edi", detail.getOrganizeCode(), 1).getResultList();
String prodSeqStr = seqList.get(0);
mesWorkOrder.setProduceSeq(Long.parseLong(prodSeqStr.substring(prodSeqStr.indexOf("#")+1)));
mesWorkOrder.setCustPartNo(sortInfos.get(0).getCustPartNo());

Write Preview
Loading…
Cancel
Save