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 fd88e32efb b2972119a9
commit 4e4a7c527f
17 changed files with 108 additions and 59 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java
Unescape Escape View File

@ -37,7 +37,8 @@ public interface IMesWorkOrderService extends IBaseMesService<MesWorkOrder> {
@ApiOperation("ccscTest")
List<MesWorkOrder> queryMesWorkOrderProcessToSap(String organizeCode);
MesWorkOrder getWorkOrder(String organizeCode, String workOrderNo);
@ApiOperation("查询工单信息")
MesWorkOrder getMesWorkOrder(String workOrderNo,String organizeCode);
@ApiOperation("反向冲销")
void doReportWorkReversal(WmsProductModel model);

4
modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductionAssembly.groovy
Unescape Escape View File

@ -67,7 +67,9 @@ class MesToPiscesProductionAssembly {
if (!StringUtils.isEmpty(rowMap.get("production_record_id"))) {
long id = Long.parseLong(String.valueOf(rowMap.get("production_record_id")));
if (Objects.isNull(mesProductionRecordMap) || !mesProductionRecordMap.containsKey(id)) {
mesProductionRecordMap.put(id, mesProductionRecordRepository.getById(id))
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean)
mesProductionRecordMap.put(id, mesProductionRecordRepository.getByProperty(ddlPackBean))
}
MesProductionRecord mesProductionRecord = mesProductionRecordMap.get(id)
if (!Objects.isNull(mesProductionRecord)) {

15
modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesRawPartCharging.groovy
Unescape Escape View File

@ -1,3 +1,5 @@
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack
import cn.estsh.i3plus.pojo.mes.bean.MesRawPackage
import cn.estsh.i3plus.pojo.mes.bean.MesRawPackageDetail
import cn.estsh.i3plus.pojo.mes.bean.MesRawPackagePart
@ -37,12 +39,15 @@ class MesToPiscesRawPartCharging {
Map<Long, MesRawPackage> mesRawPackageMap = new HashMap<>();
Map<Long, MesRawPackageDetail> mesRawPackageDetailMap = new HashMap<>();
Map<Long, MesRawPackagePart> mesRawPackagePartMap = new HashMap<>();
String organizeCode = mapper.getOrganizeCode();
for (Map<String, Object> rowMap : srcData) {
//原材料容器
if (!StringUtils.isEmpty(rowMap.get("package_id"))) {
long id = Long.parseLong(String.valueOf(rowMap.get("package_id")));
if (Objects.isNull(mesRawPackageMap) || !mesRawPackageMap.containsKey(id)) {
mesRawPackageMap.put(id, mesRawPackageRepository.getById(id))
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode)
DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean)
mesRawPackageMap.put(id, mesRawPackageRepository.getByProperty(ddlPackBean))
}
MesRawPackage mesRawPackage = mesRawPackageMap.get(id)
if (!Objects.isNull(mesRawPackage)) {
@ -59,7 +64,9 @@ class MesToPiscesRawPartCharging {
if (!StringUtils.isEmpty(rowMap.get("package_detail_id"))) {
long id = Long.parseLong(String.valueOf(rowMap.get("package_detail_id")));
if (Objects.isNull(mesRawPackageDetailMap) || !mesRawPackageDetailMap.containsKey(id)) {
mesRawPackageDetailMap.put(id, mesRawPackageDetailRepository.getById(id))
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode)
DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean)
mesRawPackageDetailMap.put(id, mesRawPackageDetailRepository.getByProperty(ddlPackBean))
}
MesRawPackageDetail mesRawPackageDetail = mesRawPackageDetailMap.get(id)
if (!Objects.isNull(mesRawPackageDetail)) {
@ -74,7 +81,9 @@ class MesToPiscesRawPartCharging {
if (!StringUtils.isEmpty(rowMap.get("package_part_id"))) {
long id = Long.parseLong(String.valueOf(rowMap.get("package_part_id")));
if (Objects.isNull(mesRawPackagePartMap) || !mesRawPackagePartMap.containsKey(id)) {
mesRawPackagePartMap.put(id, mesRawPackagePartRepository.getById(id))
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode)
DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean)
mesRawPackagePartMap.put(id, mesRawPackagePartRepository.getByProperty(ddlPackBean))
}
MesRawPackagePart mesRawPackagePart = mesRawPackagePartMap.get(id)
if (!Objects.isNull(mesRawPackagePart)) {

4
modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy
Unescape Escape View File

@ -57,7 +57,9 @@ class PiscesToMesWorkOrder {
if (!StringUtils.isEmpty(rowMap.get("PRODUCT_GROUP_ID"))) {
long id = Long.parseLong(String.valueOf(rowMap.get("PRODUCT_GROUP_ID")))
if (Objects.isNull(mesPartProdGroupMap) || !mesPartProdGroupMap.containsKey(id)) {
mesPartProdGroupMap.put(id, mesPartProdGroupRepository.getById(id))
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode)
DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean)
mesPartProdGroupMap.put(id, mesPartProdGroupRepository.getByProperty(ddlPackBean))
}
MesPartProdGroup mesPartProdGroup = mesPartProdGroupMap.get(id)
if (!Objects.isNull(mesPartProdGroup)) {

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

@ -198,8 +198,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
" sd.plan_qty, " +
" sd.actual_qty, " +
" s.shipping_code, " +
" sd.part_no, " +
" sd.modify_date_time, " +
" sd.part_no " +
" from mes_shipping_detail sd " +
" left join mes_shipping s on s.id=sd.pid " +
" WHERE sd.status in (20) " +//todo 发运 20
@ -207,12 +206,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
hql.append(" and sd.organize_code = :organizeCode ");
hql.append(" and sd.is_deleted = :isDeleted ");
hql.append(" and sd.is_valid = :isValid ");
if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){
hql.append(" and sd.modify_date_time >= '"+detail.getModifyDateTimeStart()+"' ");
}
if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){
hql.append(" and sd.modify_date_time <= '"+detail.getModifyDateTimeEnd()+"' ");
}
if (!StringUtil.isEmpty(detail.getShippingCode())){
hql.append(" and s.shipping_code = '"+detail.getShippingCode()+"' ");
}
@ -239,7 +233,6 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
model.setActualQty(StringUtils.isEmpty(cells[2]) ? 1 : Integer.parseInt(String.valueOf(cells[2])));
model.setShippingCode(StringUtils.isEmpty(cells[3]) ? "" : String.valueOf(cells[3]));
model.setPartNo(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4]));
model.setModifyDatetime(StringUtils.isEmpty(cells[5]) ? "" : String.valueOf(cells[5]));
modelList.add(model);
}
@ -254,7 +247,12 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
hql.append(" WHERE wop.organize_code = :organizeCode ");
hql.append(" and wop.is_deleted = :isDeleted ");
hql.append(" and wop.is_valid = :isValid ");
if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){
hql.append(" and wo.shipping_time >= '"+detail.getModifyDateTimeStart()+"' ");
}
if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){
hql.append(" and wo.shipping_time <= '"+detail.getModifyDateTimeEnd()+"' ");
}
if (!StringUtil.isEmpty(detail.getPartNo())){
hql.append(" and wop.part_no ='"+detail.getPartNo()+"' ");
}
@ -286,13 +284,19 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
" wo.work_center_code, " +
" wop.part_no, " +
" wop.part_name, " +
" wop.item_qty " +
" wop.item_qty, " +
" wo.shipping_time " +
" from mes_work_order_part wop " +
" left join mes_work_order wo on wop.work_order_no=wo.work_order_no " );
hql.append(" WHERE wop.organize_code = :organizeCode ");
hql.append(" and wop.is_deleted = :isDeleted ");
hql.append(" and wop.is_valid = :isValid ");
if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){
hql.append(" and wo.shipping_time >= '"+detail.getModifyDateTimeStart()+"' ");
}
if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){
hql.append(" and wo.shipping_time <= '"+detail.getModifyDateTimeEnd()+"' ");
}
if (!StringUtil.isEmpty(detail.getPartNo())){
hql.append(" and wop.part_no ='"+detail.getPartNo()+"' ");
}
@ -320,6 +324,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
model.setPartNo(StringUtils.isEmpty(cells[1]) ? "" : String.valueOf(cells[1]));
model.setPartName(StringUtils.isEmpty(cells[2]) ? "" : String.valueOf(cells[2]));
model.setItemQty(StringUtils.isEmpty(cells[3]) ? 1 : Double.parseDouble(String.valueOf(cells[3])));
model.setShippingTime(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4]));
modelList.add(model);
}

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesWorkOrderUpdateQtyJob.java
Unescape Escape View File

