diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
index 1f707f7..f7a50d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/service/impl/BasProductServiceImpl.java
@@ -74,7 +74,7 @@ public class BasProductServiceImpl implements IBasProductService
 
         BasProduct basProduct1 = basProductMapper.selectBasProductByProductId(basProduct.getProductId());
         if(basProduct1 != null){
-            return 0;
+            throw new RuntimeException("物料编号已存在");
         }
         basProduct.setProductGuid(basProduct.getProductId());
         basProduct.setSpare3(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
@@ -100,8 +100,6 @@ public class BasProductServiceImpl implements IBasProductService
         if (CollUtil.isNotEmpty(basProducts)){
             throw new RuntimeException("物料编号已存在");
         }
-
-
         return basProductMapper.updateBasProduct(basProduct);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/domain/BasRoadway.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/domain/BasRoadway.java
index f716dbc..c917f75 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/domain/BasRoadway.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/domain/BasRoadway.java
@@ -33,21 +33,31 @@ public class BasRoadway extends BaseEntity
     private String deviceId;
 
     /** 一层入库锁 */
-    @Excel(name = "一层入库锁" ,dictType = "roadway_lock")
+    @Excel(name = "北入库锁" ,dictType = "roadway_lock")
     private String inLocked;
 
     /** 一层出库锁 */
-    @Excel(name = "一层出库锁",dictType = "roadway_lock")
+    @Excel(name = "北出库锁",dictType = "roadway_lock")
     private String outLocked;
 
     /** 二层入库锁 */
-    @Excel(name = "二层入库锁",dictType = "roadway_lock")
+    @Excel(name = "南入库锁",dictType = "roadway_lock")
     private String inLocked2;
 
     /** 二层出库锁 */
-    @Excel(name = "二层出库锁",dictType = "roadway_lock")
+    @Excel(name = "南出库锁",dictType = "roadway_lock")
     private String outLocked2;
 
+    private String updateId;
+
+    public String getUpdateId() {
+        return updateId;
+    }
+
+    public void setUpdateId(String updateId) {
+        this.updateId = updateId;
+    }
+
     public void setId(String id)
     {
         this.id = id;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/mapper/BasRoadwayMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/mapper/BasRoadwayMapper.java
index a83399b..75a0e61 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/mapper/BasRoadwayMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/mapper/BasRoadwayMapper.java
@@ -18,6 +18,7 @@ public interface BasRoadwayMapper
      * @return 巷道管理
      */
     public BasRoadway selectBasRoadwayById(String id);
+    public BasRoadway selectBasRoadwayByRoadwayId(String roadwayId);
 
     /**
      * 查询巷道管理列表
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/impl/BasRoadwayServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/impl/BasRoadwayServiceImpl.java
index b4943fc..2b8a3ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/impl/BasRoadwayServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/impl/BasRoadwayServiceImpl.java
@@ -1,6 +1,9 @@
 package com.ruoyi.bas.roadway.service.impl;
 
 import java.util.List;
+import java.util.UUID;
+
+import cn.hutool.core.collection.CollUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.bas.roadway.mapper.BasRoadwayMapper;
@@ -52,6 +55,12 @@ public class BasRoadwayServiceImpl implements IBasRoadwayService
     @Override
     public int insertBasRoadway(BasRoadway basRoadway)
     {
+        BasRoadway basRoadway1 = basRoadwayMapper.selectBasRoadwayByRoadwayId(basRoadway.getRoadwayId());
+        if(basRoadway1 != null){
+            throw new RuntimeException("巷道编号已存在");
+        }
+        basRoadway.setId(UUID.randomUUID().toString());
+        basRoadway.setWarehouseId("01");
         return basRoadwayMapper.insertBasRoadway(basRoadway);
     }
 
@@ -64,6 +73,13 @@ public class BasRoadwayServiceImpl implements IBasRoadwayService
     @Override
     public int updateBasRoadway(BasRoadway basRoadway)
     {
+        BasRoadway basRoadway1 = new BasRoadway();
+        basRoadway1.setUpdateId(basRoadway.getId());
+        basRoadway1.setRoadwayId(basRoadway.getRoadwayId());
+        List<BasRoadway> basRoadways = basRoadwayMapper.selectBasRoadwayList(basRoadway1);
+        if(CollUtil.isNotEmpty(basRoadways)){
+            throw new RuntimeException("巷道编号已存在");
+        }
         return basRoadwayMapper.updateBasRoadway(basRoadway);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java
index 2860e5f..78f9860 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java
@@ -71,6 +71,7 @@ public class BasTraycodeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BasTraycode basTraycode)
     {
+
         return toAjax(basTraycodeService.insertBasTraycode(basTraycode));
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java
index cb76145..68e80a6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java
@@ -61,4 +61,6 @@ public interface BasTraycodeMapper
     public int deleteBasTraycodeByIds(Long[] ids);
 
     void insertBasTraycodeList(List<BasTraycode> list);
+
+    Integer selectBasTrayCodeMax();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java
index 28793c1..eeae6eb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java
@@ -61,4 +61,6 @@ public interface IBasTraycodeService
     public int deleteBasTraycodeById(Long id);
 
     void insertBasTraycodeList(List<BasTraycode> traycodeList);
+
+    Integer selectBasTrayCodeMax();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java
index f737b01..da128f2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java
@@ -55,8 +55,29 @@ public class BasTraycodeServiceImpl implements IBasTraycodeService
     @Override
     public int insertBasTraycode(BasTraycode basTraycode)
     {
-        basTraycode.setCreateTime(DateUtils.getNowDate());
-        return basTraycodeMapper.insertBasTraycode(basTraycode);
+        try {
+            Integer i = basTraycodeMapper.selectBasTrayCodeMax();
+            if (i == null) {
+                i = 0;
+            }
+            int i1 = Integer.parseInt(basTraycode.getSpare1());
+            //如果i<4位数，前面补0
+            String code = "";
+            for (int j = 0; j < i1; j++) {
+                code = String.format("%04d", i + 1 + j);
+                if("9999".equals( code)){
+                    throw new RuntimeException("已生成最大值");
+                }
+                basTraycode.setTrayCode(code);
+                basTraycode.setSpare1(null);
+                basTraycode.setCreateTime(DateUtils.getNowDate());
+                basTraycode.setSpare2("Y");
+                basTraycodeMapper.insertBasTraycode(basTraycode);
+            }
+        } catch (Exception e) {
+           throw new RuntimeException(e);
+        }
+        return 1;
     }
 
     /**
@@ -103,4 +124,9 @@ public class BasTraycodeServiceImpl implements IBasTraycodeService
             basTraycodeMapper.insertBasTraycodeList(list);
         }
     }
+
+    @Override
+    public Integer selectBasTrayCodeMax() {
+        return basTraycodeMapper.selectBasTrayCodeMax();
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
index 052d271..ae20d80 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
@@ -91,6 +91,8 @@ public class OutStockout extends BaseEntity
 
     private String productName;
 
+    private String remark;
+
     private List<String> typeData;
 
     public List<String> getTypeData() {
@@ -299,6 +301,14 @@ public class OutStockout extends BaseEntity
         return erpStockoutId;
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git 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
index 57bd90e..c830613 100644
--- 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
@@ -131,7 +131,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
             outStockout.setCreateManId(username);
             outStockout.setStatus("1");
             outStockout.setStockoutSource("0");
-            outStockout.setWarehouseId("01");
+//            outStockout.setWarehouseId("01");
             for (int i = 0; i < detailList.size(); i++) {
                 OutStockoutDetail outStockoutDetail = detailList.get(i);
                 outStockoutDetail.setStockoutDetailId(stockOutId + "-" + (i + 1));
diff --git 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
index 4cf935e..cd3cf3f 100644
--- 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
@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * @author ruoyi
  * @date 2025-05-20
  */
-public class OutStockoutDetail extends BaseEntity
+public class OutStockoutDetail
 {
     private static final long serialVersionUID = 1L;
 
@@ -171,6 +171,116 @@ public class OutStockoutDetail extends BaseEntity
     @Excel(name = "订单号")
     private String orderId;
 
+    private String createTime;
+    private String remark;
+    private String parentId;
+    private String productPrice;
+    private String productDrawNo;
+    private String productUnit;
+    private String productSpec;
+    private String productStatus;
+    private String createSys;
+    private String isUsed;
+    private String supplierName;
+    private String customerName;
+
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getProductPrice() {
+        return productPrice;
+    }
+
+    public void setProductPrice(String productPrice) {
+        this.productPrice = productPrice;
+    }
+
+    public String getProductDrawNo() {
+        return productDrawNo;
+    }
+
+    public void setProductDrawNo(String productDrawNo) {
+        this.productDrawNo = productDrawNo;
+    }
+
+    public String getProductUnit() {
+        return productUnit;
+    }
+
+    public void setProductUnit(String productUnit) {
+        this.productUnit = productUnit;
+    }
+
+    public String getProductSpec() {
+        return productSpec;
+    }
+
+    public void setProductSpec(String productSpec) {
+        this.productSpec = productSpec;
+    }
+
+    public String getProductStatus() {
+        return productStatus;
+    }
+
+    public void setProductStatus(String productStatus) {
+        this.productStatus = productStatus;
+    }
+
+    public String getCreateSys() {
+        return createSys;
+    }
+
+    public void setCreateSys(String createSys) {
+        this.createSys = createSys;
+    }
+
+    public String getIsUsed() {
+        return isUsed;
+    }
+
+    public void setIsUsed(String isUsed) {
+        this.isUsed = isUsed;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public String getVoltage() {
         return voltage;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java
index bae467f..8dd0960 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java
@@ -54,7 +54,7 @@ public class OutStockoutDetailServiceImpl implements IOutStockoutDetailService
     @Override
     public int insertOutStockoutDetail(OutStockoutDetail outStockoutDetail)
     {
-        outStockoutDetail.setCreateTime(DateUtils.getNowDate());
+//        outStockoutDetail.setCreateTime(DateUtils.getNowDate());
         return outStockoutDetailMapper.insertOutStockoutDetail(outStockoutDetail);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java
index 4084f29..a4970c4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java
@@ -87,6 +87,16 @@ public class OutStockoutFinish extends BaseEntity
 
     private String warehouseName;
 
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public String getCustomerName() {
         return customerName;
     }
diff --git 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
index 593ec2b..c0dfd8a 100644
--- 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,6 +1,5 @@
 package com.ruoyi.out.productAndStock.domain;
 
-import java.math.BigDecimal;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -8,11 +7,11 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 库存物资对象 view_product_and_stock
- *
+ * 
  * @author ruoyi
- * @date 2025-09-12
+ * @date 2025-10-21
  */
-public class ViewProductAndStock extends BaseEntity
+public class ViewProductAndStock
 {
     private static final long serialVersionUID = 1L;
 
@@ -20,86 +19,122 @@ 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 BigDecimal quantity;
+    /** 库存数量 */
+    @Excel(name = "库存数量")
+    private String quantity;
 
     /** 仓库 */
     @Excel(name = "仓库")
     private String warehouseId;
 
-    /** 规格 */
-    @Excel(name = "规格")
+    /** 来源 */
+    @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 spare3;
+    private String unit;
 
-    /** 型号 */
-    @Excel(name = "型号")
-    private String spare4;
 
-    /** 颜色 */
-    @Excel(name = "颜色")
-    private String spare5;
-
-    /** 序列号 */
-    @Excel(name = "序列号")
-    private String spare6;
-    @Excel(name = "是否盘点")
-    private String spare7;
-
-    /** 电压 */
-    @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 getSpare7() {
-        return spare7;
+    public String getSupplierName() {
+        return supplierName;
     }
 
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
+    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)
@@ -107,191 +142,251 @@ public class ViewProductAndStock extends BaseEntity
         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(BigDecimal quantity)
+    public void setQuantity(String quantity) 
     {
         this.quantity = quantity;
     }
 
-    public BigDecimal getQuantity()
+    public String 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)
+    public void setSpare1(String spare1) 
     {
         this.spare1 = spare1;
     }
 
-    public String getSpare1()
+    public String getSpare1() 
     {
         return spare1;
     }
 
-    public void setSpare3(String spare3)
+    public void setSpare3(String spare3) 
     {
         this.spare3 = spare3;
     }
 
-    public String getSpare3()
+    public String getSpare3() 
     {
         return spare3;
     }
 
-    public void setSpare4(String spare4)
+    public void setSpare4(String spare4) 
     {
         this.spare4 = spare4;
     }
 
-    public String getSpare4()
+    public String getSpare4() 
     {
         return spare4;
     }
 
-    public void setSpare5(String spare5)
+    public void setSpare5(String spare5) 
     {
         this.spare5 = spare5;
     }
 
-    public String getSpare5()
+    public String getSpare5() 
     {
         return spare5;
     }
 
-    public void setSpare6(String spare6)
+    public void setSpare6(String spare6) 
     {
         this.spare6 = spare6;
     }
 
-    public String getSpare6()
+    public String getSpare6() 
     {
         return spare6;
     }
 
-    public void setVoltage(String voltage)
+    public void setVoltage(String voltage) 
     {
         this.voltage = voltage;
     }
 
-    public String getVoltage()
+    public String getVoltage() 
     {
         return voltage;
     }
 
-    public void setPower(String power)
+    public void setPower(String power) 
     {
         this.power = power;
     }
 
-    public String getPower()
+    public String getPower() 
     {
         return power;
     }
 
-    public void setPhase(String phase)
+    public void setPhase(String phase) 
     {
         this.phase = phase;
     }
 
-    public String getPhase()
+    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)
+    public void setDistribution(String distribution) 
     {
         this.distribution = distribution;
     }
 
-    public String getDistribution()
+    public String getDistribution() 
     {
         return distribution;
     }
 
-    public void setModel(String model)
-    {
-        this.model = model;
-    }
-
-    public String getModel()
-    {
-        return model;
-    }
-
-    public void setOrderId(String orderId)
+    public void setOrderId(String orderId) 
     {
         this.orderId = orderId;
     }
 
-    public String getOrderId()
+    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)
@@ -309,11 +404,18 @@ public class ViewProductAndStock extends BaseEntity
             .append("voltage", getVoltage())
             .append("power", getPower())
             .append("phase", getPhase())
-            .append("netWeight", getNetWeight())
-            .append("grossWeight", getGrossWeight())
             .append("distribution", getDistribution())
-            .append("model", getModel())
             .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();
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml
index 0ca261a..8ac4909 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml
@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outLocked != null  and outLocked != ''"> and out_locked = #{outLocked}</if>
             <if test="inLocked2 != null  and inLocked2 != ''"> and in_locked2 = #{inLocked2}</if>
             <if test="outLocked2 != null  and outLocked2 != ''"> and out_locked2 = #{outLocked2}</if>
+            <if test="updateId != null  and updateId != ''"> and id != #{updateId}</if>
         </where>
     </select>
     
@@ -39,6 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectBasRoadwayByRoadwayId" parameterType="String" resultMap="BasRoadwayResult">
+        <include refid="selectBasRoadwayVo"/>
+        where roadway_id = #{roadwayId}
+    </select>
+
     <insert id="insertBasRoadway" parameterType="BasRoadway">
         insert into bas_roadway
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -76,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outLocked != null and outLocked != ''">out_locked = #{outLocked},</if>
             <if test="inLocked2 != null and inLocked2 != ''">in_locked2 = #{inLocked2},</if>
             <if test="outLocked2 != null and outLocked2 != ''">out_locked2 = #{outLocked2},</if>
+
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml
index 631bd54..bbf1328 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml
@@ -97,4 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectBasTrayCodeMax" resultType="Integer">
+        select max(cast(tray_code as int)) from bas_traycode
+    </select>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
index 0bf97cb..5887eed 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
@@ -253,10 +253,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
                d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
                d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec, d.supplier_id, d.cargo_no, d.create_time, d.print_date,
+               d.erp_stockout_id, d.unit, d.spec, d.supplier_id, d.cargo_no, d.print_date,
                d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id,
-               p.product_name
-        from out_stockout_detail_finish d left join bas_product p on d.product_id = p.product_id
+               p.product_name,p.parent_id,p.price as product_price,p.cargo_no as product_draw_no,p.unit as product_unit,p.spec as product_spec,
+               p.spare1 as product_status,p.spare3 as create_time,p.spare4 as create_sys,p.spare7 as is_used,
+               s.supplier_name,
+               c.customer_name
+        from out_stockout_detail_finish d
+            left join bas_product p on d.product_id = p.product_id
+            left join bas_supplier s on d.supplier_id = s.supplier_no
+            left join bas_customer c on d.out_id = c.customer_no
         where stockout_guid = #{stockoutGuid}
     </select>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
index 340b108..2d02ed0 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
@@ -45,6 +45,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="distribution"    column="distribution"    />
         <result property="model"    column="model"    />
         <result property="orderId"    column="order_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="productPrice"    column="product_price"    />
+        <result property="productDrawNo"    column="product_draw_no"    />
+        <result property="productUnit"    column="product_unit"    />
+        <result property="productSpec"    column="product_spec"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="createSys"    column="create_sys"    />
+        <result property="isUsed"    column="is_used"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="customerName"    column="customer_name"    />
 
     </resultMap>
 
@@ -140,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">spec,</if>
             <if test="supplierId != null">supplier_id,</if>
             <if test="cargoNo != null">cargo_no,</if>
-            <if test="createTime != null">create_time,</if>
+
             <if test="printDate != null">print_date,</if>
             <if test="voltage != null">voltage,</if>
             <if test="power != null">power,</if>
@@ -182,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spec != null">#{spec},</if>
             <if test="supplierId != null">#{supplierId},</if>
             <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="createTime != null">#{createTime},</if>
+
             <if test="printDate != null">#{printDate},</if>
             <if test="voltage != null">#{voltage},</if>
             <if test="power != null">#{power},</if>
@@ -255,10 +266,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
                d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
                d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec,  d.supplier_id, d.cargo_no, d.create_time, d.print_date,
+               d.erp_stockout_id, d.unit, d.spec,  d.supplier_id, d.cargo_no, d.print_date,
                d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id,
-               p.product_name
-               from out_stockout_detail d left join bas_product p on d.product_id = p.product_id
+               p.product_name,p.parent_id,p.price as product_price,p.cargo_no as product_draw_no,p.unit as product_unit,p.spec as product_spec,
+               p.spare1 as product_status,p.spare3 as create_time,p.spare4 as create_sys,p.spare7 as is_used,
+               s.supplier_name,
+               c.customer_name
+               from out_stockout_detail d
+               left join bas_product p on d.product_id = p.product_id
+               left join bas_supplier s on d.supplier_id = s.supplier_no
+               left join bas_customer c on d.out_id = c.customer_no
         where d.stockout_guid = #{stockoutGuid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
index b66d614..8a874bd 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="finishDate"    column="finish_date"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="customerName"    column="customer_name"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectOutStockoutFinishVo">
-        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id, start_date, finish_date from out_stockout_finish
+        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id, start_date, finish_date,remark from out_stockout_finish
     </sql>
 
     <select id="selectOutStockoutFinishList" parameterType="OutStockoutFinish" resultMap="OutStockoutFinishResult">
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id = #{erpStockoutId}</if>
             <if test="startDate != null  and startDate != ''"> and start_date = #{startDate}</if>
             <if test="finishDate != null  and finishDate != ''"> and finish_date = #{finishDate}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
 
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id,</if>
             <if test="startDate != null">start_date,</if>
             <if test="finishDate != null">finish_date,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
@@ -97,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">#{erpStockoutId},</if>
             <if test="startDate != null">#{startDate},</if>
             <if test="finishDate != null">#{finishDate},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -119,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
             <if test="startDate != null">start_date = #{startDate},</if>
             <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where stockout_guid = #{stockoutGuid}
     </update>
@@ -136,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOutStockoutFinishListByOutStockout" parameterType="OutStockout" resultMap="OutStockoutFinishResult">
         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.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name  from out_stockout_finish o
+        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name,o.reamrk  from out_stockout_finish o
         left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
         left join bas_customer bc on bc.customer_no = o.customer_no
         left join out_stockout_detail_finish d on d.stockout_id = o.stockout_id
@@ -161,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productId != null  and productId != ''"> and d.product_id = #{productId}</if>
             <if test="productName != null  and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="remark != null  and remark != ''"> and o.remark like concat('%', #{remark}, '%')</if>
         </where>
         order by o.create_date desc
     </select>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
index 039f7ef..c73421d 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
@@ -24,15 +24,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="finishDate"    column="finish_date"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="customerName"    column="customer_name"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectOutStockoutVo">
-        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id,start_date,finish_date from out_stockout
+        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id,start_date,finish_date,remark from out_stockout
     </sql>
 
     <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.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name  from out_stockout o
+        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name,o.remark  from out_stockout o
         left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
          left join bas_customer bc on bc.customer_no = o.customer_no
         left join out_stockout_detail d on d.stockout_id = o.stockout_id
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productId != null  and productId != ''"> and d.product_id = #{productId}</if>
             <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="remark != null  and remark != ''"> and o.remark like concat('%', #{remark}, '%')</if>
         </where>
         order by o.create_date desc
     </select>
@@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNumber != null">car_number,</if>
             <if test="FID != null">FID,</if>
             <if test="erpStockoutId != null">erp_stockout_id,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNumber != null">#{carNumber},</if>
             <if test="FID != null">#{FID},</if>
             <if test="erpStockoutId != null">#{erpStockoutId},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -123,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
             <if test="startDate != null">start_date = #{startDate},</if>
             <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where stockout_guid = #{stockoutGuid}
     </update>
@@ -189,7 +194,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         o.start_date,
                         o.finish_date,
                         bw.warehouse_name,
-                        bc.customer_name
+                        bc.customer_name,
+                        o.remark
         from out_stockout o
                  left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
                  left join bas_customer bc on bc.customer_no = o.customer_no
diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
index 2bdace2..08298c2 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper">
-
+    
     <resultMap type="ViewProductAndStock" id="ViewProductAndStockResult">
         <result property="onlyIdentity"    column="only_identity"    />
         <result property="productId"    column="product_id"    />
@@ -16,32 +16,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
-        <result property="spare7"    column="spare7"    />
         <result property="voltage"    column="voltage"    />
         <result property="power"    column="power"    />
         <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
         <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
         <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, net_weight, gross_weight, distribution, model, order_id from view_product_and_stock
-    </sql>
-    <sql id="selectViewProductAndStockPdVo">
-        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, spare1, spare3, spare4, spare5, spare6, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id from view_product_and_stock_pd
+        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
     </sql>
 
     <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
         <include refid="selectViewProductAndStockVo"/>
-        <where>
+        <where>  
             <if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</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 = #{quantity}</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>
@@ -51,45 +55,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="netWeight != null "> and net_weight = #{netWeight}</if>
-            <if test="grossWeight != null "> and gross_weight = #{grossWeight}</if>
-            <if test="distribution != null  and distribution != ''"> and distribution = #{distribution}</if>
-            <if test="model != null  and model != ''"> and model = #{model}</if>
-            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</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>
-
+    
     <select id="selectViewProductAndStockByOnlyIdentity" parameterType="Long" resultMap="ViewProductAndStockResult">
         <include refid="selectViewProductAndStockVo"/>
         where only_identity = #{onlyIdentity}
     </select>
-    <select id="selectViewProductAndStockPdList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
-        <include refid="selectViewProductAndStockPdVo"/>
-        <where>
-            <if test="onlyIdentity != null ">and only_identity = #{onlyIdentity}</if>
-            <if test="productId != null  and productId != ''">and product_id = #{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 = #{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="spare7 != null  and spare7 != ''">and spare7 = #{spare7}</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="netWeight != null ">and net_weight = #{netWeight}</if>
-            <if test="grossWeight != null ">and gross_weight = #{grossWeight}</if>
-            <if test="distribution != null  and distribution != ''">and distribution = #{distribution}</if>
-            <if test="model != null  and model != ''">and model = #{model}</if>
-            <if test="orderId != null  and orderId != ''">and order_id = #{orderId}</if>
-        </where>
-    </select>
 
     <insert id="insertViewProductAndStock" parameterType="ViewProductAndStock">
         insert into view_product_and_stock
@@ -108,11 +92,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="voltage != null">voltage,</if>
             <if test="power != null">power,</if>
             <if test="phase != null">phase,</if>
-            <if test="netWeight != null">net_weight,</if>
-            <if test="grossWeight != null">gross_weight,</if>
             <if test="distribution != null">distribution,</if>
-            <if test="model != null">model,</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>
@@ -129,11 +121,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="voltage != null">#{voltage},</if>
             <if test="power != null">#{power},</if>
             <if test="phase != null">#{phase},</if>
-            <if test="netWeight != null">#{netWeight},</if>
-            <if test="grossWeight != null">#{grossWeight},</if>
             <if test="distribution != null">#{distribution},</if>
-            <if test="model != null">#{model},</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>
 
@@ -153,11 +153,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="voltage != null">voltage = #{voltage},</if>
             <if test="power != null">power = #{power},</if>
             <if test="phase != null">phase = #{phase},</if>
-            <if test="netWeight != null">net_weight = #{netWeight},</if>
-            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
             <if test="distribution != null">distribution = #{distribution},</if>
-            <if test="model != null">model = #{model},</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>
@@ -167,9 +175,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewProductAndStockByOnlyIdentitys" parameterType="String">
-        delete from view_product_and_stock where only_identity in
+        delete from view_product_and_stock where only_identity in 
         <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
             #{onlyIdentity}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/bas/roadway/index.vue b/ruoyi-ui/src/views/bas/roadway/index.vue
index 6c1686e..80ddfdd 100644
--- a/ruoyi-ui/src/views/bas/roadway/index.vue
+++ b/ruoyi-ui/src/views/bas/roadway/index.vue
@@ -33,7 +33,7 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="一层入库锁" prop="inLocked">
+      <el-form-item label="北入库锁" prop="inLocked">
         <el-select v-model="queryParams.inLocked" placeholder="请选择一层入库锁" clearable>
           <el-option
             v-for="dict in dict.type.roadway_lock"
@@ -43,7 +43,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="一层出库锁" prop="outLocked">
+      <el-form-item label="北出库锁" prop="outLocked">
         <el-select v-model="queryParams.outLocked" placeholder="请选择一层出库锁" clearable>
           <el-option
             v-for="dict in dict.type.roadway_lock"
@@ -53,7 +53,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="二层入库锁" prop="inLocked2">
+      <el-form-item label="南入库锁" prop="inLocked2">
         <el-select v-model="queryParams.inLocked2" placeholder="请选择二层入库锁" clearable>
           <el-option
             v-for="dict in dict.type.roadway_lock"
@@ -63,7 +63,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="二层出库锁" prop="outLocked2">
+      <el-form-item label="南出库锁" prop="outLocked2">
         <el-select v-model="queryParams.outLocked2" placeholder="请选择二层出库锁" clearable>
           <el-option
             v-for="dict in dict.type.roadway_lock"
@@ -131,22 +131,22 @@
 <!--      <el-table-column label="仓库id" align="center" prop="warehouseId" />-->
       <el-table-column label="巷道名称" align="center" prop="roadwayName" />
 <!--      <el-table-column label="设备id" align="center" prop="deviceId" />-->
-      <el-table-column label="一层入库锁" align="center" prop="inLocked">
+      <el-table-column label="北入库锁" align="center" prop="inLocked">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.roadway_lock" :value="scope.row.inLocked"/>
         </template>
       </el-table-column>
-      <el-table-column label="一层出库锁" align="center" prop="outLocked">
+      <el-table-column label="北出库锁" align="center" prop="outLocked">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.roadway_lock" :value="scope.row.outLocked"/>
         </template>
       </el-table-column>
-      <el-table-column label="二层入库锁" align="center" prop="inLocked2">
+      <el-table-column label="南入库锁" align="center" prop="inLocked2">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.roadway_lock" :value="scope.row.inLocked2"/>
         </template>
       </el-table-column>
-      <el-table-column label="二层出库锁" align="center" prop="outLocked2">
+      <el-table-column label="南出库锁" align="center" prop="outLocked2">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.roadway_lock" :value="scope.row.outLocked2"/>
         </template>
@@ -183,10 +183,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="巷道号" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道号" />
-        </el-form-item>
-        <el-form-item label="仓库id" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库id" />
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道号" :disabled="form.id != null" />
         </el-form-item>
         <el-form-item label="巷道名称" prop="roadwayName">
           <el-input v-model="form.roadwayName" placeholder="请输入巷道名称" />
@@ -194,8 +191,8 @@
         <el-form-item label="设备id" prop="deviceId">
           <el-input v-model="form.deviceId" placeholder="请输入设备id" />
         </el-form-item>
-        <el-form-item label="一层入库锁" prop="inLocked">
-          <el-select v-model="form.inLocked" placeholder="请选择一层入库锁">
+        <el-form-item label="北入库锁" prop="inLocked">
+          <el-select v-model="form.inLocked" placeholder="请选择北入库锁">
             <el-option
               v-for="dict in dict.type.roadway_lock"
               :key="dict.value"
@@ -204,8 +201,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="一层出库锁" prop="outLocked">
-          <el-select v-model="form.outLocked" placeholder="请选择一层出库锁">
+        <el-form-item label="北出库锁" prop="outLocked">
+          <el-select v-model="form.outLocked" placeholder="请选择北出库锁">
             <el-option
               v-for="dict in dict.type.roadway_lock"
               :key="dict.value"
@@ -214,8 +211,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二层入库锁" prop="inLocked2">
-          <el-select v-model="form.inLocked2" placeholder="请选择二层入库锁">
+        <el-form-item label="南入库锁" prop="inLocked2">
+          <el-select v-model="form.inLocked2" placeholder="请选择南入库锁">
             <el-option
               v-for="dict in dict.type.roadway_lock"
               :key="dict.value"
@@ -224,8 +221,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二层出库锁" prop="outLocked2">
-          <el-select v-model="form.outLocked2" placeholder="请选择二层出库锁">
+        <el-form-item label="南出库锁" prop="outLocked2">
+          <el-select v-model="form.outLocked2" placeholder="请选择南出库锁">
             <el-option
               v-for="dict in dict.type.roadway_lock"
               :key="dict.value"
@@ -286,26 +283,26 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
+        // id: [
+        //   { required: true, message: "id不能为空", trigger: "blur" }
+        // ],
         roadwayId: [
           { required: true, message: "巷道号不能为空", trigger: "blur" }
         ],
-        warehouseId: [
-          { required: true, message: "仓库id不能为空", trigger: "blur" }
-        ],
+        // warehouseId: [
+        //   { required: true, message: "仓库id不能为空", trigger: "blur" }
+        // ],
         inLocked: [
-          { required: true, message: "一层入库锁不能为空", trigger: "change" }
+          { required: true, message: "北入库锁不能为空", trigger: "change" }
         ],
         outLocked: [
-          { required: true, message: "一层出库锁不能为空", trigger: "change" }
+          { required: true, message: "北出库锁不能为空", trigger: "change" }
         ],
         inLocked2: [
-          { required: true, message: "二层入库锁不能为空", trigger: "change" }
+          { required: true, message: "南入库锁不能为空", trigger: "change" }
         ],
         outLocked2: [
-          { required: true, message: "二层出库锁不能为空", trigger: "change" }
+          { required: true, message: "南出库锁不能为空", trigger: "change" }
         ]
       }
     }
@@ -356,6 +353,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.roadwayIds = selection.map(item => item.roadwayId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -398,7 +396,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除巷道管理编号为"' + ids + '"的数据项？').then(function() {
+      const roadwayIds= row.roadwayId || this.roadwayIds
+      this.$modal.confirm('是否确认删除巷道管理编号为"' + roadwayIds + '"的数据项？').then(function() {
         return delRoadway(ids)
       }).then(() => {
         this.getList()
diff --git a/ruoyi-ui/src/views/bas/traycode/index.vue b/ruoyi-ui/src/views/bas/traycode/index.vue
index 1e5973c..b5bde5d 100644
--- a/ruoyi-ui/src/views/bas/traycode/index.vue
+++ b/ruoyi-ui/src/views/bas/traycode/index.vue
@@ -25,6 +25,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="是否可用" prop="spare2">
+        <el-select v-model="queryParams.spare2" placeholder="请选择">
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -91,12 +101,16 @@
 
     <el-table ref="table" v-loading="loading" :data="traycodeList" @selection-change="handleSelectionChange" max-height="700">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="left" prop="id" width="120" />
+<!--      <el-table-column label="序号" align="center" prop="id" />-->
 <!--      <el-table-column label="格式ID" align="left" prop="formatName"  />-->
-      <el-table-column label="条码" align="left" prop="trayCode"  />
-      <el-table-column label="Spare Field 1" align="center" prop="spare1" />
-      <el-table-column label="Spare Field 2" align="center" prop="spare2" />
-      <el-table-column label="Spare Field 3" align="center" prop="spare3" />
+      <el-table-column label="条码" align="center" prop="trayCode"  />
+<!--      <el-table-column label="Spare Field 1" align="center" prop="spare1" />-->
+      <el-table-column label="是否可用" align="center" prop="spare2" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare2"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="Spare Field 3" align="center" prop="spare3" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
@@ -146,19 +160,24 @@
             />
           </el-select>
         </el-form-item>-->
-        <el-form-item label="托盘编码" prop="trayCode">
 
-          <el-input v-model="form.trayCode" placeholder="请输入托盘编码" />
+         <el-form-item label="数量" prop="spare1" v-if="form.id == null">
+          <el-input v-model="form.spare1" placeholder="请输入数量" />
         </el-form-item>
-         <el-form-item label="Spare Field 1" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="Enter spare field 1" />
+        <el-form-item label="托盘编码" prop="trayCode" v-if="form.id != null" >
+
+          <el-input v-model="form.trayCode" placeholder="请输入托盘编码" disabled/>
         </el-form-item>
-        <el-form-item label="Spare Field 2" prop="spare2">
-          <el-input v-model="form.spare2" placeholder="Enter spare field 2" />
+        <el-form-item label="是否可用" prop="spare2" v-if="form.id != null">
+          <el-select v-model="form.spare2" placeholder="请选择" >
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="Spare Field 3" prop="spare3">
-          <el-input v-model="form.spare3" placeholder="Enter spare field 3" />
-        </el-form-item> 
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确定</el-button>
@@ -188,6 +207,7 @@ import VueQr from 'vue-qr'
 
 export default {
   name: "Traycode",
+  dicts:['sys_yes_no'],
   components: {
     vueEasyPrint,
     VueQr
@@ -353,10 +373,23 @@ export default {
     },
     /** 打印条码 */
     printBarcode: function (row) {
+      const yesValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '是') || this.dict.type.sys_yes_no.find(i => i.value === 'Y' || i.value === '1')) : null
+      const yesVal = yesValItem ? yesValItem.value : 'Y'
+      if (row.spare2 !== yesVal) {
+        this.$modal.msgError("该托盘不可打印：仅“是”可用")
+        return;
+      }
       this.printData = [row]
       this.$nextTick(() => {
         setTimeout(() => {
           this.$refs.easyPrint2.print()
+          const noValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '否') || this.dict.type.sys_yes_no.find(i => i.value === 'N' || i.value === '0')) : null
+          const noVal = noValItem ? noValItem.value : 'N'
+          const data = Object.assign({}, row, { spare2: noVal })
+          updateTraycode(data).then(() => {
+            this.$modal.msgSuccess("打印完成，已标记为不可用")
+            this.getList()
+          }).catch(() => {})
         }, 100)
       })
     },
@@ -367,10 +400,27 @@ export default {
         this.$modal.msgError("请选择要打印的数据项");
         return;
       }
+      const yesValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '是') || this.dict.type.sys_yes_no.find(i => i.value === 'Y' || i.value === '1')) : null
+      const yesVal = yesValItem ? yesValItem.value : 'Y'
+      const invalid = selection.filter(item => item.spare2 !== yesVal)
+      if (invalid.length > 0) {
+        this.$modal.msgError("存在不可打印项（非“是”），请重新选择")
+        return;
+      }
       this.printData = selection;
       this.$nextTick(() => {
         setTimeout(() => {
           this.$refs.easyPrint2.print()
+          const noValItem = (this.dict && this.dict.type && this.dict.type.sys_yes_no) ? (this.dict.type.sys_yes_no.find(i => i.label === '否') || this.dict.type.sys_yes_no.find(i => i.value === 'N' || i.value === '0')) : null
+          const noVal = noValItem ? noValItem.value : 'N'
+          const updates = selection.map(item => {
+            const data = Object.assign({}, item, { spare2: noVal })
+            return updateTraycode(data)
+          })
+          Promise.all(updates).then(() => {
+            this.$modal.msgSuccess("批量打印完成，已标记为不可用")
+            this.getList()
+          }).catch(() => {})
         }, 100)
       });
     },
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index 34d7f01..1eef7fd 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.vue
@@ -22,13 +22,11 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="'客户'" prop="customerNo" required><!--客户-->
+      <el-form-item :label="'备注'" prop="remark"><!--客户-->
         <el-input
-          v-model="formData.customerName"
-          :placeholder="'请输入客户编号'"
+          v-model="formData.remark"
+          :placeholder="'请输入备注'"
           clearable
-          @click.native="openCustomerSelector"
-          readonly
         />
       </el-form-item>
 
@@ -47,26 +45,76 @@
     <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="orderId" />
-      <el-table-column label="序列号" align="center" prop="printDate" />
-<!--      <el-table-column :label="$t('addOutStockout.batchNo')" align="left" prop="lotNo" />&lt;!&ndash;批号&ndash;&gt;-->
+      <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" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="型号" align="center" prop="cargoNo" />
-      <el-table-column label="颜色" align="center" prop="price" />
-      <el-table-column label="电压" align="center" prop="voltage" />
-      <el-table-column label="功率" align="center" prop="power" />
-      <el-table-column label="相位" align="center" prop="phase" />
-      <el-table-column label="净重" align="center" prop="netWeight" />
-      <el-table-column label="毛重" align="center" prop="grossWeight" />
-      <el-table-column label="分销" align="center" prop="distribution" />
-      <el-table-column label="机型" align="center" prop="model" />
+      <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">
@@ -95,32 +143,55 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-<!--        <el-form-item label="规格" prop="spare1">
-          <el-input v-model="queryParams.spare1" placeholder="请输入规格"
-                    clearable
-                    @keyup.enter.native="handleQuery"/>
+        <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="spare3">
-          <el-input v-model="queryParams.spare3" placeholder="请输入单位"
-                    clearable
-                    @keyup.enter.native="handleQuery"/>
+        <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="spare4">
-          <el-input v-model="queryParams.spare4" placeholder="请输入型号"
-                    clearable
-                    @keyup.enter.native="handleQuery"/>
+        <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="spare6">
-          <el-input v-model="queryParams.spare6" 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 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>
@@ -131,24 +202,64 @@
       <el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" prop="onlyIdentity" />
-        <el-table-column label="订单号" align="center" prop="orderId" />
         <el-table-column label="物料编码" align="center" prop="productId" />
-        <el-table-column label="批次号" align="center" prop="lotNo" />
+        <el-table-column label="批次" align="center" prop="lotNo" />
         <el-table-column label="物料名称" align="center" prop="productName" />
-        <el-table-column label="数量" align="center" prop="quantity" />
-<!--        <el-table-column label="仓库" align="center" prop="warehouseId" />-->
-        <el-table-column label="规格" align="center" prop="spare1" />
-        <el-table-column label="单位" align="center" prop="spare3" />
-        <el-table-column label="型号" align="center" prop="spare4" />
-        <el-table-column label="颜色" align="center" prop="spare5" />
-        <el-table-column label="序列号" align="center" prop="spare6" />
-        <el-table-column label="电压" align="center" prop="voltage" />
-        <el-table-column label="功率" align="center" prop="power" />
-        <el-table-column label="相位" align="center" prop="phase" />
-        <el-table-column label="净重" align="center" prop="netWeight" />
-        <el-table-column label="毛重" align="center" prop="grossWeight" />
-        <el-table-column label="分销" align="center" prop="distribution" />
-        <el-table-column label="机型" align="center" prop="model" />
+        <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
@@ -214,6 +325,55 @@
         <el-button @click="cancelSelectCustomer">取消<!--取 消--></el-button>
       </div>
     </el-dialog>
+
+    <!-- 选择供应商弹窗 -->
+    <el-dialog :title="'选择供应商'" :visible.sync="supplierDialog" width="800px" append-to-body>
+      <el-form :model="supplierQueryParams" ref="supplierQueryForm" size="small" :inline="true" label-width="100px">
+        <el-form-item :label="'供应商编号'" prop="supplierNo">
+          <el-input
+            v-model="supplierQueryParams.supplierNo"
+            :placeholder="'请输入供应商编号'"
+            clearable
+            @keyup.enter.native="handleSupplierQuery"
+          />
+        </el-form-item>
+        <el-form-item :label="'供应商名称'" prop="supplierName">
+          <el-input
+            v-model="supplierQueryParams.supplierName"
+            :placeholder="'请输入供应商名称'"
+            clearable
+            @keyup.enter.native="handleSupplierQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSupplierQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetSupplierQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table ref="supplierTable" v-loading="supplierLoading" :data="supplierList" @row-click="handleSupplierRowClick" highlight-current-row>
+        <el-table-column :label="'供应商编号'" align="left" prop="supplierNo" />
+        <el-table-column :label="'供应商名称'" align="left" prop="supplierName" />
+        <el-table-column :label="'是否可用'" align="left" prop="useable">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="supplierTotal > 0"
+        :total="supplierTotal"
+        :page.sync="supplierQueryParams.pageNum"
+        :limit.sync="supplierQueryParams.pageSize"
+        @pagination="getSupplierListForDialog"
+      />
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelectSupplier">确定</el-button>
+        <el-button @click="cancelSelectSupplier">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -222,10 +382,11 @@ import { listProductAndStock,saveOutStock } from "@/api/out/outStockout";
 import {listWarehouse} from "@/api/bas/warehouse";
 import { listBasCustomer } from "@/api/bas/BasCustomer";
 import Pagination from "@/components/Pagination";
+import { listBasSupplier } from "@/api/bas/BasSupplier";
 
 export default {
   name: "AddOutStock",
-  dicts: ['out_bill_type', 'bill_status', 'is_available'],
+  dicts: ['out_bill_type', 'bill_status', 'is_available', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no','account_type','origin_type','purpose_type','warehouse'],
   components: {
     Pagination
   },
@@ -243,9 +404,9 @@ export default {
         // warehouseId: [
         //   { required: true, message: '请选择仓库', trigger: "change" }
         // ],
-        customerNo: [
-          { required: true, message: '请输入客户编号', trigger: "blur" }
-        ],
+        // customerNo: [
+        //   { required: true, message: '请输入客户编号', trigger: "blur" }
+        // ],
         outType: [
           { required: true, message: '请选择单据类型', trigger: "change" }
         ]
@@ -255,7 +416,8 @@ export default {
         // warehouseId: null,
         customerNo: null,
         customerName: null, // 添加客户名称字段，用于显示
-        outType: null
+        outType: null,
+        remark:null
       },
       // 仓库选项
       warehouseOptions: [],
@@ -297,6 +459,8 @@ export default {
       customerList: [],
       // 当前选中的客户
       selectedCustomer: null,
+      // 当前正在编辑客户的物资行
+      selectedRowForCustomer: null,
       // 客户查询参数
       customerQueryParams: {
         pageNum: 1,
@@ -304,6 +468,23 @@ export default {
         customerNo: null,
         customerName: null,
         useable: '1' // 默认只查询可用的客户
+      },
+      // 供应商选择弹窗
+      supplierDialog: false,
+      // 供应商列表数据
+      supplierList: [],
+      // 当前选中的供应商
+      selectedSupplier: null,
+      // 供应商加载状态与总数
+      supplierLoading: false,
+      supplierTotal: 0,
+      // 供应商查询参数
+      supplierQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        supplierNo: null,
+        supplierName: null,
+        useable: '1' // 默认只查询可用的供应商
       }
     };
   },
@@ -321,8 +502,15 @@ export default {
         this.warehouseOptions = response.rows;
       });
     },
-    /** 打开客户选择弹窗 */
+    /** 打开客户选择弹窗（全局） */
     openCustomerSelector() {
+      this.selectedRowForCustomer = null;
+      this.customerDialog = true;
+      this.getCustomerList();
+    },
+    /** 打开客户选择弹窗（行级） */
+    openRowCustomerSelector(row) {
+      this.selectedRowForCustomer = row;
       this.customerDialog = true;
       this.getCustomerList();
     },
@@ -357,15 +545,69 @@ export default {
         this.$modal.msgError('请选择客户');
         return;
       }
-      this.formData.customerNo = this.selectedCustomer.customerNo;
-      this.formData.customerName = this.selectedCustomer.customerName;
+      // 如果是行级编辑，赋值到该行；否则赋值到主表
+      if (this.selectedRowForCustomer) {
+        this.$set(this.selectedRowForCustomer, 'outId', this.selectedCustomer.customerNo);
+        this.$set(this.selectedRowForCustomer, 'customerName', this.selectedCustomer.customerName);
+      } else {
+        this.formData.customerNo = this.selectedCustomer.customerNo;
+        this.formData.customerName = this.selectedCustomer.customerName;
+      }
       this.customerDialog = false;
+      this.selectedCustomer = null;
+      this.selectedRowForCustomer = null;
     },
     /** 取消选择客户 */
     cancelSelectCustomer() {
       this.selectedCustomer = null;
+      this.selectedRowForCustomer = null;
       this.customerDialog = false;
     },
