Skip to content

M
mes
Commit efcc054c authored by 李驰骋's avatar 李驰骋
Browse files
Options

生产版本工序图纸上传BUG修复

parent 3cfc62f1
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 36 deletions
mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolutionProcessDrawing.java
View file @ efcc054c
...@@ -20,22 +20,22 @@ public class ProProductionSolutionProcessDrawing extends BaseEntity { ...@@ -20,22 +20,22 @@ public class ProProductionSolutionProcessDrawing extends BaseEntity {
private Long productionSolutionProcessFileId; private Long productionSolutionProcessFileId;
/** 生产方案工序ID */ /** 生产方案工序ID */
@ApiModelProperty(name = "生产方案工序ID") @ApiModelProperty("生产方案工序ID")
private Long productionSolutionProcessId; private Long productionSolutionProcessId;
/** 生产方案ID */ /** 生产方案ID */
@ApiModelProperty(name = "生产方案ID") @ApiModelProperty("生产方案ID")
private Long productionSolutionId; private Long productionSolutionId;
/** 文件地址 */ /** 文件地址 */
@ApiModelProperty(name = "文件地址") @ApiModelProperty("文件地址")
private String filePath; private String filePath;
/** 原文件名 */ /** 原文件名 */
@ApiModelProperty(name = "原文件名") @ApiModelProperty("原文件名")
private String fileOriginalName; private String fileOriginalName;
@ApiModelProperty(name = "文件大小") @ApiModelProperty("文件大小")
private Long fileSize; private Long fileSize;
......
mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionProcessVo.java
View file @ efcc054c
...@@ -223,25 +223,28 @@ public class ProProductionSolutionProcessVo extends BaseEntity { ...@@ -223,25 +223,28 @@ public class ProProductionSolutionProcessVo extends BaseEntity {
@Excel(name = "封切机分切") @Excel(name = "封切机分切")
private String sacmForSlitting; private String sacmForSlitting;
/** /**
* 工序物料 * 工序物料
*/ */
@ApiModelProperty("工序物料")
private List<ProProductionSolutionProcessItem> processItemList=new ArrayList<>(); private List<ProProductionSolutionProcessItem> processItemList=new ArrayList<>();
/** /**
* 生产版本工序检验项 * 生产版本工序检验项
**/ **/
@ApiModelProperty("工序检验项")
private List<ProProductionSolutionProcessQcindexVo> qcindexList=new ArrayList<>(); private List<ProProductionSolutionProcessQcindexVo> qcindexList=new ArrayList<>();
/** /**
* 生产版本工序工装夹具 * 生产版本工序工装夹具
**/ **/
@ApiModelProperty("工装夹具")
private List<ProProductionSolutionProcessToolVo> toolList=new ArrayList<>(); private List<ProProductionSolutionProcessToolVo> toolList=new ArrayList<>();
/** /**
* 生产版本工序图纸 * 生产版本工序图纸
**/ **/
@ApiModelProperty("图纸列表")
private List<ProProductionSolutionProcessDrawing> drawingList=new ArrayList<>(); private List<ProProductionSolutionProcessDrawing> drawingList=new ArrayList<>();
......
mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingCreate.java
View file @ efcc054c
...@@ -19,23 +19,23 @@ public class ProProductionSolutionProcessDrawingCreate { ...@@ -19,23 +19,23 @@ public class ProProductionSolutionProcessDrawingCreate {
private Long productionSolutionProcessFileId; private Long productionSolutionProcessFileId;
/** 生产方案工序ID */ /** 生产方案工序ID */
@ApiModelProperty(name = "生产方案工序ID") @ApiModelProperty("生产方案工序ID")
private Long productionSolutionProcessId; private Long productionSolutionProcessId;
/** 生产方案ID */ /** 生产方案ID */
@ApiModelProperty(name = "生产方案ID") @ApiModelProperty("生产方案ID")
private Long productionSolutionId; private Long productionSolutionId;
/** 文件地址 */ /** 文件地址 */
@ApiModelProperty(name = "文件地址") @ApiModelProperty("文件地址")
private String filePath; private String filePath;
/** 文件大小 */ /** 文件大小 */
@ApiModelProperty(name = "文件大小") @ApiModelProperty("文件大小")
private Long fileSize; private Long fileSize;
/** 原文件名 */ /** 原文件名 */
@ApiModelProperty(name = "原文件名") @ApiModelProperty("原文件名")
private String fileOriginalName; private String fileOriginalName;
......
mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingDto.java
View file @ efcc054c
...@@ -19,22 +19,22 @@ public class ProProductionSolutionProcessDrawingDto { ...@@ -19,22 +19,22 @@ public class ProProductionSolutionProcessDrawingDto {
private Long productionSolutionProcessFileId; private Long productionSolutionProcessFileId;
/** 生产方案工序ID */ /** 生产方案工序ID */
@ApiModelProperty(name = "生产方案工序ID") @ApiModelProperty("生产方案工序ID")
private Long productionSolutionProcessId; private Long productionSolutionProcessId;
/** 生产方案ID */ /** 生产方案ID */
@ApiModelProperty(name = "生产方案ID") @ApiModelProperty("生产方案ID")
private Long productionSolutionId; private Long productionSolutionId;
/** 文件地址 */ /** 文件地址 */
@ApiModelProperty(name = "文件地址") @ApiModelProperty("文件地址")
private String filePath; private String filePath;
/** 原文件名 */ /** 原文件名 */
@ApiModelProperty(name = "原文件名") @ApiModelProperty("原文件名")
private String fileOriginalName; private String fileOriginalName;
@ApiModelProperty(name = "文件大小") @ApiModelProperty("文件大小")
private Long fileSize; private Long fileSize;
......
mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingExcelExport.java
View file @ efcc054c
...@@ -21,26 +21,26 @@ public class ProProductionSolutionProcessDrawingExcelExport { ...@@ -21,26 +21,26 @@ public class ProProductionSolutionProcessDrawingExcelExport {
private Long productionSolutionProcessFileId; private Long productionSolutionProcessFileId;
/** 生产方案工序ID */ /** 生产方案工序ID */
@ApiModelProperty(name = "生产方案工序ID") @ApiModelProperty("生产方案工序ID")
@Excel(name = "生产方案工序ID") @Excel(name = "生产方案工序ID")
private Long productionSolutionProcessId; private Long productionSolutionProcessId;
/** 生产方案ID */ /** 生产方案ID */
@ApiModelProperty(name = "生产方案ID") @ApiModelProperty("生产方案ID")
@Excel(name = "生产方案ID") @Excel(name = "生产方案ID")
private Long productionSolutionId; private Long productionSolutionId;
/** 文件地址 */ /** 文件地址 */
@ApiModelProperty(name = "文件地址") @ApiModelProperty("文件地址")
@Excel(name = "文件地址") @Excel(name = "文件地址")
private String filePath; private String filePath;
/** 原文件名 */ /** 原文件名 */
@ApiModelProperty(name = "原文件名") @ApiModelProperty("原文件名")
@Excel(name = "原文件名") @Excel(name = "原文件名")
private String fileOriginalName; private String fileOriginalName;
@ApiModelProperty(name = "文件大小") @ApiModelProperty("文件大小")
private Long fileSize; private Long fileSize;
......
mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingExcelImport.java
View file @ efcc054c
...@@ -21,26 +21,26 @@ public class ProProductionSolutionProcessDrawingExcelImport { ...@@ -21,26 +21,26 @@ public class ProProductionSolutionProcessDrawingExcelImport {
private Long productionSolutionProcessFileId; private Long productionSolutionProcessFileId;
/** 生产方案工序ID */ /** 生产方案工序ID */
@ApiModelProperty(name = "生产方案工序ID") @ApiModelProperty("生产方案工序ID")
@Excel(name = "生产方案工序ID") @Excel(name = "生产方案工序ID")
private Long productionSolutionProcessId; private Long productionSolutionProcessId;
/** 生产方案ID */ /** 生产方案ID */
@ApiModelProperty(name = "生产方案ID") @ApiModelProperty("生产方案ID")
@Excel(name = "生产方案ID") @Excel(name = "生产方案ID")
private Long productionSolutionId; private Long productionSolutionId;
/** 文件地址 */ /** 文件地址 */
@ApiModelProperty(name = "文件地址") @ApiModelProperty("文件地址")
@Excel(name = "文件地址") @Excel(name = "文件地址")
private String filePath; private String filePath;
/** 原文件名 */ /** 原文件名 */
@ApiModelProperty(name = "原文件名") @ApiModelProperty("原文件名")
@Excel(name = "原文件名") @Excel(name = "原文件名")
private String fileOriginalName; private String fileOriginalName;
@ApiModelProperty(name = "文件大小") @ApiModelProperty("文件大小")
private Long fileSize; private Long fileSize;
......
mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingUpdate.java
View file @ efcc054c
...@@ -19,22 +19,22 @@ public class ProProductionSolutionProcessDrawingUpdate { ...@@ -19,22 +19,22 @@ public class ProProductionSolutionProcessDrawingUpdate {
private Long productionSolutionProcessFileId; private Long productionSolutionProcessFileId;
/** 生产方案工序ID */ /** 生产方案工序ID */
@ApiModelProperty(name = "生产方案工序ID") @ApiModelProperty("生产方案工序ID")
private Long productionSolutionProcessId; private Long productionSolutionProcessId;
/** 生产方案ID */ /** 生产方案ID */
@ApiModelProperty(name = "生产方案ID") @ApiModelProperty("生产方案ID")
private Long productionSolutionId; private Long productionSolutionId;
/** 文件地址 */ /** 文件地址 */
@ApiModelProperty(name = "文件地址") @ApiModelProperty("文件地址")
private String filePath; private String filePath;
/** 原文件名 */ /** 原文件名 */
@ApiModelProperty(name = "原文件名") @ApiModelProperty("原文件名")
private String fileOriginalName; private String fileOriginalName;
@ApiModelProperty(name = "文件大小") @ApiModelProperty("文件大小")
private Long fileSize; private Long fileSize;
......
mes/src/main/java/com/ximai/mes/pro/mapper/productionSolution/ProProductionSolutionProcessQcindexMapper.java
View file @ efcc054c
...@@ -21,7 +21,7 @@ public interface ProProductionSolutionProcessQcindexMapper extends BaseMapper<Pr ...@@ -21,7 +21,7 @@ public interface ProProductionSolutionProcessQcindexMapper extends BaseMapper<Pr
*/ */
ProProductionSolutionProcessQcindex selectProProductionSolutionProcessQcindexByPrototypeRequestProcessQcindexId(Long prototypeRequestProcessQcindexId); ProProductionSolutionProcessQcindex selectProProductionSolutionProcessQcindexByPrototypeRequestProcessQcindexId(Long prototypeRequestProcessQcindexId);
List<ProProductionSolutionProcessQcindex> selectselectProProductionSolutionProcessQcindexByPrototypeRequestProcessId(Long productionSolutionId); List<ProProductionSolutionProcessQcindex> selectProProductionSolutionProcessQcindexByPrototypeSolutionProcessId(Long productionSolutionId);
/** /**
* 查询生产版本工序检验项列表 * 查询生产版本工序检验项列表
......
mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionServiceImpl.java
View file @ efcc054c
...@@ -179,6 +179,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS ...@@ -179,6 +179,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional
public int insertProProductionSolution(ProProductionSolutionVo proProductionSolutionVo) { public int insertProProductionSolution(ProProductionSolutionVo proProductionSolutionVo) {
if (!StringUtils.isNotNull(proProductionSolutionVo)) { if (!StringUtils.isNotNull(proProductionSolutionVo)) {
return 9; return 9;
...@@ -362,6 +363,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS ...@@ -362,6 +363,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
* *
* @return 结果 * @return 结果
*/ */
@Transactional
@Override @Override
public int updateProProductionSolution(ProProductionSolutionVo proProductionSolutionVo) { public int updateProProductionSolution(ProProductionSolutionVo proProductionSolutionVo) {
ProProductionSolution proProductionSolution = proProductionSolutionMapper.selectProProductionSolutionByProductionSolutionId(proProductionSolutionVo.getProductionSolutionId()); ProProductionSolution proProductionSolution = proProductionSolutionMapper.selectProProductionSolutionByProductionSolutionId(proProductionSolutionVo.getProductionSolutionId());
...@@ -375,7 +377,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS ...@@ -375,7 +377,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
productionRequestProcess.setProductionSolutionId(proProductionSolutionVo.getProductionSolutionId()); productionRequestProcess.setProductionSolutionId(proProductionSolutionVo.getProductionSolutionId());
List<ProProductionSolutionProcessVo> processListDb = proProductionSolutionProcessMapper.selectProProductionSolutionProcessList(productionRequestProcess); List<ProProductionSolutionProcessVo> processListDb = proProductionSolutionProcessMapper.selectProProductionSolutionProcessList(productionRequestProcess);
if(processList!=null){ if(processList!=null){
Map<Long,List<ProProductionSolutionProcessDrawing>> processDrawingMap = productionSolutionProcessDrawingService.selectProProductionSolutionProcessDrawingList(new QueryWrapper<ProProductionSolutionProcessDrawing>().eq("production_solution_id",proProductionSolution)) Map<Long,List<ProProductionSolutionProcessDrawing>> processDrawingMap = productionSolutionProcessDrawingService.selectProProductionSolutionProcessDrawingList(new QueryWrapper<ProProductionSolutionProcessDrawing>().eq("production_solution_id", proProductionSolutionVo.getProductionSolutionId()))
.stream().collect(Collectors.groupingBy(s->s.getProductionSolutionProcessId())); .stream().collect(Collectors.groupingBy(s->s.getProductionSolutionProcessId()));
int k=1; int k=1;
for (ProProductionSolutionProcessVo proProductionSolutionProcessVo : processList) { for (ProProductionSolutionProcessVo proProductionSolutionProcessVo : processList) {
...@@ -458,7 +460,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS ...@@ -458,7 +460,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
}); });
//图纸 //图纸
List<ProProductionSolutionProcessDrawing> drawingCreateList = proProductionSolutionProcessVo.getDrawingList(); List<ProProductionSolutionProcessDrawing> drawingCreateList = proProductionSolutionProcessVo.getDrawingList();
List<ProProductionSolutionProcessDrawing> drawingCreateListDb = processDrawingMap.getOrDefault(prototypeRequestProcessId, new ArrayList<>()); List<ProProductionSolutionProcessDrawing> drawingListDb = processDrawingMap.getOrDefault(prototypeRequestProcessId, new ArrayList<>());
for (ProProductionSolutionProcessDrawing drawingTemp : drawingCreateList) { for (ProProductionSolutionProcessDrawing drawingTemp : drawingCreateList) {
drawingTemp.setProductionSolutionProcessId(prototypeRequestProcessId); drawingTemp.setProductionSolutionProcessId(prototypeRequestProcessId);
drawingTemp.setProductionSolutionId(proProductionSolutionProcessVo.getProductionSolutionId()); drawingTemp.setProductionSolutionId(proProductionSolutionProcessVo.getProductionSolutionId());
...@@ -472,7 +474,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS ...@@ -472,7 +474,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
productionSolutionProcessDrawingService.updateProProductionSolutionProcessDrawing(drawingUpdate); productionSolutionProcessDrawingService.updateProProductionSolutionProcessDrawing(drawingUpdate);
} }
} }
drawingCreateListDb.forEach(v->{ drawingListDb.forEach(v->{
if(!drawingCreateList.stream().filter(v2->{ if(!drawingCreateList.stream().filter(v2->{
return v.getProductionSolutionProcessFileId().equals(v2.getProductionSolutionProcessFileId()); return v.getProductionSolutionProcessFileId().equals(v2.getProductionSolutionProcessFileId());
}).findFirst().isPresent()){ }).findFirst().isPresent()){
...@@ -500,6 +502,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS ...@@ -500,6 +502,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
* @param productionSolutionIds 需要删除的生产版本主键 * @param productionSolutionIds 需要删除的生产版本主键
* @return 结果 * @return 结果
*/ */
@Transactional
@Override @Override
public int deleteProProductionSolutionByProductionSolutionIds(Long[] productionSolutionIds) { public int deleteProProductionSolutionByProductionSolutionIds(Long[] productionSolutionIds) {
if (StringUtils.isNotNull(productionSolutionIds)) { if (StringUtils.isNotNull(productionSolutionIds)) {
...@@ -581,7 +584,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS ...@@ -581,7 +584,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
} }
} }
// 删除质检 // 删除质检
List<ProProductionSolutionProcessQcindex> proProductionSolutionProcessQcindices = proProductionSolutionProcessQcindexMapper.selectselectProProductionSolutionProcessQcindexByPrototypeRequestProcessId(productionSolutionProcessId); List<ProProductionSolutionProcessQcindex> proProductionSolutionProcessQcindices = proProductionSolutionProcessQcindexMapper.selectProProductionSolutionProcessQcindexByPrototypeSolutionProcessId(productionSolutionProcessId);
if (StringUtils.isNotNull(proProductionSolutionProcessQcindices)) { if (StringUtils.isNotNull(proProductionSolutionProcessQcindices)) {
for (ProProductionSolutionProcessQcindex proProductionSolutionProcessQcindex : proProductionSolutionProcessQcindices) { for (ProProductionSolutionProcessQcindex proProductionSolutionProcessQcindex : proProductionSolutionProcessQcindices) {
i = proProductionSolutionProcessQcindexMapper.deleteProProductionSolutionProcessQcindexByPrototypeSolutionProcessQcindexId(proProductionSolutionProcessQcindex.getPrototypeSolutionProcessQcindexId()); i = proProductionSolutionProcessQcindexMapper.deleteProProductionSolutionProcessQcindexByPrototypeSolutionProcessQcindexId(proProductionSolutionProcessQcindex.getPrototypeSolutionProcessQcindexId());
......
mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionQcIndexMapper.xml
View file @ efcc054c
...@@ -35,6 +35,12 @@ ...@@ -35,6 +35,12 @@
</where> </where>
</select> </select>
<select id="selectProProductionSolutionProcessQcindexByPrototypeSolutionProcessId" parameterType="Long"
resultMap="ProProductionSolutionProcessQcindexResult">
<include refid="selectProProductionSolutionProcessQcindexVo"/>
where prototype_solution_process_id = #{prototypeSolutionProcessId}
</select>
<select id="selectProProductionSolutionProcessQcindexByPrototypeSolutionProcessQcindexId" parameterType="Long" <select id="selectProProductionSolutionProcessQcindexByPrototypeSolutionProcessQcindexId" parameterType="Long"
resultMap="ProProductionSolutionProcessQcindexResult"> resultMap="ProProductionSolutionProcessQcindexResult">
<include refid="selectProProductionSolutionProcessQcindexVo"/> <include refid="selectProProductionSolutionProcessQcindexVo"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment