Browse Source

2023-07-28 异常反馈图片上传

master
杨奉源 3 years ago
parent
commit
9fc48948f3
  1. 4
      src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java
  2. 2
      src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java
  3. 17
      src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java
  4. 13
      src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java
  5. 18
      src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java
  6. 20
      src/main/resources/mapper/pda/ToolDetailMapper.xml

4
src/main/java/com/jtem/modules/pda/dao/ToolDetailMapper.java

@ -213,4 +213,8 @@ public interface ToolDetailMapper {
void updateToolItem(ToolSubPropertiesValueData data);
void deleteItemModal(ToolSubPropertiesValueData data);
void checkToolUseQtyAssess(ToolUseQtyAssessData data);
void updateToolDetailUseQty(ToolUseQtyAssessData data);
}

2
src/main/java/com/jtem/modules/pda/service/ToolHeaderService.java

@ -262,4 +262,6 @@ public interface ToolHeaderService {
void deleteItemModal(ToolSubPropertiesValueData data);
void checkToolUseQtyAssess(ToolUseQtyAssessData data);
}

17
src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java

@ -694,6 +694,23 @@ public class ToolHeaderServiceImpl implements ToolHeaderService {
return new PageUtils(resultList);
}
/**
* @description: 审核寿命评估
* @author: fengyuan_yang
* @date: 2023/7/28 14:25
* @param: [data]
* @return: void
**/
@Override
@Transactional
public void checkToolUseQtyAssess(ToolUseQtyAssessData data) {
// 更新寿命评估表数据
toolDetailMapper.checkToolUseQtyAssess(data);
// 更新工具实例寿命
data.setEstUseQty(data.getAddUseQty() + data.getEstUseQty());
toolDetailMapper.updateToolDetailUseQty(data);
}
@Override
public List<ToolSubPropertiesValueData> getItemModal(ToolSubPropertiesValueData data){
return toolDetailMapper.getItemModal(data);

13
src/main/java/com/jtem/modules/toolMan/controller/ToolInfoController.java

@ -366,4 +366,17 @@ public class ToolInfoController extends AbstractController {
return R.ok();
}
/**
* @description: 审核寿命评估
* @author: fengyuan_yang
* @date: 2023/7/28 14:24
* @param: [data]
* @return: com.jtem.common.utils.R
**/
@PostMapping("checkToolUseQtyAssess")
public R checkToolUseQtyAssess(@RequestBody ToolUseQtyAssessData data){
toolHeaderService.checkToolUseQtyAssess(data);
return R.ok();
}
}

18
src/main/java/com/jtem/modules/toolMan/entity/ToolUseQtyAssessData.java

@ -9,6 +9,8 @@ import java.util.Date;
@Alias("ToolUseQtyAssessData")
public class ToolUseQtyAssessData extends QueryPage {
// 工厂号
private String site;
// 主键ID
private Integer id;
// 工具编码
@ -28,8 +30,8 @@ public class ToolUseQtyAssessData extends QueryPage {
// 创建人
private String createBy;
// 创建时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createDate;
// 状态
private String status;
@ -40,12 +42,20 @@ public class ToolUseQtyAssessData extends QueryPage {
// 审核人
private String checker;
// 审核时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date checkDate;
// 实际新增寿命
private Double actualAddUseQty;
public String getSite() {
return site;
}
public void setSite(String site) {
this.site = site;
}
public String getToolDescription() {
return toolDescription;
}

20
src/main/resources/mapper/pda/ToolDetailMapper.xml

@ -287,7 +287,7 @@
PurchaseDate = #{purchaseDate,jdbcType=TIMESTAMP},
PhaseInDate = #{phaseInDate,jdbcType=TIMESTAMP},
PhaseOutDate = #{phaseOutDate,jdbcType=TIMESTAMP},
lifespan = #{lifespan}
lifespan = #{lifespan}
</set>
<where>
Site=#{site,jdbcType=VARCHAR} AND ToolInstanceID=#{toolInstanceId,jdbcType=VARCHAR}
@ -564,6 +564,24 @@
END
</select>
<!-- 审核 -->
<update id="checkToolUseQtyAssess" parameterType="ToolUseQtyAssessData">
update tool_use_qty_assess
set actual_add_use_qty = #{addUseQty},
status = #{status},
checker = #{createBy},
check_date = getDate()
where id = #{id}
</update>
<!-- 更新工具实例寿命 -->
<update id="updateToolDetailUseQty" parameterType="ToolUseQtyAssessData">
update ToolDetail
set EstUseQty = #{estUseQty}
where ToolID = #{toolId} and Site = #{site} and ToolInstanceID = #{toolInstanceId}
</update>
<select id="getItemModal" resultType="com.jtem.modules.toolMan.entity.ToolSubPropertiesValueData">
SELECT a.ToolID,a.Site,a.CodeNo,a.SubCodeSeqNo,a.SubCodeDesc,a.ItemNo,a.PropertiesItemNo,a.TextValue,a.NumValue,a.RecordType,
a.ToolItemNo,b.ItemDesc ToolItemDesc,b.ValueType,b.ValueType_DB

Loading…
Cancel
Save