+    /** 打开供应商选择弹窗 */
+    openSupplierSelector() {
+      this.getSupplierListForDialog();
+      this.supplierDialog = true;
+    },
+    /** 获取供应商列表（对话框数据） */
+    getSupplierListForDialog() {
+      this.supplierLoading = true;
+      listBasSupplier(this.supplierQueryParams).then(response => {
+        this.supplierList = response.rows;
+        this.supplierTotal = response.total;
+        this.supplierLoading = false;
+      });
+    },
+    /** 供应商查询 */
+    handleSupplierQuery() {
+      this.supplierQueryParams.pageNum = 1;
+      this.getSupplierListForDialog();
+    },
+    /** 重置供应商查询 */
+    resetSupplierQuery() {
+      this.resetForm("supplierQueryForm");
+      this.supplierQueryParams.useable = '1';
+      this.handleSupplierQuery();
+    },
+    /** 供应商行点击事件 */
+    handleSupplierRowClick(row) {
+      this.selectedSupplier = row;
+      this.$refs['supplierTable']?.setCurrentRow(row);
+    },
+    /** 确认选择供应商 */
+    confirmSelectSupplier() {
+      if (!this.selectedSupplier) {
+        this.$modal.msgError('请选择供应商');
+        return;
+      }
+      this.queryParams.supplierName = this.selectedSupplier.supplierName;
+      this.queryParams.phase = this.selectedSupplier.supplierNo;
+      this.supplierDialog = false;
+    },
+    /** 取消选择供应商 */
+    cancelSelectSupplier() {
+      this.selectedSupplier = null;
+      this.supplierDialog = false;
+    },
     /** 打开选择物资弹窗 */
     handleSelectMaterials() {
       // if (!this.formData.warehouseId) {
@@ -411,22 +653,32 @@ export default {
           productName: item.productName,
           quantity: item.quantity,
           quantityOrignal: item.quantity,
-          voltage: item.voltage,
-          phase: item.phase,
-          power: item.power,
-          netWeight: item.netWeight,
-          grossWeight: item.grossWeight,
-          distribution: item.distribution,
-          model: item.model,
-          orderId: item.orderId,
-          unit: item.spare3,
-          spec: item.spare1,
-          cargoNo: item.spare4,
-          printDate:item.spare6,
-          price:item.spare5,
+          spec: item.voltage,
+          supplierId: item.phase,
+          supplierName: item.supplierName,
+          phase: item.power,
+          fid: item.distribution,
+          cargoNo: item.orderId,
+          entryid: item.spare3,
+          unit: item.spare1,
+          model: item.spare4,
+          price:item.spare6,
+          power:item.spare5,
           warehouseId: item.warehouseId,
           lotNo: item.lotNo,
-          onlyIdentity: item.onlyIdentity
+          voltage:item.spare8,
+          onlyIdentity: item.onlyIdentity,
+          productPrice:item.price,
+          productSpec:item.spec,
+          productUnit:item.unit,
+          productDrawNo:item.cargoNo,
+          productStatus:item.productStatus,
+          parentId: item.parentId,
+          isUsed:item.spare7,
+          createTime: item.createTime,
+          createSys:item.createSys
+
+
         }))
       );
       this.materialDialog = false;
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index dd1c77e..c8b2b90 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -146,10 +146,11 @@
           <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" /><!-- 客户编码 -->
