rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom

This commit is contained in:
大米 2024-01-22 12:29:38 +08:00
parent 52ce04273c 0f7031bea7
commit b81a9e6cf2
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.TypeReference; import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -88,6 +89,9 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
if (optionalEbomMainVO == null || StrUtil.isEmpty(optionalEbomMainVO.getDeviceNo())) { if (optionalEbomMainVO == null || StrUtil.isEmpty(optionalEbomMainVO.getDeviceNo())) {
throw new NflgBusinessException(STATE.SystemErr, "查询设备数据不存在"); throw new NflgBusinessException(STATE.SystemErr, "查询设备数据不存在");
} }
OptionalEbomMainEntity mainEntity= SpringUtil.getBean(OptionalEbomMainService.class).getById(dto.getRowId());
OptionalEbomConfigEntity optionalEbomConfigEntity = new OptionalEbomConfigEntity(); OptionalEbomConfigEntity optionalEbomConfigEntity = new OptionalEbomConfigEntity();
optionalEbomConfigEntity.setParentRowId(dto.getRowId()); optionalEbomConfigEntity.setParentRowId(dto.getRowId());
optionalEbomConfigEntity.setRemark(dto.getRemark()); optionalEbomConfigEntity.setRemark(dto.getRemark());
@ -102,6 +106,10 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
optionalEbomConfigEntity.setCurrentVersion(optionalEbomMainVO.getVersion()); optionalEbomConfigEntity.setCurrentVersion(optionalEbomMainVO.getVersion());
optionalEbomConfigEntity.setConfigNo(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmssSSS")); optionalEbomConfigEntity.setConfigNo(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmssSSS"));
optionalEbomConfigEntity.setEditStatus(OptionalBomConstant.PublishEnum.TMP.getValue()); optionalEbomConfigEntity.setEditStatus(OptionalBomConstant.PublishEnum.TMP.getValue());
if(mainEntity!=null){
optionalEbomConfigEntity.setCurrentVersion(mainEntity.getVersion());
}
this.saveOrUpdate(optionalEbomConfigEntity); this.saveOrUpdate(optionalEbomConfigEntity);
insertConfigRelation(optionalEbomConfigEntity.getRowId(), dto.getOptions()); insertConfigRelation(optionalEbomConfigEntity.getRowId(), dto.getOptions());

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
View File

@ -281,7 +281,7 @@ public class AggregOptionConfigService {
// optionalEbomConfigEntity.setUpdatedTime(new Date()); // optionalEbomConfigEntity.setUpdatedTime(new Date());
optionalEbomConfigService.updateById(optionalEbomConfigEntity); optionalEbomConfigService.updateById(optionalEbomConfigEntity);
if(entity.getEditStatus()==OptionalBomConstant.PublishEnum.TMP.getValue()) { if(entity.getEditStatus().equals(OptionalBomConstant.PublishEnum.TMP.getValue())) {
return optionalEbomConfigService.insertConfigRelation(dto.getRowId(), dto.getOptions()); return optionalEbomConfigService.insertConfigRelation(dto.getRowId(), dto.getOptions());
} }
return true; return true;

12
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java
View File

@ -1,16 +1,22 @@
package com.nflg.product.bomnew.service.domain.OptionalMBom; package com.nflg.product.bomnew.service.domain.OptionalMBom;
import com.nflg.product.bomnew.constant.BomConstant; import com.nflg.product.bomnew.constant.BomConstant;
import com.nflg.product.bomnew.constant.FactoryCodeEnum;
import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialListVO;
import java.util.List;
public class OpMBomImortSap { public class OpMBomImortSap {
public ImportSapParamDTO buildSap(){ public ImportSapParamDTO buildSap(List<OptionalMbomMaterialListVO> list){
ImportSapParamDTO result=new ImportSapParamDTO(); ImportSapParamDTO result=new ImportSapParamDTO();
// result.setZID(parent.getRowId().toString()); // result.setZID(parent.getRowId().toString());
// result.setI_WERKS(parent.getFacCode()); result.setI_WERKS(FactoryCodeEnum.FACTORY_1010.getValue());
result.setI_STLAN(BomConstant.SAP_YDBOM); result.setI_STLAN(BomConstant.SAP_YDBOM);
return result; return result;
} }

2
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
View File

@ -22,7 +22,7 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
row_id,version, row_id,version,
,device_no,device_name,remark,is_enable,dept_row_id,dept_name,created_by,created_time,updated_time,updated_by,real_name,is_del,serial_no device_no,device_name,remark,is_enable,dept_row_id,dept_name,created_by,created_time,updated_time,updated_by,real_name,is_del,serial_no
</sql> </sql>
<sql id="where_whr"> <sql id="where_whr">