From ce3fdb298990ae8baef7ca595fe3b17e7929fca3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 08 十一月 2025 18:54:09 +0800
Subject: [PATCH] 工作主档转历史字段类型不一样数据丢失修复

---
 src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
index bd51e68..6e49f85 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
@@ -1,17 +1,45 @@
 package com.zy.asrs.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.InventoryFlowDto;
+import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.entity.WrkMastLog;
 import com.zy.asrs.mapper.WrkMastLogMapper;
 import com.zy.asrs.service.WrkMastLogService;
+import com.zy.asrs.service.WrkMastService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+import java.util.Objects;
 
 @Service("wrkMastLogService")
 public class WrkMastLogServiceImpl extends ServiceImpl<WrkMastLogMapper, WrkMastLog> implements WrkMastLogService {
 
+    @Autowired
+    private WrkMastService wrkMastService;
+    @Autowired
+    private WrkMastLogService wrkMastLogService;
+
     @Override
     public boolean save(Integer workNo) {
         return this.baseMapper.save(workNo) > 0;
     }
 
+    @Override
+    public R inventoryFlowList(Integer curr, Integer limit, Map<String, Object> param) {
+        Page<InventoryFlowDto> page = new Page<>();
+        page.setCurrent(curr);
+        page.setSize(limit);
+        page.setTotal(this.baseMapper.inventoryFlowListCount(param));
+        page.setRecords(this.baseMapper.inventoryFlowList(curr, limit, param));
+        return R.ok(page);
+    }
+
 }

--
Gitblit v1.9.1