-      <el-table-column :label="'客户名称'" align="left" prop="customerName" />
+<!--      <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="left" prop="customerName" />-->
       <el-table-column :label="'建单人'" align="left" prop="createManId" /> <!-- 建单人 -->
+      <el-table-column :label="'备注'" align="center" prop="remark" /> <!-- 备注 -->
       <el-table-column :label="'创建时间'" align="left" prop="createDate" /><!-- 创建时间 -->
       <el-table-column :label="'开始时间'" align="left" prop="startDate" /><!-- 开始时间 -->
       <el-table-column :label="'确认时间'" align="left" prop="finishDate" /> <!-- 确认时间 -->
@@ -170,24 +171,65 @@
       <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="printDate" /> <!--序列号-->
-      <el-table-column label="订单号" align="center" prop="orderId"  width="160" />
+      <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="spec" /> <!--规格-->
-      <el-table-column :label="'型号'" align="center"  prop="cargoNo" /> <!--型号-->
-      <el-table-column label="电压" align="center" prop="voltage" />
-      <el-table-column label="功率" align="center" prop="power" />
-      <el-table-column label="相位" align="center" prop="phase" />
-      <el-table-column label="净重" align="center" prop="netWeight" />
-      <el-table-column label="毛重" align="center" prop="grossWeight" />
-      <el-table-column label="分销" align="center" prop="distribution" />
-      <el-table-column label="机型" align="center" prop="model" />
-      <el-table-column :label="'备注'" align="center" prop="remark" /> <!-- 备注 -->
+      <el-table-column :label="'入库单价'" align="center" prop="price"/><!--箱号-->
+      <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="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>
 
 <!--    <pagination-->
@@ -317,7 +359,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "OutStockWithDetail",
-  dicts: ['out_bill_type', 'out_bill_status'],
+  dicts: ['out_bill_type', 'out_bill_status', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no','account_type','origin_type','purpose_type','warehouse'],
   data() {
     return {
       // 遮罩层
@@ -360,8 +402,8 @@ export default {
       },
       // 出口选项
       exitOptions: [
-        { exitId: '1', exitName: '一楼'},
-        { exitId: '2', exitName: '二楼'},
+        { exitId: '1', exitName: '北端'},
+        { exitId: '2', exitName: '南端'},
 
       ],
 
@@ -562,7 +604,7 @@ export default {
       const stockoutIds = this.selectedRows.map(row => row.stockoutId)
       let outstock = this.selectedRows[0]
       if (outstock.status != "2" && outstock.status != "3") {
-        this.$modal.msgError('请先审核出库单')
+        this.$modal.msgError('单据未审核！')
          return
       }
       let data = {