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

Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

Browse Source
tags/yfai-mes-ext-v2.3
臧学普 7 months ago
parent 9228827ff5 98a6a8e5e8
commit f4ba3b5da0
2 changed files with 83 additions and 70 deletions
Show Stats Download Patch File Download Diff File

23
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java
Unescape Escape View File

@ -201,17 +201,26 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
" sd.part_no, " + " sd.part_no, " +
" sd.modify_date_time, " + " sd.modify_date_time, " +
" from mes_shipping_detail sd " + " from mes_shipping_detail sd " +
" left join mes_work_order wo on wop.work_order_no=wo.work_order_no " + " left join mes_shipping s on s.id=sd.pid " +
" WHERE sd.status in (20) " +//todo 发运 20 " WHERE sd.status in (20) " +//todo 发运 20
" and sd.bar_code != '' and bar_code is not NULL "); " and sd.bar_code != '' and bar_code is not NULL ");
hql.append(" and sd.organize_code = :organizeCode "); hql.append(" and sd.organize_code = :organizeCode ");
hql.append(" and sd.is_deleted = :isDeleted "); hql.append(" and sd.is_deleted = :isDeleted ");
hql.append(" and sd.is_valid = :isValid "); hql.append(" and sd.is_valid = :isValid ");
if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){ if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){
hql.append(" and sd.modify_date_time >= "+detail.getModifyDateTimeStart()+" "); hql.append(" and sd.modify_date_time >= '"+detail.getModifyDateTimeStart()+"' ");
} }
if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){ if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){
hql.append(" and sd.modify_date_time <= "+detail.getModifyDateTimeEnd()+" "); hql.append(" and sd.modify_date_time <= '"+detail.getModifyDateTimeEnd()+"' ");
}
if (!StringUtil.isEmpty(detail.getShippingCode())){
hql.append(" and s.shipping_code = '"+detail.getShippingCode()+"' ");
}
if (!StringUtil.isEmpty(detail.getTotalPartNo())){
hql.append(" and sd.part_no = '"+detail.getTotalPartNo()+"' ");
}
if (!StringUtil.isEmpty(detail.getWorkOrderNo())){
hql.append(" and sd.bar_code like '"+detail.getWorkOrderNo()+"%' ");
} }
Query query = entityManager.createNativeQuery(hql.toString()); Query query = entityManager.createNativeQuery(hql.toString());
@ -247,10 +256,10 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
hql.append(" and wop.is_valid = :isValid "); hql.append(" and wop.is_valid = :isValid ");
if (!StringUtil.isEmpty(detail.getPartNo())){ if (!StringUtil.isEmpty(detail.getPartNo())){
hql.append(" and wop.part_no ="+detail.getPartNo()+" "); hql.append(" and wop.part_no ='"+detail.getPartNo()+"' ");
} }
if (!StringUtil.isEmpty(detail.getWorkCenterCode())){ if (!StringUtil.isEmpty(detail.getWorkCenterCode())){
hql.append(" and wop.work_center_code ="+detail.getWorkCenterCode()+" "); hql.append(" and wop.work_center_code ='"+detail.getWorkCenterCode()+"' ");
} }
hql.append(" and wop.work_order_no in (:codeList) "); hql.append(" and wop.work_order_no in (:codeList) ");
@ -285,10 +294,10 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
hql.append(" and wop.is_valid = :isValid "); hql.append(" and wop.is_valid = :isValid ");
if (!StringUtil.isEmpty(detail.getPartNo())){ if (!StringUtil.isEmpty(detail.getPartNo())){
hql.append(" and wop.part_no ="+detail.getPartNo()+" "); hql.append(" and wop.part_no ='"+detail.getPartNo()+"' ");
} }
if (!StringUtil.isEmpty(detail.getWorkCenterCode())){ if (!StringUtil.isEmpty(detail.getWorkCenterCode())){
hql.append(" and wop.work_center_code ="+detail.getWorkCenterCode()+" "); hql.append(" and wop.work_center_code ='"+detail.getWorkCenterCode()+"' ");
} }
hql.append(" and wop.work_order_no in (:codeList) "); hql.append(" and wop.work_order_no in (:codeList) ");

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

