出库单据

2025-09-16 10:22:54 +08:00
parent 592ab99c49
commit f3637408cb
13 changed files with 797 additions and 381 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
@@ -65,7 +65,6 @@ public class OutStockoutServiceImpl implements IOutStockoutService
     * @return 出库主单
     */
    @Override
-    @DataScope(warehouseAlias = "bw")
    public List<OutStockout> selectOutStockoutList(OutStockout outStockout)
    {
        return outStockoutMapper.selectOutStockoutList(outStockout);
@@ -132,6 +131,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
            outStockout.setCreateManId(username);
            outStockout.setStatus("1");
            outStockout.setStockoutSource("0");
+            outStockout.setWarehouseId("01");
            for (int i = 0; i < detailList.size(); i++) {
                OutStockoutDetail outStockoutDetail = detailList.get(i);
                outStockoutDetail.setStockoutDetailId(stockOutId + "-" + (i + 1));
@@ -166,10 +166,10 @@ public class OutStockoutServiceImpl implements IOutStockoutService

        OutStockout outStockout = outStockoutMapper.selectOutStockoutByStockoutId(stockoutId);
        if (outStockout == null){
-            return AjaxResult.warn(MessageUtils.message("warn.message4"));
+            return AjaxResult.warn("单据不存在，请检查！");
        }
        if ("1".equals(outStockout.getStatus())){
-            return AjaxResult.warn(MessageUtils.message("warn.message5"));
+            return AjaxResult.warn("单据未审核，请审核无误后再分配！");
        }

        HashMap<String, String> map = new HashMap<>();
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
@@ -124,7 +124,7 @@ public class OutStockoutDetail extends BaseEntity

    /** 物资名称 ASMAT_NAME */
 //    @Excel(name = "物资名称 ASMAT_NAME")
-//    private String productName;
+    private String productName;

    /** 供应商代码 SUPPLIER_CODE */
    @Excel(name = "供应商代码 SUPPLIER_CODE")
@@ -138,9 +138,102 @@ public class OutStockoutDetail extends BaseEntity
    @Excel(name = "生产日期")
    private String printDate;

-    private ExtraField extraField;

+    /** 电压 */
+    @Excel(name = "电压")
+    private String voltage;

+    /** 功率 */
+    @Excel(name = "功率")
+    private String power;
+
+    /** 相位 */
+    @Excel(name = "相位")
+    private String phase;
+
+    /** 净重 */
+    @Excel(name = "净重")
+    private BigDecimal netWeight;
+
+    /** 毛重 */
+    @Excel(name = "毛重")
+    private BigDecimal grossWeight;
+
+    /** 分销 */
+    @Excel(name = "分销")
+    private String distribution;
+
+    /** 机型 */
+    @Excel(name = "机型")
+    private String model;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderId;
+
+    public String getVoltage() {
+        return voltage;
+    }
+
+    public void setVoltage(String voltage) {
+        this.voltage = voltage;
+    }
+
+    public String getPower() {
+        return power;
+    }
+
+    public void setPower(String power) {
+        this.power = power;
+    }
+
+    public String getPhase() {
+        return phase;
+    }
+
+    public void setPhase(String phase) {
+        this.phase = phase;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public String getDistribution() {
+        return distribution;
+    }
+
+    public void setDistribution(String distribution) {
+        this.distribution = distribution;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }

    public void setStockoutDetailId(String stockoutDetailId)
    {
@@ -433,48 +526,55 @@ public class OutStockoutDetail extends BaseEntity
        return printDate;
    }

-    public ExtraField getExtraField() {
-        return extraField;
+    public String getProductName() {
+        return productName;
    }

-    public void setExtraField(ExtraField extraField) {
-        this.extraField = extraField;
+    public void setProductName(String productName) {
+        this.productName = productName;
    }

    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("stockoutDetailId", getStockoutDetailId())
-            .append("stockoutGuid", getStockoutGuid())
-            .append("stockoutId", getStockoutId())
-            .append("lotNo", getLotNo())
-            .append("productGuid", getProductGuid())
-            .append("productId", getProductId())
-            .append("quantity", getQuantity())
-            .append("quantityX", getQuantityX())
-            .append("quantityJ", getQuantityJ())
-            .append("assignNum", getAssignNum())
-            .append("assignNumX", getAssignNumX())
-            .append("assignNumJ", getAssignNumJ())
-            .append("allotQuantity", getAllotQuantity())
-            .append("allotQuantityX", getAllotQuantityX())
-            .append("allotQuantityJ", getAllotQuantityJ())
-            .append("price", getPrice())
-            .append("remark", getRemark())
-            .append("warehouseId", getWarehouseId())
-            .append("outId", getOutId())
-            .append("bukechaiQuantity", getBukechaiQuantity())
-            .append("kechaiQuantity", getKechaiQuantity())
-            .append("entryid", getEntryid())
-            .append("flatQuantity", getFlatQuantity())
-            .append("fid", getFid())
-            .append("erpStockoutId", getErpStockoutId())
-            .append("unit", getUnit())
-            .append("spec", getSpec())
-            .append("supplierId", getSupplierId())
-            .append("cargoNo", getCargoNo())
-            .append("createTime", getCreateTime())
-            .append("printDate", getPrintDate())
-            .toString();
+        return "OutStockoutDetail{" +
+                "stockoutDetailId='" + stockoutDetailId + '\'' +
+                ", stockoutGuid='" + stockoutGuid + '\'' +
+                ", stockoutId='" + stockoutId + '\'' +
+                ", lotNo='" + lotNo + '\'' +
+                ", productGuid='" + productGuid + '\'' +
+                ", productId='" + productId + '\'' +
+                ", quantity=" + quantity +
+                ", quantityX=" + quantityX +
+                ", quantityJ=" + quantityJ +
+                ", assignNum=" + assignNum +
+                ", assignNumX=" + assignNumX +
+                ", assignNumJ=" + assignNumJ +
+                ", allotQuantity=" + allotQuantity +
+                ", allotQuantityX=" + allotQuantityX +
+                ", allotQuantityJ=" + allotQuantityJ +
+                ", price='" + price + '\'' +
+                ", warehouseId='" + warehouseId + '\'' +
+                ", outId='" + outId + '\'' +
+                ", bukechaiQuantity='" + bukechaiQuantity + '\'' +
+                ", kechaiQuantity='" + kechaiQuantity + '\'' +
+                ", entryid='" + entryid + '\'' +
+                ", flatQuantity='" + flatQuantity + '\'' +
+                ", fid='" + fid + '\'' +
+                ", erpStockoutId='" + erpStockoutId + '\'' +
+                ", unit='" + unit + '\'' +
+                ", spec='" + spec + '\'' +
+                ", productName='" + productName + '\'' +
+                ", supplierId='" + supplierId + '\'' +
+                ", cargoNo='" + cargoNo + '\'' +
+                ", printDate='" + printDate + '\'' +
+                ", voltage='" + voltage + '\'' +
+                ", power='" + power + '\'' +
+                ", phase='" + phase + '\'' +
+                ", netWeight=" + netWeight +
+                ", grossWeight=" + grossWeight +
+                ", distribution='" + distribution + '\'' +
+                ", model='" + model + '\'' +
+                ", orderId='" + orderId + '\'' +
+                '}';
    }
 }
--- 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
@@ -1,25 +1,31 @@
 package com.ruoyi.out.productAndStock.controller;

+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
 import com.ruoyi.out.productAndStock.service.IViewProductAndStockService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;

 /**
- * 可出库的库存物资信息Controller
- *
+ * 库存物资Controller
+ * 
 * @author ruoyi
- * @date 2025-05-21
+ * @date 2025-09-12
 */
@RestController
@RequestMapping("/out/productAndStock")
@@ -29,7 +35,7 @@ public class ViewProductAndStockController extends BaseController
    private IViewProductAndStockService viewProductAndStockService;

    /**
-     * 查询可出库的库存物资信息列表
+     * 查询库存物资列表
     */
    @PreAuthorize("@ss.hasPermi('out:productAndStock:list')")
    @GetMapping("/list")
@@ -41,20 +47,20 @@ public class ViewProductAndStockController extends BaseController
    }

    /**
-     * 导出可出库的库存物资信息列表
+     * 导出库存物资列表
     */
    @PreAuthorize("@ss.hasPermi('out:productAndStock:export')")
-    @Log(title = "可出库的库存物资信息", businessType = BusinessType.EXPORT)
+    @Log(title = "库存物资", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ViewProductAndStock viewProductAndStock)
    {
        List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockList(viewProductAndStock);
        ExcelUtil<ViewProductAndStock> util = new ExcelUtil<ViewProductAndStock>(ViewProductAndStock.class);
-        util.exportExcel(response, list, "可出库的库存物资信息数据");
+        util.exportExcel(response, list, "库存物资数据");
    }

    /**
-     * 获取可出库的库存物资信息详细信息
+     * 获取库存物资详细信息
     */
    @PreAuthorize("@ss.hasPermi('out:productAndStock:query')")
    @GetMapping(value = "/{onlyIdentity}")
@@ -64,10 +70,10 @@ public class ViewProductAndStockController extends BaseController
    }

    /**
-     * 新增可出库的库存物资信息
+     * 新增库存物资
     */
    @PreAuthorize("@ss.hasPermi('out:productAndStock:add')")
-    @Log(title = "可出库的库存物资信息", businessType = BusinessType.INSERT)
+    @Log(title = "库存物资", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ViewProductAndStock viewProductAndStock)
    {
@@ -75,10 +81,10 @@ public class ViewProductAndStockController extends BaseController
    }

    /**
-     * 修改可出库的库存物资信息
+     * 修改库存物资
     */
    @PreAuthorize("@ss.hasPermi('out:productAndStock:edit')")
-    @Log(title = "可出库的库存物资信息", businessType = BusinessType.UPDATE)
+    @Log(title = "库存物资", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ViewProductAndStock viewProductAndStock)
    {
@@ -86,10 +92,10 @@ public class ViewProductAndStockController extends BaseController
    }

    /**
-     * 删除可出库的库存物资信息
+     * 删除库存物资
     */
    @PreAuthorize("@ss.hasPermi('out:productAndStock:remove')")
-    @Log(title = "可出库的库存物资信息", businessType = BusinessType.DELETE)
+    @Log(title = "库存物资", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{onlyIdentitys}")
    public AjaxResult remove(@PathVariable Long[] onlyIdentitys)
    {
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java
@@ -1,15 +1,16 @@
 package com.ruoyi.out.productAndStock.domain;

-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.math.BigDecimal;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;

 /**
- * 可出库的库存物资信息对象 view_product_and_stock
- *
+ * 库存物资对象 view_product_and_stock
+ * 
 * @author ruoyi
- * @date 2025-05-21
+ * @date 2025-09-12
 */
 public class ViewProductAndStock extends BaseEntity
 {
@@ -19,95 +20,268 @@ public class ViewProductAndStock extends BaseEntity
    @Excel(name = "序号")
    private Long onlyIdentity;

-    /** 物资编码 */
-    @Excel(name = "物资编码")
+    /** 品号 */
+    @Excel(name = "品号")
    private String productId;

-    /** 批号 */
-    @Excel(name = "批号")
+    /** 批次号 */
+    @Excel(name = "批次号")
    private String lotNo;

-    /** 物资名称 */
-    @Excel(name = "物资名称")
+    /** 品名 */
+    @Excel(name = "品名")
    private String productName;

    /** 数量 */
    @Excel(name = "数量")
-    private String quantity;
+    private BigDecimal quantity;

    /** 仓库 */
    @Excel(name = "仓库")
    private String warehouseId;
-    private String warehouseName;

-    public String getWarehouseName() {
-        return warehouseName;
-    }
+    /** 规格 */
+    @Excel(name = "规格")
+    private String spare1;

-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
+    /** 单位 */
+    @Excel(name = "单位")
+    private String spare3;

-    public void setOnlyIdentity(Long onlyIdentity)
+    /** 型号 */
+    @Excel(name = "型号")
+    private String spare4;
+
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String spare5;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String spare6;
+
+    /** 电压 */
+    @Excel(name = "电压")
+    private String voltage;
+
+    /** 功率 */
+    @Excel(name = "功率")
+    private String power;
+
+    /** 相位 */
+    @Excel(name = "相位")
+    private String phase;
+
+    /** 净重 */
+    @Excel(name = "净重")
+    private BigDecimal netWeight;
+
+    /** 毛重 */
+    @Excel(name = "毛重")
+    private BigDecimal grossWeight;
+
+    /** 分销 */
+    @Excel(name = "分销")
+    private String distribution;
+
+    /** 机型 */
+    @Excel(name = "机型")
+    private String model;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderId;
+
+    public void setOnlyIdentity(Long onlyIdentity) 
    {
        this.onlyIdentity = onlyIdentity;
    }

-    public Long getOnlyIdentity()
+    public Long getOnlyIdentity() 
    {
        return onlyIdentity;
    }

-    public void setProductId(String productId)
+    public void setProductId(String productId) 
    {
        this.productId = productId;
    }

-    public String getProductId()
+    public String getProductId() 
    {
        return productId;
    }

-    public void setLotNo(String lotNo)
+    public void setLotNo(String lotNo) 
    {
        this.lotNo = lotNo;
    }

-    public String getLotNo()
+    public String getLotNo() 
    {
        return lotNo;
    }

-    public void setProductName(String productName)
+    public void setProductName(String productName) 
    {
        this.productName = productName;
    }

-    public String getProductName()
+    public String getProductName() 
    {
        return productName;
    }

-    public void setQuantity(String quantity)
+    public void setQuantity(BigDecimal quantity) 
    {
        this.quantity = quantity;
    }

-    public String getQuantity()
+    public BigDecimal getQuantity() 
    {
        return quantity;
    }

-    public void setWarehouseId(String warehouseId)
+    public void setWarehouseId(String warehouseId) 
    {
        this.warehouseId = warehouseId;
    }

-    public String getWarehouseId()
+    public String getWarehouseId() 
    {
        return warehouseId;
    }

+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setVoltage(String voltage) 
+    {
+        this.voltage = voltage;
+    }
+
+    public String getVoltage() 
+    {
+        return voltage;
+    }
+
+    public void setPower(String power) 
+    {
+        this.power = power;
+    }
+
+    public String getPower() 
+    {
+        return power;
+    }
+
+    public void setPhase(String phase) 
+    {
+        this.phase = phase;
+    }
+
+    public String getPhase() 
+    {
+        return phase;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) 
+    {
+        this.netWeight = netWeight;
+    }
+
+    public BigDecimal getNetWeight() 
+    {
+        return netWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) 
+    {
+        this.grossWeight = grossWeight;
+    }
+
+    public BigDecimal getGrossWeight() 
+    {
+        return grossWeight;
+    }
+
+    public void setDistribution(String distribution) 
+    {
+        this.distribution = distribution;
+    }
+
+    public String getDistribution() 
+    {
+        return distribution;
+    }
+
+    public void setModel(String model) 
+    {
+        this.model = model;
+    }
+
+    public String getModel() 
+    {
+        return model;
+    }
+
+    public void setOrderId(String orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() 
+    {
+        return orderId;
+    }
+
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -117,6 +291,19 @@ public class ViewProductAndStock extends BaseEntity
            .append("productName", getProductName())
            .append("quantity", getQuantity())
            .append("warehouseId", getWarehouseId())
+            .append("spare1", getSpare1())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("voltage", getVoltage())
+            .append("power", getPower())
+            .append("phase", getPhase())
+            .append("netWeight", getNetWeight())
+            .append("grossWeight", getGrossWeight())
+            .append("distribution", getDistribution())
+            .append("model", getModel())
+            .append("orderId", getOrderId())
            .toString();
    }
 }
--- 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
@@ -1,60 +1,59 @@
 package com.ruoyi.out.productAndStock.mapper;

+import java.util.List;
 import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;

-import java.util.List;
-
 /**
- * 可出库的库存物资信息Mapper接口
- *
+ * 库存物资Mapper接口
+ * 
 * @author ruoyi
- * @date 2025-05-21
+ * @date 2025-09-12
 */
-public interface ViewProductAndStockMapper
+public interface ViewProductAndStockMapper 
 {
    /**
-     * 查询可出库的库存物资信息
-     *
-     * @param onlyIdentity 可出库的库存物资信息主键
-     * @return 可出库的库存物资信息
+     * 查询库存物资
+     * 
+     * @param onlyIdentity 库存物资主键
+     * @return 库存物资
     */
    public ViewProductAndStock selectViewProductAndStockByOnlyIdentity(Long onlyIdentity);

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

    /**
-     * 新增可出库的库存物资信息
-     *
-     * @param viewProductAndStock 可出库的库存物资信息
+     * 新增库存物资
+     * 
+     * @param viewProductAndStock 库存物资
     * @return 结果
     */
    public int insertViewProductAndStock(ViewProductAndStock viewProductAndStock);

    /**
-     * 修改可出库的库存物资信息
-     *
-     * @param viewProductAndStock 可出库的库存物资信息
+     * 修改库存物资
+     * 
+     * @param viewProductAndStock 库存物资
     * @return 结果
     */
    public int updateViewProductAndStock(ViewProductAndStock viewProductAndStock);

    /**
-     * 删除可出库的库存物资信息
-     *
-     * @param onlyIdentity 可出库的库存物资信息主键
+     * 删除库存物资
+     * 
+     * @param onlyIdentity 库存物资主键
     * @return 结果
     */
    public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity);

    /**
-     * 批量删除可出库的库存物资信息
-     *
+     * 批量删除库存物资
+     * 
     * @param onlyIdentitys 需要删除的数据主键集合
     * @return 结果
     */
--- 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
@@ -1,61 +1,60 @@
 package com.ruoyi.out.productAndStock.service;

+import java.util.List;
 import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;

-import java.util.List;
-
 /**
- * 可出库的库存物资信息Service接口
- *
+ * 库存物资Service接口
+ * 
 * @author ruoyi
- * @date 2025-05-21
+ * @date 2025-09-12
 */
-public interface IViewProductAndStockService
+public interface IViewProductAndStockService 
 {
    /**
-     * 查询可出库的库存物资信息
-     *
-     * @param onlyIdentity 可出库的库存物资信息主键
-     * @return 可出库的库存物资信息
+     * 查询库存物资
+     * 
+     * @param onlyIdentity 库存物资主键
+     * @return 库存物资
     */
    public ViewProductAndStock selectViewProductAndStockByOnlyIdentity(Long onlyIdentity);

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

    /**
-     * 新增可出库的库存物资信息
-     *
-     * @param viewProductAndStock 可出库的库存物资信息
+     * 新增库存物资
+     * 
+     * @param viewProductAndStock 库存物资
     * @return 结果
     */
    public int insertViewProductAndStock(ViewProductAndStock viewProductAndStock);

    /**
-     * 修改可出库的库存物资信息
-     *
-     * @param viewProductAndStock 可出库的库存物资信息
+     * 修改库存物资
+     * 
+     * @param viewProductAndStock 库存物资
     * @return 结果
     */
    public int updateViewProductAndStock(ViewProductAndStock viewProductAndStock);

    /**
-     * 批量删除可出库的库存物资信息
-     *
-     * @param onlyIdentitys 需要删除的可出库的库存物资信息主键集合
+     * 批量删除库存物资
+     * 
+     * @param onlyIdentitys 需要删除的库存物资主键集合
     * @return 结果
     */
    public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys);

    /**
-     * 删除可出库的库存物资信息信息
-     *
-     * @param onlyIdentity 可出库的库存物资信息主键
+     * 删除库存物资信息
+     * 
+     * @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
@@ -1,30 +1,29 @@
 package com.ruoyi.out.productAndStock.service.impl;

-import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
-import com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper;
-import com.ruoyi.out.productAndStock.service.IViewProductAndStockService;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper;
+import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
+import com.ruoyi.out.productAndStock.service.IViewProductAndStockService;

 /**
- * 可出库的库存物资信息Service业务层处理
- *
+ * 库存物资Service业务层处理
+ * 
 * @author ruoyi
- * @date 2025-05-21
+ * @date 2025-09-12
 */
@Service
-public class ViewProductAndStockServiceImpl implements IViewProductAndStockService
+public class ViewProductAndStockServiceImpl implements IViewProductAndStockService 
 {
    @Autowired
    private ViewProductAndStockMapper viewProductAndStockMapper;

    /**
-     * 查询可出库的库存物资信息
-     *
-     * @param onlyIdentity 可出库的库存物资信息主键
-     * @return 可出库的库存物资信息
+     * 查询库存物资
+     * 
+     * @param onlyIdentity 库存物资主键
+     * @return 库存物资
     */
    @Override
    public ViewProductAndStock selectViewProductAndStockByOnlyIdentity(Long onlyIdentity)
@@ -33,10 +32,10 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
    }

    /**
-     * 查询可出库的库存物资信息列表
-     *
-     * @param viewProductAndStock 可出库的库存物资信息
-     * @return 可出库的库存物资信息
+     * 查询库存物资列表
+     * 
+     * @param viewProductAndStock 库存物资
+     * @return 库存物资
     */
    @Override
    public List<ViewProductAndStock> selectViewProductAndStockList(ViewProductAndStock viewProductAndStock)
@@ -45,9 +44,9 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
    }

    /**
-     * 新增可出库的库存物资信息
-     *
-     * @param viewProductAndStock 可出库的库存物资信息
+     * 新增库存物资
+     * 
+     * @param viewProductAndStock 库存物资
     * @return 结果
     */
    @Override
@@ -57,9 +56,9 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
    }

    /**
-     * 修改可出库的库存物资信息
-     *
-     * @param viewProductAndStock 可出库的库存物资信息
+     * 修改库存物资
+     * 
+     * @param viewProductAndStock 库存物资
     * @return 结果
     */
    @Override
@@ -69,9 +68,9 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
    }

    /**
-     * 批量删除可出库的库存物资信息
-     *
-     * @param onlyIdentitys 需要删除的可出库的库存物资信息主键
+     * 批量删除库存物资
+     * 
+     * @param onlyIdentitys 需要删除的库存物资主键
     * @return 结果
     */
    @Override
@@ -81,9 +80,9 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
    }

    /**
-     * 删除可出库的库存物资信息信息
-     *
-     * @param onlyIdentity 可出库的库存物资信息主键
+     * 删除库存物资信息
+     * 
+     * @param onlyIdentity 库存物资主键
     * @return 结果
     */
    @Override