@ -83,7 +83,7 @@ public class MesWorkOrderUpdateQtyJob extends BaseMesScheduleJob {
Map<String, List<MesProductionRecord>> map = recordList.stream().collect(Collectors.groupingBy(MesProductionRecord::getWorkOrderNo));
List<MesWorkOrder> orders = new ArrayList<>();
map.forEach((k,v) -> {
MesWorkOrder workOrder = mesWorkOrderService.getWorkOrder(organizeCode, k);
MesWorkOrder workOrder = mesWorkOrderService.getMesWorkOrder(k,organizeCode);
List<MesProductionRecord> productionRecords = getUnReportMesProduceSn(organizeCode, workOrder.getWorkOrderNo());

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
@ -120,15 +121,16 @@ public abstract class BaseMesService<T extends BaseBean> implements IBaseMesServ
public void deleteWeaklyById(Long id, String userName) {
onDeleteId(id);
//baseRDao.deleteWeaklyById(id, userName);
baseRDao.updateByProperties("id", id,new String[]{"isDeleted","modifyUser","modifyDatetime"},new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true)});
baseRDao.updateByProperties(new String[]{"organizeCode", "id"}, new Object[]{AuthUtilExt.getOrganizeCode(), id}, new String[]{"isDeleted", "modifyUser", "modifyDatetime"}, new Object[]{CommonEnumUtil.VALID, userName, TimeTool.getNowTime(true)});
}
@Override
public void deleteWeaklyByIds(Long[] ids, String userName) {
String organizeCode = AuthUtilExt.getOrganizeCode();
for (Long id : ids) {
onDeleteId(id);
//baseRDao.deleteWeaklyById(id, userName);
baseRDao.updateByProperties("id", id,new String[]{"isDeleted","modifyUser","modifyDatetime"},new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true)});
baseRDao.updateByProperties(new String[]{"organizeCode", "id"}, new Object[]{organizeCode, id}, new String[]{"isDeleted", "modifyUser", "modifyDatetime"}, new Object[]{CommonEnumUtil.VALID, userName, TimeTool.getNowTime(true)});
}
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerOriganzeService;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
/**
* @author yinxiao
@ -77,7 +80,12 @@ public class MesCustomerOriganzeService extends BaseMesService<MesCustomerOrigan
}
protected void onDeleteId(Long id) {
MesCustomerOriganze mesCustomerOriganze = baseRDao.getById(id);
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean);
MesCustomerOriganze mesCustomerOriganze = baseRDao.getByProperty(ddlPackBean);
if(Objects.isNull(mesCustomerOriganze)){
MesException.throwMesBusiException("ID【%s】客户工厂信息不存在",id);
}
//校验客户车型配置
DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomerOriganze.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesCustomerOriganze.getCustOrganizeCode(), "custOrganizeCode", packBean);

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerService;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@ -15,6 +17,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Objects;
/**
* @author yinxiao
* @date 2023-2023/6/2 10:54
@ -72,7 +76,12 @@ public class MesCustomerService extends BaseMesService<MesCustomer> implements I
}
protected void onDeleteId(Long id) {
MesCustomer mesCustomer = baseRDao.getById(id);
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(id,"id",ddlPackBean);
MesCustomer mesCustomer = baseRDao.getByProperty(ddlPackBean);
if(Objects.isNull(mesCustomer)){
MesException.throwMesBusiException("ID【%s】客户信息不存在",id);
}
//校验客户物料是否存在
DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomer.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesCustomer.getCustCode(), "custCode", packBean);

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingListService;
import cn.estsh.i3plus.ext.mes.api.base.IMesPartShippingGroupService;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.mes.api.iservice.busi.ISyncFuncService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@ -15,7 +17,6 @@ import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail;
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
import cn.estsh.i3plus.pojo.mes.repository.MesLoadingListDetailRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
@ -36,28 +37,24 @@ import java.util.Objects;
@Slf4j
public class MesLoadingListService extends BaseMesService<MesLoadingList> implements IMesLoadingListService {
@Autowired
private MesLoadingListDetailService detailService;
@Autowired
private MesPartShippingGroupRepository partShippingGroupRepository;
@Autowired
private MesShippingOrderManagementRepository shippingOrderManagementRepository;
@Autowired
private MesLoadingListDetailRepository listDetailRepository;
@Autowired
private IMesPartShippingGroupService mesPartShippingGroupService;
@Autowired
private ISyncFuncService syncFuncService;
@Override
public MesLoadingList insert(MesLoadingList bean) {
//插入前构造并校验数据
onInsertBean(bean);
MesShippingOrderManagement shippingOrderManagement = bean.getShippingOrderNoList().get(0);
MesPartShippingGroup partShippingGroup = partShippingGroupRepository.getById(shippingOrderManagement.getPartShippingGroupId());
MesPartShippingGroup partShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(shippingOrderManagement.getOrganizeCode(),shippingOrderManagement.getShippingGroupCode());
if (StringUtils.isEmpty(partShippingGroup)) {
throw ImppExceptionBuilder.newInstance()
@ -156,9 +153,11 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
@Override
public void deleteWeaklyByIds(Long[] ids, String userName) {
String organizeCode = AuthUtilExt.getOrganizeCode();
for (Long id : ids) {
MesLoadingList bean = baseRDao.getById(id);
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(id,"id",packBean);
MesLoadingList bean = baseRDao.getByProperty(packBean);
if (StringUtils.isEmpty(bean)) continue;
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(bean.getId(), "pid", detailPackBean);

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

@ -134,7 +134,6 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
mesWorkOrderPart.setItemQty(mesWorkOrderPart.getItemQty()*managementDetail.getPlanQty());
mesWorkOrderPart.setShippingCode(managementDetail.getShippingCode());
mesWorkOrderPart.setTotalPartNo(managementDetail.getPartNo());
mesWorkOrderPart.setShippingTime(managementDetail.getModifyDatetime());
}
}
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.api.base.*;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@ -193,9 +194,9 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
@Override
public void deleteWeaklyByIds(Long[] ids, String userName) {
String organizeCode = AuthUtilExt.getOrganizeCode();
for (Long id : ids) {
MesShippingOrderManagement bean = baseRDao.getById(id);
MesShippingOrderManagement bean = getMesShippingOrderManagement(organizeCode,id);
if (StringUtils.isEmpty(bean)) continue;
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), "shippingCode", detailPackBean);
@ -286,7 +287,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
@Override
public void saveShipping(MesShippingOrderManagement bean) {
MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
MesShippingOrderManagement originBean = getMesShippingOrderManagement(bean.getOrganizeCode(),bean.getId());
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(originBean.getId(), "pid", detailPackBean);
@ -355,8 +356,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
@Override
public void saveShippingClose(MesShippingOrderManagement bean) {
MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
MesShippingOrderManagement originBean = getMesShippingOrderManagement(bean.getOrganizeCode(),bean.getId());
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(originBean.getId(), "pid", detailPackBean);
@ -389,10 +389,11 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
baseRDao.save(originBean);
detailService.updates(detailDeleteList);
} @Override
public void saveShippingRelease(MesShippingOrderManagement bean) {
}
MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
@Override
public void saveShippingRelease(MesShippingOrderManagement bean) {
MesShippingOrderManagement originBean = getMesShippingOrderManagement(bean.getOrganizeCode(),bean.getId());
originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue());
originBean.setPublishTime(TimeTool.getNowTime(true));
@ -401,4 +402,14 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
baseRDao.save(originBean);
}
private MesShippingOrderManagement getMesShippingOrderManagement(String organizeCode,long id) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(id,"id",packBean);
MesShippingOrderManagement mesShippingOrderManagement = baseRDao.getByProperty(packBean);
if(Objects.isNull(mesShippingOrderManagement)){
MesException.throwMesBusiException("发运单【%s】信息不存在",id);
}
return mesShippingOrderManagement;
}
}

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

@ -53,7 +53,9 @@ public class MesWcEquipmentServiceImpl extends BaseMesService<MesWcEquipment> im
ValidatorBean.checkNotNull(item.getWorkCellCode(), "工作单元代码不能为空");
ValidatorBean.checkNotNull(item.getWorkCenterCode(), "工作中心代码不能为空");
//校验数据是否存在
MesWcEquipment mesWcEquipmentDb = baseRDao.getById(item.getId());
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(item.getId(),"id",ddlPackBean);
MesWcEquipment mesWcEquipmentDb = baseRDao.getByProperty(ddlPackBean);
if (null == mesWcEquipmentDb || CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == mesWcEquipmentDb.getIsDeleted()) {
MesException.throwMesBusiException("数据不存在");
}

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

@ -439,7 +439,9 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
public void doUpdatePrintStatus(List<String> cutWorkOrderIds, String organizeCode, String userName) {
for (String cutWorkOrderId : cutWorkOrderIds) {
workOrderCutRepository.updateByProperties(MesExtConstWords.ID, Long.parseLong(cutWorkOrderId),
workOrderCutRepository.updateByProperties(
new String[]{MesExtConstWords.ID, MesExtConstWords.ORGANIZE_CODE},
new Object[]{Long.parseLong(cutWorkOrderId), organizeCode},
new String[]{MesExtConstWords.IS_DELETED, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME, MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.PRINT_STATUS},
new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true), CommonEnumUtil.FALSE, MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue()});
}

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

@ -198,7 +198,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
@Override
public MesWorkOrder update(MesWorkOrder bean) {
MesWorkOrder result = baseRDao.getById(bean.getId());
MesWorkOrder result = getMesWorkOrder(bean.getWorkOrderNo(),bean.getOrganizeCode());
//若工单类型为排序 则根据排序插入工单数量插入多行 工单数量为1
if (result.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) {
if (!Objects.equals(bean.getQty(), result.getQty())) {
@ -1364,7 +1364,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
return mesWorkOrderList;
}
private MesWorkOrder getMesWorkOrder(String workOrderNo, String organizeCode) {
public MesWorkOrder getMesWorkOrder(String workOrderNo, String organizeCode) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(workOrderNo,"workOrderNo",packBean);
MesWorkOrder mesWorkOrder = baseRDao.getByProperty(packBean);
@ -1572,15 +1572,6 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
return mesWorkOrderRDao.findByHqlWhere(packBean);
}
@Override
public MesWorkOrder getWorkOrder(String organizeCode, String workOrderNo) {
// statusList.add(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue());
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(workOrderNo, "workOrderNo", packBean);
return mesWorkOrderRDao.getByProperty(packBean);
}
private MesMove createMove(MesPartSap mesPart, String source, String target, String org, String workCenterCode, double qty, String sn, Integer moveType) {
MesMove move = new MesMove();
if (!Objects.isNull(mesPart)) {

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

@ -70,7 +70,9 @@ public class MesModuleExcelServiceImpl extends BaseMesService<MesModuleExcel> im
@Override
public void updateModuleExcel(MultipartFile file, MesModuleExcel mesModuleExcel) {
MesModuleExcel moduleExcelManageDb = baseRDao.getById(mesModuleExcel.getId());
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesModuleExcel.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(mesModuleExcel.getId(),"id",ddlPackBean);
MesModuleExcel moduleExcelManageDb = baseRDao.getByProperty(ddlPackBean);
if (moduleExcelManageDb == null) {
MesException.throwMesBusiException("ID【%s】记录不存在", mesModuleExcel.getId());
}

11
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentSpotCheckService;
import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderPartService;
import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderResultService;
import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderService;
import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.icloud.core.sdk.ICoreUtilCloud;
@ -190,7 +191,9 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
public MesSpotCheckOrder update(MesSpotCheckOrder bean) {
onUpdateBean(bean);
//获取点检单
MesSpotCheckOrder originBean = baseRDao.getById(bean.getId());
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(bean.getId(), "id", ddlPackBean);
MesSpotCheckOrder originBean = baseRDao.getByProperty(ddlPackBean);
if (StringUtils.isEmpty(originBean)) {
throw ImppExceptionBuilder.newInstance()
@ -318,9 +321,11 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
@Override
public void deleteWeaklyByIds(Long[] ids, String userName) {
String organizeCode = AuthUtilExt.getOrganizeCode();
for (Long id : ids) {
MesSpotCheckOrder bean = baseRDao.getById(id);
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(id, "id", ddlPackBean);
MesSpotCheckOrder bean = baseRDao.getByProperty(ddlPackBean);
if (StringUtils.isEmpty(bean)) continue;
if (bean.getStatus() == MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue()) {

Write Preview
Loading…
Cancel
Save