@ -169,11 +169,13 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
for (Map.Entry<String, List<MesPartPullDetail>> stringListEntryDetail : pullCodeListMap.entrySet()) { for (Map.Entry<String, List<MesPartPullDetail>> stringListEntryDetail : pullCodeListMap.entrySet()) {
String pullCode = stringListEntryDetail.getKey(); String pullCode = stringListEntryDetail.getKey();
List<MesPartPull> mesPartPulls = pullCodeMap.get(pullCode); List<MesPartPull> mesPartPulls = pullCodeMap.get(pullCode);
MesPartPull mesPartPull = mesPartPulls.get(0);//拉动组明细拉动单号对应拉动组 MesPartPull mesPartPull = mesPartPulls.get(0);
List<MesPartPullDetail> mesPartPullDetails = stringListEntryDetail.getValue(); //拉动组明细拉动单号对应拉动组 如果拉动组产线跟工单产线不一致 不生成
//拉动组号+年月日+工单后5位 if (mesWorkOrder.getWorkCenterCode().equals(mesPartPull.getWorkCenterCode())){
String orderNo = mesPartPull.getPullCode()+ TimeTool.getNowTime("yyMMdd") + List<MesPartPullDetail> mesPartPullDetails = stringListEntryDetail.getValue();
mesWorkOrder.getWorkOrderNo().substring(mesWorkOrder.getWorkOrderNo().length()-5); //拉动组号+年月日+工单后5位
String orderNo = mesPartPull.getPullCode()+ TimeTool.getNowTime("yyMMdd") +
mesWorkOrder.getWorkOrderNo().substring(mesWorkOrder.getWorkOrderNo().length()-5);
// if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.KITTING_PULL.getValue()) { // if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.KITTING_PULL.getValue()) {
// orderNo = "KITTING"; // orderNo = "KITTING";
// } else if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.JIS_PULL.getValue()) { // } else if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.JIS_PULL.getValue()) {
@ -185,7 +187,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
// } else if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.PICK_PULL.getValue()) { // } else if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.PICK_PULL.getValue()) {
// orderNo = "PICK"; // orderNo = "PICK";
// } // }
//调用平台生成拉动单号流水 -yyyyMMdd00001 //调用平台生成拉动单号流水 -yyyyMMdd00001
// BaseResultBean<LinkedHashMap> orderResutlBean = sysOrderNoRuleCloud.getOrderNo(MesCommonConstant.MES_PULL_ORDER_NO); // BaseResultBean<LinkedHashMap> orderResutlBean = sysOrderNoRuleCloud.getOrderNo(MesCommonConstant.MES_PULL_ORDER_NO);
// if (orderResutlBean != null && orderResutlBean.isSuccess()) { // if (orderResutlBean != null && orderResutlBean.isSuccess()) {
// orderNo += orderResutlBean.getResultObject().get(WmsConstWords.CORE_ORDER_NO).toString(); // orderNo += orderResutlBean.getResultObject().get(WmsConstWords.CORE_ORDER_NO).toString();
@ -197,69 +199,71 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
// .setErrorSolution("【MES_PULL_ORDER_NO】请重新操作或查看服务！") // .setErrorSolution("【MES_PULL_ORDER_NO】请重新操作或查看服务！")
// .build(); // .build();
// } // }
MesPullingOrderInfo pullingOrder = new MesPullingOrderInfo(); MesPullingOrderInfo pullingOrder = new MesPullingOrderInfo();
pullingOrder.setOrganizeCode(organizeCode); pullingOrder.setOrganizeCode(organizeCode);
pullingOrder.setPullingOrderNo(orderNo); pullingOrder.setPullingOrderNo(orderNo);
pullingOrder.setPullOrderType(mesPartPull.getPullOrderType()); pullingOrder.setPullOrderType(mesPartPull.getPullOrderType());
pullingOrder.setPullGroupFid(mesPartPull.getId()); pullingOrder.setPullGroupFid(mesPartPull.getId());
pullingOrder.setCustOrderNo(StringUtil.isEmpty(mesWorkOrder.getCustOrderNo()) ? "" : mesWorkOrder.getCustOrderNo()); pullingOrder.setCustOrderNo(StringUtil.isEmpty(mesWorkOrder.getCustOrderNo()) ? "" : mesWorkOrder.getCustOrderNo());
pullingOrder.setWorkOrderNo(mesWorkOrder.getWorkOrderNo()); pullingOrder.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
pullingOrder.setWorkOrderSeq(StringUtil.isEmpty(mesWorkOrder.getWorkOrderSeq()) ? "" : mesWorkOrder.getWorkOrderSeq()); pullingOrder.setWorkOrderSeq(StringUtil.isEmpty(mesWorkOrder.getWorkOrderSeq()) ? "" : mesWorkOrder.getWorkOrderSeq());
pullingOrder.setIsPrint(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); pullingOrder.setIsPrint(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
pullingOrder.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue()); pullingOrder.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue());
pullingOrder.setPullOrderStatus(MesExtEnumUtil.PULL_ORDER_STATUS.KITTING_PULL.getValue()); pullingOrder.setPullOrderStatus(MesExtEnumUtil.PULL_ORDER_STATUS.KITTING_PULL.getValue());
pullingOrder.setWorkCenterCode(mesPartPull.getWorkCenterCode()); pullingOrder.setWorkCenterCode(mesPartPull.getWorkCenterCode());
pullingOrder.setPullCode(mesPartPull.getPullCode()); pullingOrder.setPullCode(mesPartPull.getPullCode());
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.setProduceSeq(StringUtil.isEmpty(mesWorkOrder.getProduceSeq()) ? 0 : mesWorkOrder.getProduceSeq());
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);
mesPullingOrderInfoRepository.insert(pullingOrder); mesPullingOrderInfoRepository.insert(pullingOrder);
for (MesPartPullDetail partInfo : mesPartPullDetails) { for (MesPartPullDetail partInfo : mesPartPullDetails) {
MesPullingOrderPartInfo pullingOrderPartInfo = new MesPullingOrderPartInfo(); MesPullingOrderPartInfo pullingOrderPartInfo = new MesPullingOrderPartInfo();
pullingOrderPartInfo.setOrganizeCode(organizeCode); pullingOrderPartInfo.setOrganizeCode(organizeCode);
pullingOrderPartInfo.setPullCode(partInfo.getPullCode()); pullingOrderPartInfo.setPullCode(partInfo.getPullCode());
pullingOrderPartInfo.setPullingOrderNo(pullingOrder.getPullingOrderNo()); pullingOrderPartInfo.setPullingOrderNo(pullingOrder.getPullingOrderNo());
pullingOrderPartInfo.setWorkOrderNo(pullingOrder.getWorkOrderNo()); pullingOrderPartInfo.setWorkOrderNo(pullingOrder.getWorkOrderNo());
pullingOrderPartInfo.setWorkOrderSeq(pullingOrder.getWorkOrderSeq()); pullingOrderPartInfo.setWorkOrderSeq(pullingOrder.getWorkOrderSeq());
pullingOrderPartInfo.setCustOrderNo(pullingOrder.getCustOrderNo()); pullingOrderPartInfo.setCustOrderNo(pullingOrder.getCustOrderNo());
pullingOrderPartInfo.setPartNo(partInfo.getPartNo()); pullingOrderPartInfo.setPartNo(partInfo.getPartNo());
pullingOrderPartInfo.setPartName(partInfo.getPartName()); pullingOrderPartInfo.setPartName(partInfo.getPartName());
MesWorkOrderPart mesWorkOrderPart = workOrderPartListMap.get(partInfo.getPartNo()).get(0); MesWorkOrderPart mesWorkOrderPart = workOrderPartListMap.get(partInfo.getPartNo()).get(0);
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.getProduceSeq());
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
pullingOrderPartInfo.setStatus(MesExtEnumUtil.PULL_ORDER_PART_STATUS.UN_SENTED.getValue());///明细已送料为1，未送料为0 pullingOrderPartInfo.setStatus(MesExtEnumUtil.PULL_ORDER_PART_STATUS.UN_SENTED.getValue());///明细已送料为1，未送料为0
pullingOrderPartInfo.setCustPartNo(pullingOrder.getCustPartNo()); pullingOrderPartInfo.setCustPartNo(pullingOrder.getCustPartNo());
if (partInfo.getScanValidationType() == 10) { if (partInfo.getScanValidationType() == 10) {
pullingOrderPartInfo.setColor(MesExtEnumUtil.PART_PULL_DETAIL_COLOR.WHITE.getCode()); pullingOrderPartInfo.setColor(MesExtEnumUtil.PART_PULL_DETAIL_COLOR.WHITE.getCode());
} else { } else {
pullingOrderPartInfo.setColor(MesExtEnumUtil.PART_PULL_DETAIL_COLOR.RED.getCode()); pullingOrderPartInfo.setColor(MesExtEnumUtil.PART_PULL_DETAIL_COLOR.RED.getCode());
}
pullingOrderPartInfo.setCarSeries(partInfo.getCarSeries());
pullingOrderPartInfo.setOrderFlag(pullingOrder.getOrderFlag());
ConvertBean.serviceModelInitialize(pullingOrderPartInfo, userName);
mesPullingOrderPartInfoRepository.insert(pullingOrderPartInfo);
} }
pullingOrderPartInfo.setCarSeries(partInfo.getCarSeries()); //7.拉动组+加工单号+生成拉动单状态的对应关系中间表，每次新增都要记录
pullingOrderPartInfo.setOrderFlag(pullingOrder.getOrderFlag()); MesPullingOrderExtends mesPullingOrderExtends= new MesPullingOrderExtends();
mesPullingOrderExtends.setOrganizeCode(organizeCode);
mesPullingOrderExtends.setPullCode(pullingOrder.getPullCode());
mesPullingOrderExtends.setPullingOrderNo(pullingOrder.getPullingOrderNo());
mesPullingOrderExtends.setWorkOrderNo(pullingOrder.getWorkOrderNo());
mesPullingOrderExtends.setPullOrderStatus(pullingOrder.getPullOrderStatus());
ConvertBean.serviceModelInitialize(mesPullingOrderExtends, userName);
ConvertBean.serviceModelInitialize(pullingOrderPartInfo, userName); mesPullingOrderExtendsRepository.insert(mesPullingOrderExtends);
mesPullingOrderPartInfoRepository.insert(pullingOrderPartInfo);
} }
//7.拉动组+加工单号+生成拉动单状态的对应关系中间表，每次新增都要记录
MesPullingOrderExtends mesPullingOrderExtends= new MesPullingOrderExtends();
mesPullingOrderExtends.setOrganizeCode(organizeCode);
mesPullingOrderExtends.setPullCode(pullingOrder.getPullCode());
mesPullingOrderExtends.setPullingOrderNo(pullingOrder.getPullingOrderNo());
mesPullingOrderExtends.setWorkOrderNo(pullingOrder.getWorkOrderNo());
mesPullingOrderExtends.setPullOrderStatus(pullingOrder.getPullOrderStatus());
ConvertBean.serviceModelInitialize(mesPullingOrderExtends, userName);
mesPullingOrderExtendsRepository.insert(mesPullingOrderExtends);
} }
//6.产生拉动单后更新工单拉动状态为已拉动 //6.产生拉动单后更新工单拉动状态为已拉动
mesWorkOrder.setPullingStatus(MesExtEnumUtil.WORK_ORDER_PULLING_STATUS.SUBMIT.getValue()); mesWorkOrder.setPullingStatus(MesExtEnumUtil.WORK_ORDER_PULLING_STATUS.SUBMIT.getValue());

Write Preview
Loading…
Cancel
Save