盘点管理页面页面字段修改

2026-01-07 15:37:03 +08:00
parent 2c6f0fea94
commit e14aac2fc3
16 changed files with 404 additions and 313 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
@@ -175,7 +175,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
        checkStockin.setStatus("1");
        checkStockin.setStockSource("0");
        checkStockin.setCheckType(checkStockin.getCheckType());
-        //checkStockin.setErpBill(checkStockin.getErpBill());
+        checkStockin.setErpBill(checkStockin.getErpBill());
        if ("1".equals(checkStockin.getCheckType())) {
            //物料盘点
            for (int i = 0; i < detailList.size(); i++) {
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
@@ -46,6 +46,18 @@ public class ViewProductAndStockController extends BaseController
        return getDataTable(list);
    }

+    /**
+     * 查询库存物资列表
+     */
+    @PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:list')")
+    @GetMapping("/pd/list")
+    public TableDataInfo pdList(ViewProductAndStock viewProductAndStock)
+    {
+        startPage();
+        List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockPdList(viewProductAndStock);
+        return getDataTable(list);
+    }
+
    /**
     * 导出库存物资列表
     */
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java
@@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;

 /**
 * 库存物资Mapper接口
- * 
+ *
 * @author ruoyi
 * @date 2026-01-06
 */
-public interface ViewProductAndStockMapper 
+public interface ViewProductAndStockMapper
 {
    /**
     * 查询库存物资
-     * 
+     *
     * @param onlyIdentity 库存物资主键
     * @return 库存物资
     */
@@ -21,7 +21,7 @@ public interface ViewProductAndStockMapper

    /**
     * 查询库存物资列表
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 库存物资集合
     */
@@ -29,7 +29,7 @@ public interface ViewProductAndStockMapper

    /**
     * 新增库存物资
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 结果
     */
@@ -37,7 +37,7 @@ public interface ViewProductAndStockMapper

    /**
     * 修改库存物资
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 结果
     */
@@ -45,7 +45,7 @@ public interface ViewProductAndStockMapper

    /**
     * 删除库存物资
-     * 
+     *
     * @param onlyIdentity 库存物资主键
     * @return 结果
     */
@@ -53,9 +53,11 @@ public interface ViewProductAndStockMapper

    /**
     * 批量删除库存物资
-     * 
+     *
     * @param onlyIdentitys 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys);
+
+    List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java
@@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;

 /**
 * 库存物资Service接口
- * 
+ *
 * @author ruoyi
 * @date 2026-01-06
 */
-public interface IViewProductAndStockService 
+public interface IViewProductAndStockService
 {
    /**
     * 查询库存物资
-     * 
+     *
     * @param onlyIdentity 库存物资主键
     * @return 库存物资
     */
@@ -21,15 +21,23 @@ public interface IViewProductAndStockService

    /**
     * 查询库存物资列表
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 库存物资集合
     */
    public List<ViewProductAndStock> selectViewProductAndStockList(ViewProductAndStock viewProductAndStock);
+    /**
+     * 查询库存物资列表
+     *
+     * @param viewProductAndStock 库存物资
+     * @return 库存物资集合
+     */
+    List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
+

    /**
     * 新增库存物资
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 结果
     */
@@ -37,7 +45,7 @@ public interface IViewProductAndStockService

    /**
     * 修改库存物资
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 结果
     */
@@ -45,7 +53,7 @@ public interface IViewProductAndStockService

    /**
     * 批量删除库存物资
-     * 
+     *
     * @param onlyIdentitys 需要删除的库存物资主键集合
     * @return 结果
     */
@@ -53,9 +61,10 @@ public interface IViewProductAndStockService

    /**
     * 删除库存物资信息
-     * 
+     *
     * @param onlyIdentity 库存物资主键
     * @return 结果
     */
    public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity);
+
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java
@@ -9,19 +9,19 @@ import com.ruoyi.out.productAndStock.service.IViewProductAndStockService;

 /**
 * 库存物资Service业务层处理
- * 
+ *
 * @author ruoyi
 * @date 2026-01-06
 */
@Service
-public class ViewProductAndStockServiceImpl implements IViewProductAndStockService 
+public class ViewProductAndStockServiceImpl implements IViewProductAndStockService
 {
    @Autowired
    private ViewProductAndStockMapper viewProductAndStockMapper;

    /**
     * 查询库存物资
-     * 
+     *
     * @param onlyIdentity 库存物资主键
     * @return 库存物资
     */
@@ -33,7 +33,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi

    /**
     * 查询库存物资列表
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 库存物资
     */
@@ -43,9 +43,21 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
        return viewProductAndStockMapper.selectViewProductAndStockList(viewProductAndStock);
    }

+    /**
+     * 查询库存物资列表
+     *
+     * @param viewProductAndStock 库存物资
+     * @return 库存物资
+     */
+    @Override
+    public List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock) {
+        return viewProductAndStockMapper.selectViewProductAndStockPdList(viewProductAndStock);
+
+    }
+
    /**
     * 新增库存物资
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 结果
     */
@@ -57,7 +69,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi

    /**
     * 修改库存物资
-     * 
+     *
     * @param viewProductAndStock 库存物资
     * @return 结果
     */
@@ -69,7 +81,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi

    /**
     * 批量删除库存物资
-     * 
+     *
     * @param onlyIdentitys 需要删除的库存物资主键
     * @return 结果
     */
@@ -81,7 +93,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi

    /**
     * 删除库存物资信息
-     * 
+     *
     * @param onlyIdentity 库存物资主键
     * @return 结果
     */
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
@@ -1,5 +1,6 @@
 package com.ruoyi.stock.freeze.domain;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -90,6 +91,7 @@ public class BasStockFreezeRecord extends BaseEntity
    private String productGuid;
 //    创建时间
    @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @Override
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
@@ -1,9 +1,11 @@
 package com.ruoyi.stock.maintain.domain;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;

 import java.util.Date;

@@ -69,6 +71,7 @@ public class BasStockMaintainRecord extends BaseEntity
    private String warehouseId;

    @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @Override