feat(out): 优化出库单管理界面并调整库存查询逻辑

- 移除了出库单管理页面中的客户名称、供应商名称及仓库名称查询条件
- 在出库单列表中新增“出库单主题”、“单据来源”和“ERP出库单编号”字段展示
- 调整库存管理页面，移除多个冗余的查询字段与表格列，包括仓库、库存状态、产品GUID等
- 简化库存列表显示内容，仅保留核心字段如库存数量、入库时间等
- 更新出库单实体类，增加theme属性以支持单据主题功能
- 优化后端服务接口调用逻辑，完善出库相关功能
- 修复了部分页面样式和交互问题，提升用户体验

ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java

@@ -27,5 +27,6 @@ public interface IToErpService {
     String login();
 
     AjaxResult callErp(ReceiveOutStockConfirm receiveOutStockConfirm);
+
     AjaxResult receiveOutStockList();
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java

@@ -34,6 +34,7 @@ import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -268,9 +269,12 @@ public class ToErpServiceImpl implements IToErpService {
             outStockout.setWarehouseId(Convert.toStr(row.get(2)));
             outStockout.setErpStockoutId(Convert.toStr(row.get(0)));
             outStockout.setStockoutGuid(stockOutId);
-            outStockout.setCreateDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            outStockout.setCreateDate(Convert.toStr(row.get(3)));
             outStockout.setOutType("1");
             outStockout.setStatus("1");
+            outStockout.setFID(Convert.toStr(row.get(1)));
+            outStockout.setStockoutSource("2");
+            outStockout.setCustomerNo(Convert.toStr(row.get(24)));
             ErpOutStock erpOutStock1 = erpOutStockService.selectErpOutStockByStockoutId(erpOutStock.getStockoutId());
             OutStockout outStockout1 = outStockoutService.selectOutStockoutByStockoutGuid(outStockout.getStockoutGuid());
             if (ObjUtil.isNotNull(erpOutStock1)){
@@ -331,6 +335,8 @@ public class ToErpServiceImpl implements IToErpService {
                 outStockoutDetail.setQuantity(detail.getQuantity());
                 outStockoutDetail.setProductName(detail.getProductName());
                 outStockoutDetail.setFid(Convert.toStr(detail.getId()));
+                outStockoutDetail.setAssignNum(BigDecimal.valueOf(0));
+                outStockoutDetail.setAllotQuantity(BigDecimal.valueOf(0));
                 ErpOutStockDetail erpOutStockDetail1 = erpOutStockDetailService.selectErpOutStockDetailById(detail.getId());
                 OutStockoutDetail outStockoutDetail1 = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(outStockoutDetail.getStockoutDetailId());
                 if (ObjUtil.isNotNull(erpOutStockDetail1)){

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java

@@ -40,10 +40,10 @@ public class OutStockoutController extends BaseController {
     public TableDataInfo list(OutStockout outStockout) {
         startPage();
         List<OutStockout> list = new ArrayList<>();
-        if(Integer.parseInt(outStockout.getStatus())<4){
+        if (Integer.parseInt(outStockout.getStatus()) < 4) {
-        list =outStockoutService.selectOutStockoutList(outStockout);
+            list = outStockoutService.selectOutStockoutList(outStockout);
-        }else{
+        } else {
-        list=outStockoutFinishService.selectOutStockoutFinishListByOutStockout(outStockout);
+            list = outStockoutFinishService.selectOutStockoutFinishListByOutStockout(outStockout);
         }
         return getDataTable(list);
     }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java

@@ -94,8 +94,17 @@ public class OutStockout extends BaseEntity
 
     private String remark;
 
+    private String theme;
+
     private List<String> typeData;
 
+    public String getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
 
     public String getSupplierName() {
         return supplierName;

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java

@@ -135,7 +135,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
             String username = SecurityContextHolder.getContext().getAuthentication().getName();
             outStockout.setCreateManId(username);
             outStockout.setStatus("1");
-            outStockout.setStockoutSource("0");
+            outStockout.setStockoutSource("1");
 //            outStockout.setWarehouseId("01");
             for (int i = 0; i < detailList.size(); i++) {
                 OutStockoutDetail outStockoutDetail = detailList.get(i);

ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java

@@ -23,9 +23,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 库存物资Controller
- *
+ * 
  * @author ruoyi
- * @date 2025-09-12
+ * @date 2025-12-08
  */
 @RestController
 @RequestMapping("/out/productAndStock")
@@ -45,17 +45,6 @@ public class ViewProductAndStockController extends BaseController
         List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockList(viewProductAndStock);
         return getDataTable(list);
     }
-    /**
-     * 查询库存物资列表
-     */
-    @PreAuthorize("@ss.hasPermi('out:productAndStock:list')")
-    @GetMapping("/pd/list")
-    public TableDataInfo pdList(ViewProductAndStock viewProductAndStock)
-    {
-        startPage();
-        List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockPdList(viewProductAndStock);
-        return getDataTable(list);
-    }
 
     /**
      * 导出库存物资列表

ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java

@@ -9,135 +9,29 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 库存物资对象 view_product_and_stock
  * 
  * @author ruoyi
- * @date 2025-10-21
+ * @date 2025-12-08
  */
-public class ViewProductAndStock
+public class ViewProductAndStock extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 序号 */
+    /** 唯一id */
-    @Excel(name = "序号")
+    @Excel(name = "唯一id")
     private Long onlyIdentity;
 
-    /** 物料编码 */
+    /** 产品编码 */
-    @Excel(name = "物料编码")
+    @Excel(name = "产品编码")
     private String productId;
 
-    /** 批次 */
+    /** 产品名称 */
-    @Excel(name = "批次")
+    @Excel(name = "产品名称")
-    private String lotNo;
-
-    /** 物料名称 */
-    @Excel(name = "物料名称")
     private String productName;
 
     /** 库存数量 */
     @Excel(name = "库存数量")
     private String quantity;
 
-    /** 仓库 */
+    public void setOnlyIdentity(Long onlyIdentity) 
-    @Excel(name = "仓库")
-    private String warehouseId;
-
-    /** 来源 */
-    @Excel(name = "来源")
-    private String spare1;
-
-    /** 套账 */
-    @Excel(name = "套账")
-    private String spare3;
-
-    /** 用途 */
-    @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;
-
-    private String supplierName;
-
-    /** 管理号 */
-    @Excel(name = "管理号")
-    private String distribution;
-
-    /** 合同号 */
-    @Excel(name = "合同号")
-    private String orderId;
-
-    /** 质量等级 */
-    @Excel(name = "质量等级")
-    private String spare8;
-
-    /** 单价 */
-    @Excel(name = "单价")
-    private String price;
-
-    /** 图号 */
-    @Excel(name = "图号")
-    private String cargoNo;
-
-    /** 物料状态 */
-    @Excel(name = "物料状态")
-    private String productStatus;
-
-    /** 常用编码 */
-    @Excel(name = "常用编码")
-    private String parentId;
-
-    /** 启用标识 */
-    @Excel(name = "启用标识")
-    private String spare7;
-
-    @Excel(name = "创建时间")
-    private String createTime;
-
-    /** 创建用户 */
-    @Excel(name = "创建用户")
-    private String createSys;
-
-    /** 规格型号 */
-    @Excel(name = "规格型号")
-    private String spec;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String unit;
-
-
-    public String getSupplierName() {
-        return supplierName;
-    }
-
-    public void setSupplierName(String supplierName) {
-        this.supplierName = supplierName;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public void setOnlyIdentity(Long onlyIdentity)
     {
         this.onlyIdentity = onlyIdentity;
     }
@@ -157,16 +51,6 @@ public class ViewProductAndStock
         return productId;
     }
 
-    public void setLotNo(String lotNo) 
-    {
-        this.lotNo = lotNo;
-    }
-
-    public String getLotNo() 
-    {
-        return lotNo;
-    }
-
     public void setProductName(String productName) 
     {
         this.productName = productName;
@@ -187,235 +71,13 @@ public class ViewProductAndStock
         return quantity;
     }
 
-    public void setWarehouseId(String warehouseId) 
-    {
-        this.warehouseId = warehouseId;
-    }
-
-    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 setDistribution(String distribution) 
-    {
-        this.distribution = distribution;
-    }
-
-    public String getDistribution() 
-    {
-        return distribution;
-    }
-
-    public void setOrderId(String orderId) 
-    {
-        this.orderId = orderId;
-    }
-
-    public String getOrderId() 
-    {
-        return orderId;
-    }
-
-    public void setSpare8(String spare8) 
-    {
-        this.spare8 = spare8;
-    }
-
-    public String getSpare8() 
-    {
-        return spare8;
-    }
-
-    public void setPrice(String price) 
-    {
-        this.price = price;
-    }
-
-    public String getPrice() 
-    {
-        return price;
-    }
-
-    public void setCargoNo(String cargoNo) 
-    {
-        this.cargoNo = cargoNo;
-    }
-
-    public String getCargoNo() 
-    {
-        return cargoNo;
-    }
-
-    public void setProductStatus(String productStatus) 
-    {
-        this.productStatus = productStatus;
-    }
-
-    public String getProductStatus() 
-    {
-        return productStatus;
-    }
-
-    public void setParentId(String parentId) 
-    {
-        this.parentId = parentId;
-    }
-
-    public String getParentId() 
-    {
-        return parentId;
-    }
-
-    public void setSpare7(String spare7) 
-    {
-        this.spare7 = spare7;
-    }
-
-    public String getSpare7() 
-    {
-        return spare7;
-    }
-
-    public void setCreateSys(String createSys) 
-    {
-        this.createSys = createSys;
-    }
-
-    public String getCreateSys() 
-    {
-        return createSys;
-    }
-
-    public void setSpec(String spec) 
-    {
-        this.spec = spec;
-    }
-
-    public String getSpec() 
-    {
-        return spec;
-    }
-
-    public void setUnit(String unit) 
-    {
-        this.unit = unit;
-    }
-
-    public String getUnit() 
-    {
-        return unit;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("onlyIdentity", getOnlyIdentity())
             .append("productId", getProductId())
-            .append("lotNo", getLotNo())
             .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("distribution", getDistribution())
-            .append("orderId", getOrderId())
-            .append("spare8", getSpare8())
-            .append("price", getPrice())
-            .append("cargoNo", getCargoNo())
-            .append("productStatus", getProductStatus())
-            .append("parentId", getParentId())
-            .append("spare7", getSpare7())
-            .append("createTime", getCreateTime())
-            .append("createSys", getCreateSys())
-            .append("spec", getSpec())
-            .append("unit", getUnit())
             .toString();
     }
 }

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 2025-09-12
+ * @date 2025-12-08
  */
-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,11 +53,9 @@ public interface ViewProductAndStockMapper
 
     /**
      * 批量删除库存物资
-     *
+     * 
      * @param onlyIdentitys 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys);
-
-    List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
 }

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 2025-09-12
+ * @date 2025-12-08
  */
-public interface IViewProductAndStockService
+public interface IViewProductAndStockService 
 {
     /**
      * 查询库存物资
-     *
+     * 
      * @param onlyIdentity 库存物资主键
      * @return 库存物资
      */
@@ -21,7 +21,7 @@ public interface IViewProductAndStockService
 
     /**
      * 查询库存物资列表
-     *
+     * 
      * @param viewProductAndStock 库存物资
      * @return 库存物资集合
      */
@@ -29,7 +29,7 @@ public interface IViewProductAndStockService
 
     /**
      * 新增库存物资
-     *
+     * 
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IViewProductAndStockService
 
     /**
      * 修改库存物资
-     *
+     * 
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IViewProductAndStockService
 
     /**
      * 批量删除库存物资
-     *
+     * 
      * @param onlyIdentitys 需要删除的库存物资主键集合
      * @return 结果
      */
@@ -53,11 +53,9 @@ public interface IViewProductAndStockService
 
     /**
      * 删除库存物资信息
-     *
+     * 
      * @param onlyIdentity 库存物资主键
      * @return 结果
      */
     public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity);
-
-    List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
 }

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 2025-09-12
+ * @date 2025-12-08
  */
 @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 库存物资
      */
@@ -45,7 +45,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
 
     /**
      * 新增库存物资
-     *
+     * 
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -57,7 +57,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
 
     /**
      * 修改库存物资
-     *
+     * 
      * @param viewProductAndStock 库存物资
      * @return 结果
      */
@@ -69,7 +69,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
 
     /**
      * 批量删除库存物资
-     *
+     * 
      * @param onlyIdentitys 需要删除的库存物资主键
      * @return 结果
      */
@@ -81,7 +81,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
 
     /**
      * 删除库存物资信息
-     *
+     * 
      * @param onlyIdentity 库存物资主键
      * @return 结果
      */
@@ -90,10 +90,4 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
     {
         return viewProductAndStockMapper.deleteViewProductAndStockByOnlyIdentity(onlyIdentity);
     }
-
-    @Override
-    public List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock) {
-        return viewProductAndStockMapper.selectViewProductAndStockPdList(viewProductAndStock);
-
-    }
 }

ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="customerName"    column="customer_name"    />
         <result property="supplierName"    column="supplier_name"    />
         <result property="remark"    column="remark"    />
+        <result property="theme"    column="theme"    />
     </resultMap>
 
     <sql id="selectOutStockoutVo">
@@ -34,12 +35,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
         select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
-         o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,o.remark  from out_stockout o
+         o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,eos.outbound_remarks as remark
+        ,eos.customer_name
+        from out_stockout o
         left join out_stockout_detail d on d.stockout_id = o.stockout_id
         left join bas_customer bc on bc.customer_no = d.out_id
         left join bas_warehouse bw on bw.warehouse_id = d.warehouse_id
         left join bas_supplier bs on bs.supplier_no = d.supplier_id
         left join bas_product bp on bp.product_id = d.product_id
+        left join erp_out_stock eos on eos.stockout_id = o.erp_stockout_id
 
         <where>
             <if test="stockoutGuid != null  and stockoutGuid != ''"> and o.stockout_guid = #{stockoutGuid}</if>

ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml

@@ -7,35 +7,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="ViewProductAndStock" id="ViewProductAndStockResult">
         <result property="onlyIdentity"    column="only_identity"    />
         <result property="productId"    column="product_id"    />
-        <result property="lotNo"    column="lot_no"    />
         <result property="productName"    column="product_name"    />
         <result property="quantity"    column="quantity"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="price"    column="price"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createSys"    column="create_sys"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
-        <result property="supplierName"    column="supplier_name"    />
     </resultMap>
 
     <sql id="selectViewProductAndStockVo">
-        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, spare1, spare3, spare4, spare5, spare6, voltage, power, phase, distribution, order_id, spare8, price, cargo_no, product_status, parent_id, spare7, create_time, create_sys, spec, unit,supplier_name from view_product_and_stock
+        select only_identity, product_id, product_name, quantity from view_product_and_stock
     </sql>
 
     <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
@@ -43,30 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
             <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
-            <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
-            <if test="power != null  and power != ''"> and power = #{power}</if>
-            <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
-            <if test="distribution != null  and distribution != ''"> and distribution like concat('%', #{distribution}, '%')</if>
-            <if test="orderId != null  and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
-            <if test="price != null  and price != ''"> and price = #{price}</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</if>
-            <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
-            <if test="createSys != null  and createSys != ''"> and create_sys like concat('%', #{createSys}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-
         </where>
     </select>
     
@@ -80,60 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="onlyIdentity != null">only_identity,</if>
             <if test="productId != null">product_id,</if>
-            <if test="lotNo != null">lot_no,</if>
             <if test="productName != null">product_name,</if>
             <if test="quantity != null">quantity,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-            <if test="voltage != null">voltage,</if>
-            <if test="power != null">power,</if>
-            <if test="phase != null">phase,</if>
-            <if test="distribution != null">distribution,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="price != null">price,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="productStatus != null">product_status,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createSys != null">create_sys,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
-            <if test="supplierName != null">supplier_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="onlyIdentity != null">#{onlyIdentity},</if>
             <if test="productId != null">#{productId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
             <if test="productName != null">#{productName},</if>
             <if test="quantity != null">#{quantity},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-            <if test="voltage != null">#{voltage},</if>
-            <if test="power != null">#{power},</if>
-            <if test="phase != null">#{phase},</if>
-            <if test="distribution != null">#{distribution},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="price != null">#{price},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="productStatus != null">#{productStatus},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createSys != null">#{createSys},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="supplierName != null">#{supplierName},</if>
          </trim>
     </insert>
 
@@ -141,31 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update view_product_and_stock
         <trim prefix="SET" suffixOverrides=",">
             <if test="productId != null">product_id = #{productId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
             <if test="productName != null">product_name = #{productName},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-            <if test="voltage != null">voltage = #{voltage},</if>
-            <if test="power != null">power = #{power},</if>
-            <if test="phase != null">phase = #{phase},</if>
-            <if test="distribution != null">distribution = #{distribution},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="productStatus != null">product_status = #{productStatus},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createSys != null">create_sys = #{createSys},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
-            <if test="supplierName != null">supplier_name = #{supplierName},</if>
         </trim>
         where only_identity = #{onlyIdentity}
     </update>

ruoyi-ui/src/views/out/addOutStockout.vue

@@ -2,16 +2,16 @@
   <div class="app-container">
     <!-- 主表信息录入 -->
     <el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
-<!--      <el-form-item :label="'仓库'" prop="warehouseId" required>&lt;!&ndash;仓库&ndash;&gt;-->
+
-<!--        <el-select v-model="formData.warehouseId" :placeholder="'请选择仓库'" clearable>-->
+
-<!--          <el-option-->
+
-<!--            v-for="dict in warehouseOptions"-->
+      <el-form-item :label="'单据主题'" prop="remark"><!--客户-->
-<!--            :key="dict.warehouseId"-->
+        <el-input
-<!--            :label="dict.warehouseName"-->
+          v-model="formData.fid"
-<!--            :value="dict.warehouseId"-->
+          :placeholder="'请输入单据主题'"
-<!--          />-->
+          clearable
-<!--        </el-select>-->
+        />
-<!--      </el-form-item>-->
+      </el-form-item>
       <el-form-item :label="'单据类型'" prop="outType" required><!--单据类型-->
         <el-select v-model="formData.outType" :placeholder="'请选择单据类型'" clearable>
           <el-option
@@ -21,6 +21,13 @@
             :value="dict.value"
           />
         </el-select>
+      </el-form-item>
+       <el-form-item :label="'客户名称'" prop="customerNo"><!--客户-->
+        <el-input
+          v-model="formData.customerNo"
+          :placeholder="'请输入客户名称'"
+          clearable
+        />
       </el-form-item>
       <el-form-item :label="'备注'" prop="remark"><!--客户-->
         <el-input
@@ -45,76 +52,11 @@
     <el-table v-loading="loading" :data="materialList">
       <el-table-column label="物料编码" align="center" prop="productId" /><!--物资编号-->
       <el-table-column label="物料名称" align="center" prop="productName" /><!--物资名称-->
-      <el-table-column label="批次" align="center" prop="lotNo" />
-      <el-table-column label="规格型号" align="center" prop="productSpec" />
-      <el-table-column label="管理号" align="center" prop="fid" />
-      <el-table-column label="供应商" align="center" prop="supplierName" />
-<!--      <el-table-column label="客户编码" align="center" prop="outId" />-->
-      <el-table-column label="客户名称" align="center" prop="customerName" width="230">
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.customerName"
-            placeholder="点击选择客户"
-            readonly
-            size="mini"
-            @focus="openRowCustomerSelector(scope.row)"
-          />
-        </template>
-      </el-table-column>
       <el-table-column :label="'数量'" align="center" prop="quantity" width="150"><!--数量-->
         <template slot-scope="scope">
           <el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="spec">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.turnover_type" :value="scope.row.spec"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="来源" align="center" prop="unit" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.origin_type" :value="scope.row.unit"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="合同号" align="center" prop="cargoNo" />
-      <el-table-column label="入库单价" align="center" prop="price" />
-      <el-table-column label="产品质量" align="center" prop="voltage" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.voltage"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="台次" align="center" prop="power" />
-      <el-table-column label="件次" align="center" prop="phase" />
-      <el-table-column label="用途" align="center" prop="model" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.model"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="套账" align="center" prop="entryid" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.entryid"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位" align="center" prop="productUnit" />
-      <el-table-column label="图号" align="center" prop="productDrawNo" />
-      <el-table-column label="仓库" align="center" prop="warehouseId" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="物料状态" align="center" prop="productStatus" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.productStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="常用编码" align="center" prop="parentId" />
-      <el-table-column label="是否启用" align="center" prop="isUsed" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isUsed"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="创建用户" align="center" prop="createSys" />
 
       <el-table-column :label="'操作'" align="center" class-name="small-padding fixed-width"><!--操作-->
         <template slot-scope="scope">
@@ -143,55 +85,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="批次" prop="lotNo">
-          <el-input
-            v-model="queryParams.lotNo"
-            placeholder="请输入批次"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="供应商" prop="supplierName">
-          <el-input
-            v-model="queryParams.supplierName"
-            placeholder="点击选择供应商"
-            readonly
-            size="small"
-            @focus="openSupplierSelector"
-          />
-        </el-form-item>
-        <el-form-item label="管理号" prop="distribution">
-          <el-input
-            v-model="queryParams.distribution"
-            placeholder="请输入管理号"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="合同号" prop="orderId">
-          <el-input
-            v-model="queryParams.orderId"
-            placeholder="请输入合同号"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="规格型号" prop="spec">
-          <el-input
-            v-model="queryParams.spec"
-            placeholder="请输入规格型号"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="图号" prop="cargoNo">
-          <el-input
-            v-model="queryParams.cargoNo"
-            placeholder="请输入图号"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{'搜索'}}<!--搜索--></el-button>
@@ -203,63 +96,8 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" prop="onlyIdentity" />
         <el-table-column label="物料编码" align="center" prop="productId" />
-        <el-table-column label="批次" align="center" prop="lotNo" />
         <el-table-column label="物料名称" align="center" prop="productName" />
-        <el-table-column label="规格型号" align="center" prop="spec" />
-        <el-table-column label="图号" align="center" prop="cargoNo" />
         <el-table-column label="库存数量" align="center" prop="quantity" />
-        <el-table-column label="仓库" align="center" prop="warehouseId" >
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="来源" align="center" prop="spare1">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="套账" align="center" prop="spare3">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="用途" align="center" prop="spare4">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.purpose_type" :value="scope.row.spare4"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="台次" align="center" prop="spare5" />
-        <el-table-column label="入库单价" align="center" prop="spare6" />
-        <el-table-column label="状态" align="center" prop="voltage">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.turnover_type" :value="scope.row.voltage"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="件次" align="center" prop="power" />
-<!--        <el-table-column label="供应商" align="center" prop="phase" />-->
-        <el-table-column label="供应商" align="center" prop="supplierName" />
-        <el-table-column label="管理号" align="center" prop="distribution" />
-        <el-table-column label="合同号" align="center" prop="orderId" />
-        <el-table-column label="质量等级" align="center" prop="spare8">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="单价" align="center" prop="price" />
-
-        <el-table-column label="物料状态" align="center" prop="productStatus">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.product_type" :value="scope.row.productStatus"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="常用编码" align="center" prop="parentId" />
-        <el-table-column label="启用标识" align="center" prop="spare7">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare7"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="创建用户" align="center" prop="createSys" />
-        <el-table-column label="单位" align="center" prop="unit" />
       </el-table>
 
       <pagination
@@ -417,7 +255,9 @@ export default {
         customerNo: null,
         customerName: null, // 添加客户名称字段，用于显示
         outType: null,
-        remark:null
+        remark:null,
+        fid:null,
+
       },
       // 仓库选项
       warehouseOptions: [],

ruoyi-ui/src/views/out/outStockoutManage.vue

@@ -30,14 +30,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="'客户名称'" prop="customerName">
+
-        <el-input
-          v-model="queryParams.customerName"
-          :placeholder="'请输入客户名称'"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="'物料名称'" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -46,24 +39,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="'供应商名称'" prop="supplierName">
+
-        <el-input
+
-          v-model="queryParams.supplierName"
-          :placeholder="'请输入供应商名称'"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="'仓库名称'" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" :placeholder="'请选择仓库'">
-          <el-option
-            v-for="dict in dict.type.warehouse"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item :label="'创建时间'" prop="dateRange">
         <el-date-picker
           v-model="dateRange"
@@ -75,21 +52,6 @@
           :default-time="['00:00:00', '23:59:59']"
         />
       </el-form-item>
-<!--      <el-form-item :label="'仓库'" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
-<!--        <el-select-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          :placeholder="'请选择仓库'"-->
-<!--          clearable-->
-<!--          @change="handleQuery"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in warehouseOptions"-->
-<!--            :key="item.warehouseId"-->
-<!--            :label="item.warehouseName"-->
-<!--            :value="item.warehouseId"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{'搜索'}}</el-button> <!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{'重置'}}</el-button> <!-- 重置 -->
@@ -154,6 +116,7 @@
     <el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="'出库单编号'" align="left" prop="stockoutId" /> <!-- 出库单编号 -->
+      <el-table-column :label="'出库单主题'" align="left" prop="fid" width="260" /> <!-- 出库单主题 -->
       <el-table-column :label="'出库类型'" align="left" prop="outType"> <!-- 出库类型 -->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
@@ -164,15 +127,17 @@
           <dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-<!--      <el-table-column :label="'出口'" align="left" prop="exitId" />-->
+
-<!--      <el-table-column :label="'客户编码'" align="left" prop="customerNo" />&lt;!&ndash; 客户编码 &ndash;&gt;-->
+      <el-table-column :label="'单据来源'" align="center" prop="stockoutSource" > <!-- 单据来源 -->
-<!--      <el-table-column :label="'客户名称'" align="left" prop="customerName" />-->
+        <template slot-scope="scope">
-      <el-table-column :label="'建单人'" align="left" prop="createManId" /> <!-- 建单人 -->
+          <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockoutSource"/>
-      <el-table-column :label="'备注'" align="center" prop="remark" /> <!-- 备注 -->
+        </template>
+      </el-table-column>
+      <el-table-column :label="'ERP出库单编号'" align="center" prop="erpStockoutId" /> <!-- ERP出库单编号 -->
+      <el-table-column :label="'客户名称'" align="center" prop="customerNo" /> <!-- 客户名称 -->
       <el-table-column :label="'创建时间'" align="left" prop="createDate" /><!-- 创建时间 -->
       <el-table-column :label="'开始时间'" align="left" prop="startDate" /><!-- 开始时间 -->
       <el-table-column :label="'确认时间'" align="left" prop="finishDate" /> <!-- 确认时间 -->
-<!--      <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />&lt;!&ndash; 仓库名称 &ndash;&gt;-->
     </el-table>
 
     <pagination
@@ -189,64 +154,14 @@
       <el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 -->
       <el-table-column :label="'物料编码'" align="center" prop="productId" /> <!-- 物资编码 -->
       <el-table-column :label="'物料名称'" align="center" prop="productName" />
-      <el-table-column :label="'批次'" align="center" prop="lotNo"/><!--英文描述-->
-      <el-table-column label="规格型号" align="center" prop="productSpec" />
-      <el-table-column label="供应商" align="center" prop="supplierName" />
-      <el-table-column label="客户" align="center" prop="customerName" />
       <el-table-column :label="'计划数量'" align="center" prop="quantity" /> <!-- 计划数量 -->
       <el-table-column :label="'分配数量'" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
       <el-table-column :label="'实际数量'" align="center" prop="assignNum" /> <!-- 实际数量 -->
-      <el-table-column :label="'入库单价'" align="center" prop="price"/><!--箱号-->
+      <!-- <el-table-column :label="'来源'" align="center" prop="unit">
-      <el-table-column :label="'来源'" align="center" prop="unit">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.origin_type" :value="scope.row.unit"/>
         </template>
-      </el-table-column>
+      </el-table-column> -->
-      <el-table-column :label="'状态'" align="center" prop="spec">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.turnover_type" :value="scope.row.spec"/>
-        </template>
-      </el-table-column>
-      <el-table-column :label="'合同号'" align="center"  prop="cargoNo" /> <!--型号-->
-      <el-table-column label="产品质量" align="center" prop="voltage" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.voltage"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="台次" align="center" prop="power" />
-      <el-table-column label="件次" align="center" prop="phase" />
-
-<!--      <el-table-column label="分销" align="center" prop="distribution" />-->
-      <el-table-column label="用途" align="center" prop="model" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.model"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="套账" align="center" prop="entryid" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.entryid"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="仓库" align="center" prop="warehouseId" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位" align="center" prop="productUnit" />
-      <el-table-column label="图号" align="center" prop="productDrawNo" />
-      <el-table-column label="物料状态" align="center" prop="productStatus" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.productStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="常用编码" align="center" prop="parentId" />
-      <el-table-column label="是否启用" align="center" prop="isUsed" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isUsed"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="创建用户" align="center" prop="createSys" />
 
     </el-table>
 
@@ -404,7 +319,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "OutStockWithDetail",
-  dicts: ['out_bill_type', 'out_bill_status', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no','account_type','origin_type','purpose_type','warehouse'],
+  dicts: ['bill_resource','out_bill_type', 'out_bill_status', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no','account_type','origin_type','purpose_type','warehouse'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/stock/management/index.vue

@@ -1,32 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仓库" prop="warehouseId"><!--仓库-->
-        <el-select
-          v-model="queryParams.warehouseId"
-          placeholder="请选择仓库"
-          clearable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in warehouseOptions"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="库存状态" prop="stockStatus">
-        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable @change="handleQuery">
-          <el-option
-            v-for="dict in dict.type.stock_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
 
       <el-form-item label="库存编码" prop="stockId">
         <el-input
@@ -37,56 +11,6 @@
         />
       </el-form-item>
 
-      <el-form-item label="产品GUID" prop="productGuid">
-        <el-input
-          v-model="queryParams.productGuid"
-          placeholder="请输入产品GUID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="批次号(库存批次)" prop="lotNo">
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入库存批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <!-- <el-form-item label="巷道" prop="roadwayId">
-        <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="层" prop="theFloor">
-        <el-input
-          v-model="queryParams.theFloor"
-          placeholder="请输入层"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="排" prop="thePlatoon">
-        <el-input
-          v-model="queryParams.thePlatoon"
-          placeholder="请输入排"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="列" prop="theColumn">
-        <el-input
-          v-model="queryParams.theColumn"
-          placeholder="请输入列"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -95,38 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="规格型号" prop="spec">
+
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格型号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="常用编码" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入常用编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应代号" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商代号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应名称" prop="supplierName">
-        <el-input
-          v-model="queryParams.supplierName"
-          placeholder="请输入供应商名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="物料名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -135,103 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="入库主题" prop="Title">
-        <el-input v-model="queryParams.Title" placeholder="请输入入库主题" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="入库编号" prop="Rkbh">
-        <el-input v-model="queryParams.Rkbh" placeholder="请输入入库编号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="审批状态" prop="Status">
-        <el-input v-model="queryParams.Status" placeholder="请输入审批状态" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="明细产品名" prop="pdProductName">
-        <el-input
-          v-model="queryParams.pdProductName"
-          placeholder="请输入明细产品名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="明细型号" prop="pdModel">
-        <el-input
-          v-model="queryParams.pdModel"
-          placeholder="请输入明细型号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="明细单位" prop="pdUnit">
-        <el-input
-          v-model="queryParams.pdUnit"
-          placeholder="请输入明细单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="明细单价" prop="pdUnitPrice">
-        <el-input
-          v-model="queryParams.pdUnitPrice"
-          placeholder="请输入明细单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="明细数量" prop="pdQuantity">
-        <el-input
-          v-model="queryParams.pdQuantity"
-          placeholder="请输入明细数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="明细金额" prop="pdTotalPrice">
-        <el-input
-          v-model="queryParams.pdTotalPrice"
-          placeholder="请输入明细金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="明细生产日期" prop="pdProdDate">
-        <el-date-picker clearable
-                        v-model="queryParams.pdProdDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择生产日期">
-        </el-date-picker>
-      </el-form-item> -->
-      <!-- <el-form-item label="批号" prop="pdBatchNo">
-        <el-input
-          v-model="queryParams.pdBatchNo"
-          placeholder="请输入批号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="序列号" prop="pdSerialNo">
-        <el-input
-          v-model="queryParams.pdSerialNo"
-          placeholder="请输入序列号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="入库单号" prop="stockinId">
-        <el-input
-          v-model="queryParams.stockinId"
-          placeholder="请输入入库单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
       <el-form-item label="托盘号" prop="trayCode">
         <el-input
@@ -241,105 +37,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="合同号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入合同号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用途" prop="spare4">
-        <el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
-          <el-option
-            v-for="dict in dict.type.purpose_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item> -->
-      <el-form-item label="起始时间" prop="inDateStart">
-        <el-date-picker clearable
-                        v-model="queryParams.inDateStart"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择起始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="截止日期" prop="inDateEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.inDateEnd"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择截止时间">
-        </el-date-picker>
-      </el-form-item>
-      <!-- <el-form-item label="周转类型" prop="voltage">
-        <el-select v-model="queryParams.voltage" placeholder="请选择周转类型" clearable>
-          <el-option
-            v-for="dict in dict.type.turnover_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="来源" prop="spare1">
-        <el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
-          <el-option
-            v-for="dict in dict.type.origin_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="套账" prop="spare3">
-        <el-select v-model="queryParams.spare3" placeholder="请选择套账" clearable>
-          <el-option
-            v-for="dict in dict.type.account_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item> -->
-      <!-- <el-form-item label="形态类型" prop="productType">
-        <el-select v-model="queryParams.productType" placeholder="请选择形态类型" clearable>
-          <el-option
-            v-for="dict in dict.type.product_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="台次" prop="spare5">
-        <el-input
-          v-model="queryParams.spare5"
-          placeholder="请输入台次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="件次" prop="power">
-        <el-input
-          v-model="queryParams.power"
-          placeholder="请输入件次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库外" prop="outside">
-        <el-input
-          v-model="queryParams.outside"
-          placeholder="请输入库外"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
@@ -391,100 +88,13 @@
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="套账" align="center" prop="spare3">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
-        </template>
-      </el-table-column>
       <el-table-column label="库位编码" align="center" prop="cargoSpaceId" width="160"/>
       <el-table-column label="托盘" align="center" prop="trayCode"/>
       <el-table-column label="产品编码" align="center" prop="productId"/>
-      <el-table-column label="产品GUID" align="center" prop="productGuid"/>
-      <el-table-column label="库存批次" align="center" prop="lotNo"/>
       <el-table-column label="产品名称" align="center" prop="productName" width="160" />
-      <el-table-column label="入库主题" align="center" prop="Title" />
+      <el-table-column label="库存数量" align="center" prop="quantity" width="160" />
-      <el-table-column label="入库编号" align="center" prop="Rkbh" />
+      <el-table-column label="入库时间" align="center" prop="inDate" width="160" />
-      <el-table-column label="审批状态" align="center" prop="Status" />
+
-      <el-table-column label="规格" align="center" prop="spec" width="160"/>
-      <el-table-column label="明细产品名" align="center" prop="pdProductName" width="160"/>
-      <!-- <el-table-column label="批号" align="center" prop="pdBatchNo" width="140"/>
-      <el-table-column label="序列号" align="center" prop="pdSerialNo" width="160"/> -->
-      <!-- <el-table-column label="明细型号" align="center" prop="pdModel" width="140"/> -->
-      <el-table-column label="明细单位" align="center" prop="pdUnit" width="100"/>
-      <el-table-column label="明细单价" align="center" prop="pdUnitPrice" width="120"/>
-      <el-table-column label="明细数量" align="center" prop="pdQuantity" width="100"/>
-      <el-table-column label="明细金额" align="center" prop="pdTotalPrice" width="120"/>
-      <el-table-column label="数量" align="center" prop="quantity"/>
-      <el-table-column label="出库数量" align="center" prop="outQuantity"/>
-      <!-- <el-table-column label="单价" align="center" prop="price"/>
-      <el-table-column label="金额" align="center" prop="spare6"/> -->
-      <el-table-column label="产品状态" align="center" prop="productType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="单位名称" align="center" prop="unit"/>
-      <el-table-column label="图号" align="center" prop="cargoNo"/>
-      <el-table-column label="合同号" align="center" prop="orderId"/>
-      <el-table-column label="台次" align="center" prop="spare5"/>
-      <el-table-column label="件次" align="center" prop="power"/>
-      <el-table-column label="质量" align="center" prop="spare8">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="常用编码" align="center" prop="parentId"/>
-      <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
-      <el-table-column label="入库子单ID" align="center" prop="stockinDetailId" width="160"/>
-      <el-table-column label="供应商编码" align="center" prop="supplierId" width="160"/>
-      <el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
-      <el-table-column label="仓库编码" align="center" prop="warehouseId"/>
-      <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
-      <el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
-      <!-- <el-table-column label="生产日期" align="center" prop="pdProdDate" width="140"/>
-      <el-table-column label="有效日期" align="center" prop="pdValidDate" width="140"/>
-      <el-table-column label="到货日期" align="center" prop="pdArrivalDate" width="140"/> -->
-      <el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
-      <!-- <el-table-column label="盘点标识" align="center" prop="spare7">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.check_flag" :value="scope.row.spare7"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="盘点时间" align="center" prop="backDate" width="160"/> -->
-      <el-table-column label="备注" align="center" prop="remark"/>
-      <el-table-column label="入库备注" align="center" prop="Intro"/>
-      <!-- <el-table-column label="明细备注" align="center" prop="pdRemark"/> -->
-      <el-table-column label="装卸工" align="center" prop="pdLoader"/>
-      <el-table-column label="明细ID" align="center" prop="pdDetailId"/>
-      <!-- <el-table-column label="来源" align="center" prop="spare4">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.origin_type" :value="scope.row.spare4"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="用途" align="center" prop="spare1">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.spare1"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="产品型号" align="center" prop="productModel"/> -->
-      <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['stock:management:edit']"
-          >修改 <!-- 修改 --></el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['stock:management:remove']"
-          >删除 <!-- 删除 --></el-button>
-        </template>
-      </el-table-column>
     </el-table>
 
     <pagination
@@ -548,48 +158,7 @@
           <el-input v-model="form.quantity" placeholder="请输入库存数量" />
         </el-form-item>
 
-        <el-form-item label="单位名称" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位名称" />
-        </el-form-item>
 
-        <el-form-item label="产品型号" prop="productModel">
-          <el-input v-model="form.productModel" placeholder="请输入产品型号" />
-        </el-form-item>
-
-        <!-- SQL 新增字段输入（可删减） -->
-        <el-form-item label="入库主题" prop="Title">
-          <el-input v-model="form.Title" placeholder="请输入入库主题" />
-        </el-form-item>
-        <el-form-item label="入库编号" prop="Rkbh">
-          <el-input v-model="form.Rkbh" placeholder="请输入入库编号" />
-        </el-form-item>
-        <el-form-item label="审批状态" prop="Status">
-          <el-input v-model="form.Status" placeholder="请输入审批状态" />
-        </el-form-item>
-        <!-- <el-form-item label="集合数据(Rows)" prop="Rows">
-          <el-input v-model="form.Rows" placeholder="集合数据(JSON)" />
-        </el-form-item> -->
-        <el-form-item label="入库id(Kuin)" prop="Kuin">
-          <el-input v-model="form.Kuin" placeholder="请输入入库id" />
-        </el-form-item>
-        <el-form-item label="申请人" prop="Cateid">
-          <el-input v-model="form.Cateid" placeholder="请输入申请人" />
-        </el-form-item>
-        <el-form-item label="申请日期" prop="Date3">
-          <el-date-picker v-model="form.Date3" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择申请日期" />
-        </el-form-item>
-        <el-form-item label="确认日期" prop="Date5">
-          <el-date-picker v-model="form.Date5" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择确认日期" />
-        </el-form-item>
-        <el-form-item label="审批人" prop="Catein">
-          <el-input v-model="form.Catein" placeholder="请输入审批人" />
-        </el-form-item>
-        <el-form-item label="入库备注(Intro)" prop="Intro">
-          <el-input v-model="form.Intro" placeholder="请输入入库备注" />
-        </el-form-item>
-        <el-form-item label="关联单据(Caigou)" prop="Caigou">
-          <el-input v-model="form.Caigou" placeholder="请输入关联单据id" />
-        </el-form-item>
 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -790,7 +359,9 @@ export default {
         pdProductName: null,
         pdBatchNo: null,
         pdSerialNo: null,
-        cargoSpaceStockStatus:2
+        cargoSpaceStockStatus:2,
+        productId:null,
+        productName:null
       },
       queryWarehouse: {
         pageNum:1,