| src/main/java/com/zy/asrs/entity/WrkMastLog.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/WrkMastLogMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| version/bak/wms.bak | 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -33,9 +33,6 @@ @TableField("task_type") private String taskType; @ApiModelProperty("日志ID") private Long logId; /** * 工作号 */ @@ -277,8 +274,8 @@ private String manuType; @ApiModelProperty(value = "") @TableField("memo_m") private String memoM; @TableField("memo") private String memo; @ApiModelProperty(value = "") @TableField("sc_weight") src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
@@ -15,7 +15,7 @@ @Repository public interface WrkMastLogMapper extends BaseMapper<WrkMastLog> { @Insert("insert into asr_wrk_mast_log select *, id as log_id from asr_wrk_mast where wrk_no=#{workNo}") @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}") int save(Integer workNo); /** src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
@@ -28,21 +28,8 @@ private WrkMastLogService wrkMastLogService; @Override @Transactional(rollbackFor = Exception.class) public boolean save(Integer workNo) { WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", workNo)); if (Objects.isNull(mast)) { throw new CoolException("数据错误:任务不存在!!"); } WrkMastLog mastLog = new WrkMastLog(); BeanUtils.copyProperties(mast, mastLog); mastLog.setLogId(mast.getId()); if (!wrkMastLogService.insert(mastLog)) { throw new CoolException("任务日志保存失败!!"); } return true; return this.baseMapper.save(workNo) > 0; } @Override src/main/resources/mapper/WrkMastLogMapper.xml
@@ -52,7 +52,7 @@ <result column="error_memo" property="errorMemo" /> <result column="ctn_kind" property="ctnKind" /> <result column="manu_type" property="manuType" /> <result column="memo_m" property="memoM" /> <result column="memo" property="memo" /> <result column="sc_weight" property="scWeight" /> <result column="log_mk" property="logMk" /> <result column="log_err_time" property="logErrTime" /> version/bak/wms.bakBinary files differ