Merge remote-tracking branch 'origin/0.9X' into 0.9X

klp-wms/src/main/java/com/klp/controller/WmsCoilChangeLogController.java

@@ -65,6 +65,15 @@ public class WmsCoilChangeLogController extends BaseController {
         return R.ok(iWmsCoilChangeLogService.queryById(logId));
     }
 
+    /**
+     * 按钢卷ID查询变更日志
+     */
+    @GetMapping("/byCoilId/{coilId}")
+    public R<List<WmsCoilChangeLogVo>> getByCoilId(@NotNull(message = "钢卷ID不能为空")
+                                                   @PathVariable Long coilId) {
+        return R.ok(iWmsCoilChangeLogService.queryByCoilId(coilId));
+    }
+
     /**
      * 新增钢卷变更日志
      */

klp-wms/src/main/java/com/klp/domain/vo/WmsCoilChangeLogVo.java

@@ -3,6 +3,7 @@ package com.klp.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
+import com.klp.common.core.domain.BaseEntity;
 import com.klp.common.convert.ExcelDictConvert;
 import lombok.Data;
 
@@ -15,7 +16,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class WmsCoilChangeLogVo {
+public class WmsCoilChangeLogVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

klp-wms/src/main/java/com/klp/service/IWmsCoilChangeLogService.java

@@ -32,6 +32,11 @@ public interface IWmsCoilChangeLogService {
      */
     List<WmsCoilChangeLogVo> queryList(WmsCoilChangeLogBo bo);
 
+    /**
+     * 按钢卷ID查询钢卷变更日志列表（匹配变更前/变更后钢卷）
+     */
+    List<WmsCoilChangeLogVo> queryByCoilId(Long coilId);
+
     /**
      * 新增钢卷变更日志
      */

klp-wms/src/main/java/com/klp/service/impl/WmsCoilChangeLogServiceImpl.java

@@ -58,6 +58,16 @@ public class WmsCoilChangeLogServiceImpl implements IWmsCoilChangeLogService {
         return baseMapper.selectVoList(lqw);
     }
 
+    @Override
+    public List<WmsCoilChangeLogVo> queryByCoilId(Long coilId) {
+        return baseMapper.selectVoList(Wrappers.<WmsCoilChangeLog>lambdaQuery()
+            .and(wrapper -> wrapper.eq(WmsCoilChangeLog::getOldCoilId, coilId)
+                .or()
+                .eq(WmsCoilChangeLog::getNewCoilId, coilId))
+            .orderByDesc(WmsCoilChangeLog::getCreateTime)
+            .orderByDesc(WmsCoilChangeLog::getLogId));
+    }
+
     private LambdaQueryWrapper<WmsCoilChangeLog> buildQueryWrapper(WmsCoilChangeLogBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<WmsCoilChangeLog> lqw = Wrappers.lambdaQuery();