Skip to content

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

生产版本BUG修复

parent c111c08c
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 7 deletions
mes/src/main/java/com/ximai/mes/pro/controller/productionSolution/ProProductionSolutionController.java
View file @ 7d5744e3
......@@ -33,6 +33,7 @@ public class ProProductionSolutionController extends BaseController {
/**
* 查询生产版本列表
*/
@ApiOperation(value = "查询生产版本列表")
@PreAuthorize("@ss.hasPermi('mes:pro:productionSolution:list')")
@GetMapping("/list")
public TableDataInfo list(ProProductionSolution proProductionSolution) {
......@@ -65,6 +66,7 @@ public class ProProductionSolutionController extends BaseController {
/**
* 新增生产版本
*/
@ApiOperation(value = "新增生产版本")
@PreAuthorize("@ss.hasPermi('mes:pro:productionSolution:add')")
@Log(title = "生产版本", businessType = BusinessType.INSERT)
@PostMapping
......@@ -75,6 +77,7 @@ public class ProProductionSolutionController extends BaseController {
/**
* 修改生产版本
*/
@ApiOperation(value = "修改生产版本")
@PreAuthorize("@ss.hasPermi('mes:pro:productionSolution:edit')")
@Log(title = "生产版本", businessType = BusinessType.UPDATE)
@PutMapping
......@@ -85,6 +88,7 @@ public class ProProductionSolutionController extends BaseController {
/**
* 删除生产版本
*/
@ApiOperation(value = "删除生产版本")
@PreAuthorize("@ss.hasPermi('mes:pro:productionSolution:remove')")
@Log(title = "生产版本", businessType = BusinessType.DELETE)
@DeleteMapping("/{productionSolutionIds}")
......
mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolution.java
View file @ 7d5744e3
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.ximai.common.annotation.Excel;
import com.ximai.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......@@ -34,29 +35,33 @@ public class ProProductionSolution extends BaseEntity {
/**
* 编码
*/
@Excel(name = "编码")
@ApiModelProperty("编码")
private String productionSolutionCode;
/**
* 名称
*/
@Excel(name = "名称")
@ApiModelProperty("名称")
private String productionSolutionName;
/**
* 名称
*/
@Excel(name = "类型")
@ApiModelProperty("类型")
private String productionSolutionType;
/**
* SAP打样工单号
*/
@ApiModelProperty("SAP打样工单号")
private String sapPrototypeMakeCode;
/**
* 产品ID
*/
@Excel(name = "产品ID")
@ApiModelProperty("产品ID")
private Long itemId;
@TableField(exist = false)
......@@ -69,6 +74,7 @@ public class ProProductionSolution extends BaseEntity {
* 工艺路线ID
*/
@Excel(name = "工艺路线ID")
@ApiModelProperty("工艺路线ID")
private Long routeId;
/**
......@@ -80,6 +86,7 @@ public class ProProductionSolution extends BaseEntity {
* 生产用途
*/
@Excel(name = "生产用途")
@ApiModelProperty("生产用途")
private Long usageId;
/**
......@@ -91,36 +98,42 @@ public class ProProductionSolution extends BaseEntity {
* SAP物料编码
*/
@Excel(name = "SAP物料编码")
@ApiModelProperty("SAP物料编码")
private String sapItemCode;
/**
* 工厂编码
*/
@Excel(name = "工厂编码")
@ApiModelProperty("工厂编码")
private String factoryCode;
/**
* 任务清单组键值
*/
@Excel(name = "任务清单组键值")
@ApiModelProperty("任务清单组键值")
private String groupKey;
/**
* 组计数器
*/
@Excel(name = "组计数器")
@ApiModelProperty("组计数器")
private String groupCounter;
/**
* 物料清单组号
*/
@Excel(name = "物料清单组号")
@ApiModelProperty("物料清单组号")
private String materialsGroupBill;
/**
* 备选物料清单
*/
@Excel(name = "备选物料清单")
@ApiModelProperty("备选物料清单")
private String alternativeBill;
/**
......
mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionVo.java
View file @ 7d5744e3
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionSpecificationSheet;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......@@ -34,90 +35,108 @@ public class ProProductionSolutionVo implements Serializable {
/**
* 编码
*/
@ApiModelProperty("编码")
private String productionSolutionCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String productionSolutionName;
/**
* 类型
*/
@ApiModelProperty("类型")
private String productionSolutionType;
/**
* SAP打样工单号
*/
@ApiModelProperty("SAP打样工单号")
private String sapPrototypeMakeCode;
/**
* 产品ID
*/
@ApiModelProperty("产品ID")
private Long itemId;
/**
* 产品名称
*/
@ApiModelProperty("产品名称")
private String itemName;
/**
* 产品编码
*/
@ApiModelProperty("产品编码")
private String itemCode;
/**
* 工艺路线ID
*/
@ApiModelProperty("工艺路线ID")
private Long routeId;
/**
* 工艺路线名称
*/
@ApiModelProperty("工艺路线名称")
private String routeName;
/**
* 生产用途
*/
@ApiModelProperty("生产用途")
private Long usageId;
/**
* 生产用途名称
*/
@ApiModelProperty("生产用途名称")
private String usageName;
/**
* SAP物料编码
*/
@ApiModelProperty("SAP物料编码")
private String sapItemCode;
/**
* 工厂编码
*/
@ApiModelProperty("工厂编码")
private String factoryCode;
/**
* 任务清单组键值
*/
@ApiModelProperty("任务清单组键值")
private String groupKey;
/**
* 组计数器
*/
@ApiModelProperty("组计数器")
private String groupCounter;
/**
* 物料清单组号
*/
@ApiModelProperty("物料清单组号")
private String materialsGroupBill;
/**
* 备选物料清单
*/
@ApiModelProperty("备选物料清单")
private String alternativeBill;
/**
* 状态
*/
@ApiModelProperty("状态")
private String status;
/**
......@@ -165,16 +184,19 @@ public class ProProductionSolutionVo implements Serializable {
/**
* 备注
*/
@ApiModelProperty("备注")
private String remark;
/**
* 工程变更
*/
@ApiModelProperty("工程变更")
private String ecnCode;
/**
* 单位
*/
@ApiModelProperty("单位")
private String unitOfMeasure;
/**
......@@ -185,21 +207,25 @@ public class ProProductionSolutionVo implements Serializable {
/**
* SAP用途
*/
@ApiModelProperty("SAP用途")
private String sapUsageId;
/**
* BOM头信息
*/
@ApiModelProperty("BOM头信息")
private ProProductionSolutionBomHeadVo bomHead;
/**
* 工序列表
*/
@ApiModelProperty("工序列表")
private List<ProProductionSolutionProcessVo> processList;
/**
* 规格书
*/
@ApiModelProperty("规格书")
private ProProductionSolutionSpecificationSheet specificationSheet;
}
mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionServiceImpl.java
View file @ 7d5744e3
......@@ -625,6 +625,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
* @param productionSolutionId 生产版本主键
* @return 结果
*/
@Transactional
@Override
public int deleteProProductionSolutionByProductionSolutionId(Long productionSolutionId) {
if (StringUtils.isNull(productionSolutionId)) {
......@@ -646,7 +647,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
// 获取行表信息
QueryWrapper<ProProductionSolutionBomItem> bomItemQueryWrapper = new QueryWrapper<ProProductionSolutionBomItem>().eq("bom_head_id", bomHeadId);
List<ProProductionSolutionBomItem> proProductionSolutionBomItems = proProductionSolutionBomItemMapper.selectList(bomItemQueryWrapper);
if (StringUtils.isNotNull(proProductionSolutionBomItems)) {
if (StringUtils.isNotNull(proProductionSolutionBomItems)&&!proProductionSolutionBomItems.isEmpty()) {
List<Long> ids = proProductionSolutionBomItems.stream().map(ProProductionSolutionBomItem::getBomItemId).collect(Collectors.toList());
proProductionSolutionBomItemMapper.deleteBatchIds(ids);
}
......@@ -704,9 +705,11 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
// 删除规格书
ProProductionSolutionSpecificationSheet proProductionSolutionSpecificationSheet = proProductionSolutionSpecificationSheetMapper.selectSpecificationSheetByProductionSolutionId(productionSolutionId);
i = proProductionSolutionSpecificationSheetMapper.deleteProProductionSolutionSpecificationSheetBySpecificationSheetId(proProductionSolutionSpecificationSheet.getSpecificationSheetId());
if (i != 1) {
return 4;
if(proProductionSolutionSpecificationSheet!=null){
i = proProductionSolutionSpecificationSheetMapper.deleteProProductionSolutionSpecificationSheetBySpecificationSheetId(proProductionSolutionSpecificationSheet.getSpecificationSheetId());
if (i != 1) {
return 4;
}
}
}
return i;
......
mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionMapper.xml
View file @ 7d5744e3
......@@ -181,7 +181,7 @@
<if test="status != null">#{status},</if>
<if test="ecnCode != null">#{ecnCode},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="sapUsageId != null">#{sapUsageId}</if>
<if test="sapUsageId != null">#{sapUsageId},</if>
<if test="sapPrototypeMakeCode != null">#{sapPrototypeMakeCode},</if>
</trim>
</insert>
......
mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionTmToolMapper.xml
View file @ 7d5744e3
......@@ -47,7 +47,7 @@
parameterType="Long"
resultMap="ProProductionSolutionProcessToolResult">
<include refid="selectProProductionSolutionProcessToolVo"/>
where ppspi.production_solution_process_id = #{productionSolutionProcessId}
where production_solution_process_id = #{productionSolutionProcessId}
</select>
......
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