查询统计修改

ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java

@@ -24,16 +24,16 @@ public class BasCargoSpace extends BaseEntity {
     /** 货位id     主键  */
     @TableId
     /** 货位编码 */
-    @Excel(name = "${bas.CargoSpace.cargoSpaceId}")
+    @Excel(name = "货位编码")
     private String cargoSpaceId;
 
     private String warehouseId;
     /** 仓库名称（不允许为空） */
-    @Excel(name = "${bas.CargoSpace.warehouseId}")
+//    @Excel(name = "${bas.CargoSpace.warehouseId}")
     private String warehouseName;
 
     /** 巷道id（允许为空） */
-//    @Excel(name = "${bas.CargoSpace.roadwayId}")
+    @Excel(name = "巷道id")
     private String roadwayId;
 
     /** 货区id（允许为空） */
@@ -49,36 +49,36 @@ public class BasCargoSpace extends BaseEntity {
     private String theTypeName;
 
     /** 货位名称（不允许为空） */
-    @Excel(name = "${bas.CargoSpace.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 排（不允许为空） */
-    @Excel(name = "${bas.CargoSpace.thePlatoon}")
+    @Excel(name = "排")
     private Long thePlatoon;
 
     /** 列（不允许为空） */
-    @Excel(name = "${bas.CargoSpace.theColumn}")
+    @Excel(name = "列")
     private Long theColumn;
 
     /** 层（不允许为空） */
-    @Excel(name = "${bas.CargoSpace.theFloor}")
+    @Excel(name = "层")
     private Long theFloor;
 
     /** 货位状态1空2满 */
-    @Excel(name = "${bas.CargoSpace.status}",dictType = "cargo_space_status")
+    @Excel(name = "货位状态",dictType = "cargo_space_status")
     private String status;
 
     /** 是否锁定（不允许为空）
 Y锁、N开 */
-    @Excel(name = "${bas.CargoSpace.locked}",dictType = "cargo_space_lock_status")
+    @Excel(name = "是否锁定",dictType = "cargo_space_lock_status")
     private String locked;
 
     /** 托盘条码（允许为空） */
-    @Excel(name = "${bas.CargoSpace.trayCode}")
+    @Excel(name = "托盘条码")
     private String trayCode;
 
     /** 货位高度 */
-    @Excel(name = "${bas.CargoSpace.cargoHight}")
+//    @Excel(name = "${bas.CargoSpace.cargoHight}")
     private String cargoHight;
 
     /** 是否双伸 Y N  */

ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java

@@ -11,6 +11,8 @@ import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
 import com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper;
 import com.ruoyi.kpi.service.KpiService;
+import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.mapper.BasStockMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +33,9 @@ public class KpiServiceImpl implements KpiService
 
     @Autowired
     private BasCargoSpaceMapper basCargoSpaceMapper;
+    
+    @Autowired
+    private BasStockMapper basStockMapper;
     /**
      * 获取入库均匀分析数据
      *
@@ -433,16 +438,23 @@ public class KpiServiceImpl implements KpiService
             StringBuilder info = new StringBuilder();
 
             // 拼接货位信息
-            info.append(MessageUtils.message("kpi.spacePlan.CargoSpaceName")).append(space.getCargoSpaceName()).append("<br>");
+            info.append("货位名称：").append(space.getCargoSpaceName()).append("<br>");
-            info.append(MessageUtils.message("kpi.spacePlan.TheTypeName")).append(space.getTheTypeName()).append("<br>");
+            info.append("是否锁定：").append("Y".equals(space.getLocked()) ? "是" : "否").append("<br>");
-            info.append(MessageUtils.message("kpi.spacePlan.Locked")).append("Y".equals(space.getLocked()) ? MessageUtils.message("kpi.spacePlan.Y") : MessageUtils.message("kpi.spacePlan.N")).append("<br>");
+            info.append("托盘条码：").append(space.getTrayCode() != null ? space.getTrayCode() : "无").append("<br>");
-            info.append(MessageUtils.message("kpi.spacePlan.TrayCode")).append(space.getTrayCode() != null ? space.getTrayCode() : MessageUtils.message("kpi.spacePlan.W")).append("<br>");
+            
-            info.append(MessageUtils.message("kpi.spacePlan.CargoHight")).append(space.getCargoHight() != null ? space.getCargoHight() : MessageUtils.message("kpi.spacePlan.W")).append("<br>");
+            // 根据cargoSpaceId查询BasStock表，获取productId和productName
-            info.append(MessageUtils.message("kpi.spacePlan.IssDouble")).append("Y".equals(space.getIssDouble()) ? MessageUtils.message("kpi.spacePlan.Y") : MessageUtils.message("kpi.spacePlan.N")).append("<br>");
+            BasStock stockQuery = new BasStock();
+            stockQuery.setCargoSpaceId(space.getCargoSpaceId());
+            List<BasStock> stockList = basStockMapper.selectBasStockList(stockQuery);
+            if (!stockList.isEmpty()) {
+                BasStock stock = stockList.get(0);
+                info.append("物料编码：").append(stock.getProductId() != null ? stock.getProductId() : "无").append("<br>");
+                info.append("物料名称：").append(stock.getProductName() != null ? stock.getProductName() : "无").append("<br>");
+            }
 
             response.put("msg", info.toString());
         } else {
-            response.put("msg", MessageUtils.message("kpi.spacePlan.msg"));
+            response.put("msg", "未找到货位信息");
         }
 
         return response;
@@ -453,20 +465,13 @@ public class KpiServiceImpl implements KpiService
         Map<String,Object> res = new HashMap<>();
         MydoJob mydoJobParam = new MydoJob();
         mydoJobParam.setWarehouseId(warehouseId);
+        // 直接查询创建时间是否在startTime与endTime之间
         mydoJobParam.setCreateLeftTime(startTime);
         mydoJobParam.setCreateRightTime(endTime);
         mydoJobParam.setInOut(inOut);
-        List<DateTime> datesBetween = DateUtil.rangeToList(DateUtil.parseDate(mydoJobParam.getCreateLeftTime()), DateUtil.parseDate(mydoJobParam.getCreateRightTime()), DateField.DAY_OF_MONTH);
+        List<DateTime> datesBetween = DateUtil.rangeToList(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), DateField.DAY_OF_MONTH);
         List<MydoJob> list = mydoJobFinishMapper.selectMydoJobFinishListByMydoJob(mydoJobParam);
         
-        // 根据inOut过滤数据
-        list = list.stream()
-            .filter(job -> {
-                int inOrOut = Integer.parseInt(job.getInOrOut());
-                return "1".equals(mydoJobParam.getInOut()) ? inOrOut < 20 : inOrOut >= 20;
-            })
-            .collect(Collectors.toList());
-        
         // 获取所有巷道ID（1和2）
         List<String> roadwayIds = Arrays.asList("1", "2");
         

ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java

@@ -25,6 +25,8 @@ public class StockSummary extends BaseEntity
 //    @Excel(name = "序号")
     private Long onlyIdentity;
 
+    @Excel(name = "订单号")
+    private String orderId;
     /** 物料编码 */
     @Excel(name = "物料编码")
     private String productId;
@@ -38,7 +40,7 @@ public class StockSummary extends BaseEntity
     private String spec;
 
     /** 单位 */
-    @Excel(name = "单位")
+//    @Excel(name = "单位")
     private String unit;
 
     /** 批号 */
@@ -47,7 +49,7 @@ public class StockSummary extends BaseEntity
 
     /** 仓库 */
     private String warehouseId;
-    @Excel(name = "仓库")
+//    @Excel(name = "仓库")
     private String warehouseName;
 
     @Excel(name = "货位")
@@ -63,7 +65,7 @@ public class StockSummary extends BaseEntity
 
 
     /** 价格 */
-    @Excel(name = "价格")
+//    @Excel(name = "价格")
     private String price;
 
     /** 产品分类 */
@@ -237,9 +239,12 @@ public class StockSummary extends BaseEntity
 
 
 
+
+
     /** 分组字段控制 */
     private Boolean groupByProductId;
     private Boolean groupByProductName;
+    private Boolean groupByOrderId;
     private Boolean groupBySpec;
     private Boolean groupByUnit;
     private Boolean groupByLotNo;

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java

@@ -2,6 +2,10 @@ package com.ruoyi.search.ViewStockDetail.domain;
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 /**
  * 库存明细查询对象 view_stock_detail
@@ -9,28 +13,47 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author gw
  * @date 2025-05-26
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
 public class ViewStockDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 序号 */
-    @Excel(name = "序号")
+//    @Excel(name = "序号")
     private Long onlyIdentity;
 
     /** 库存ID */
     @Excel(name = "库存ID")
     private String stockId;
 
+    @Excel(name = "订单号")
+    private String orderId;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String productName;
+
     /** 货位ID */
-    @Excel(name = "货位ID")
+//    @Excel(name = "货位ID")
     private String cargoSpaceId;
 
+    /** 货位名称 */
+    @Excel(name = "货位名称")
+    private String cargoSpaceName;
+
     /** 托盘条码 */
     @Excel(name = "托盘条码")
     private String trayCode;
 
     /** 数量 */
-    @Excel(name = "数量")
+//    @Excel(name = "数量")
     private String quantity;
 
     /** 作业ID */
@@ -38,7 +61,7 @@ public class ViewStockDetail extends BaseEntity
     private String jobId;
 
     /** 批号 */
-    @Excel(name = "批号")
+//    @Excel(name = "批号")
     private String lotNo;
 
     /** 入库子单ID */
@@ -50,21 +73,17 @@ public class ViewStockDetail extends BaseEntity
     private String inDate;
 
     /** 仓库ID */
-    @Excel(name = "仓库ID")
+//    @Excel(name = "仓库ID")
     private String warehouseId;
 
     /** 仓库名称 */
-    @Excel(name = "仓库名称")
+//    @Excel(name = "仓库名称")
     private String warehouseName;
 
     /** 垛型ID */
-    @Excel(name = "垛型ID")
+//    @Excel(name = "垛型ID")
     private String stackingId;
 
-    /** 货位名称 */
-    @Excel(name = "货位名称")
-    private String cargoSpaceName;
-
     /** 巷道ID */
     @Excel(name = "巷道ID")
     private String roadwayId;
@@ -82,21 +101,13 @@ public class ViewStockDetail extends BaseEntity
     private String productStatus;
 
     /** 是否锁定 Y锁、N开 */
-    @Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
+//    @Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
     private String locked;
 
     /** 物料GUID */
     @Excel(name = "物料GUID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
-    private String productId;
-
-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String productName;
-
     /** 规格 */
     @Excel(name = "规格")
     private String spec;
@@ -277,719 +288,4 @@ public class ViewStockDetail extends BaseEntity
     @Excel(name = "描述")
     private String remark;
 
-
-
-    public String getStockStatus() {
-        return stockStatus;
-    }
-
-    public void setStockStatus(String stockStatus) {
-        this.stockStatus = stockStatus;
-    }
-
-    public String getProductStatus() {
-        return productStatus;
-    }
-
-    public void setProductStatus(String productStatus) {
-        this.productStatus = productStatus;
-    }
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    @Override
-    public String getRemark() {
-        return remark;
-    }
-
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getSpare1() {
-        return spare1;
-    }
-
-    public void setSpare1(String spare1) {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare2() {
-        return spare2;
-    }
-
-    public void setSpare2(String spare2) {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare5() {
-        return spare5;
-    }
-
-    public void setSpare5(String spare5) {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare6() {
-        return spare6;
-    }
-
-    public void setSpare6(String spare6) {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare7() {
-        return spare7;
-    }
-
-    public void setSpare7(String spare7) {
-        this.spare7 = spare7;
-    }
-
-    public String getSpare8() {
-        return spare8;
-    }
-
-    public void setSpare8(String spare8) {
-        this.spare8 = spare8;
-    }
-
-    public void setOnlyIdentity(Long onlyIdentity)
-    {
-        this.onlyIdentity = onlyIdentity;
-    }
-
-    public Long getOnlyIdentity()
-    {
-        return onlyIdentity;
-    }
-
-    public void setStockId(String stockId)
-    {
-        this.stockId = stockId;
-    }
-
-    public String getStockId()
-    {
-        return stockId;
-    }
-
-    public void setCargoSpaceId(String cargoSpaceId)
-    {
-        this.cargoSpaceId = cargoSpaceId;
-    }
-
-    public String getCargoSpaceId()
-    {
-        return cargoSpaceId;
-    }
-
-    public void setTrayCode(String trayCode)
-    {
-        this.trayCode = trayCode;
-    }
-
-    public String getTrayCode()
-    {
-        return trayCode;
-    }
-
-    public void setQuantity(String quantity)
-    {
-        this.quantity = quantity;
-    }
-
-    public String getQuantity()
-    {
-        return quantity;
-    }
-
-    public void setJobId(String jobId)
-    {
-        this.jobId = jobId;
-    }
-
-    public String getJobId()
-    {
-        return jobId;
-    }
-
-    public void setLotNo(String lotNo)
-    {
-        this.lotNo = lotNo;
-    }
-
-    public String getLotNo()
-    {
-        return lotNo;
-    }
-
-    public void setStockinDetailId(String stockinDetailId)
-    {
-        this.stockinDetailId = stockinDetailId;
-    }
-
-    public String getStockinDetailId()
-    {
-        return stockinDetailId;
-    }
-
-    public void setInDate(String inDate)
-    {
-        this.inDate = inDate;
-    }
-
-    public String getInDate()
-    {
-        return inDate;
-    }
-
-    public void setWarehouseId(String warehouseId)
-    {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseId()
-    {
-        return warehouseId;
-    }
-
-    public void setStackingId(String stackingId)
-    {
-        this.stackingId = stackingId;
-    }
-
-    public String getStackingId()
-    {
-        return stackingId;
-    }
-
-    public void setCargoSpaceName(String cargoSpaceName)
-    {
-        this.cargoSpaceName = cargoSpaceName;
-    }
-
-    public String getCargoSpaceName()
-    {
-        return cargoSpaceName;
-    }
-
-    public void setRoadwayId(String roadwayId)
-    {
-        this.roadwayId = roadwayId;
-    }
-
-    public String getRoadwayId()
-    {
-        return roadwayId;
-    }
-
-    public void setCargoSpaceStatus(String cargoSpaceStatus)
-    {
-        this.cargoSpaceStatus = cargoSpaceStatus;
-    }
-
-    public String getCargoSpaceStatus()
-    {
-        return cargoSpaceStatus;
-    }
-
-    public void setLocked(String locked)
-    {
-        this.locked = locked;
-    }
-
-    public String getLocked()
-    {
-        return locked;
-    }
-
-    public void setProductId(String productId)
-    {
-        this.productId = productId;
-    }
-
-    public String getProductId()
-    {
-        return productId;
-    }
-
-    public void setProductName(String productName)
-    {
-        this.productName = productName;
-    }
-
-    public String getProductName()
-    {
-        return productName;
-    }
-
-    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;
-    }
-
-    public void setPrice(String price)
-    {
-        this.price = price;
-    }
-
-    public String getPrice()
-    {
-        return price;
-    }
-
-    public String getParentId()
-    {
-        return parentId;
-    }
-
-    public void setParentId(String parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    public String getCargoNo()
-    {
-        return cargoNo;
-    }
-
-    public void setCargoNo(String cargoNo)
-    {
-        this.cargoNo = cargoNo;
-    }
-
-    public String getProductGuid()
-    {
-        return productGuid;
-    }
-
-    public void setProductGuid(String productGuid)
-    {
-        this.productGuid = productGuid;
-    }
-
-    public String getSpare3()
-    {
-        return spare3;
-    }
-
-    public void setSpare3(String spare3)
-    {
-        this.spare3 = spare3;
-    }
-
-    public String getSpare4()
-    {
-        return spare4;
-    }
-
-    public void setSpare4(String spare4)
-    {
-        this.spare4 = spare4;
-    }
-
-    public String getSpare9()
-    {
-        return spare9;
-    }
-
-    public void setSpare9(String spare9)
-    {
-        this.spare9 = spare9;
-    }
-
-    public String getSpare10()
-    {
-        return spare10;
-    }
-
-    public void setSpare10(String spare10)
-    {
-        this.spare10 = spare10;
-    }
-
-    public String getSpare11()
-    {
-        return spare11;
-    }
-
-    public void setSpare11(String spare11)
-    {
-        this.spare11 = spare11;
-    }
-
-    public String getSpare12()
-    {
-        return spare12;
-    }
-
-    public void setSpare12(String spare12)
-    {
-        this.spare12 = spare12;
-    }
-
-    public String getSpare13()
-    {
-        return spare13;
-    }
-
-    public void setSpare13(String spare13)
-    {
-        this.spare13 = spare13;
-    }
-
-    public String getSpare14()
-    {
-        return spare14;
-    }
-
-    public void setSpare14(String spare14)
-    {
-        this.spare14 = spare14;
-    }
-
-    public String getSpare15()
-    {
-        return spare15;
-    }
-
-    public void setSpare15(String spare15)
-    {
-        this.spare15 = spare15;
-    }
-
-    public String getSpare16()
-    {
-        return spare16;
-    }
-
-    public void setSpare16(String spare16)
-    {
-        this.spare16 = spare16;
-    }
-
-    public String getSpare17()
-    {
-        return spare17;
-    }
-
-    public void setSpare17(String spare17)
-    {
-        this.spare17 = spare17;
-    }
-
-    public String getSpare18()
-    {
-        return spare18;
-    }
-
-    public void setSpare18(String spare18)
-    {
-        this.spare18 = spare18;
-    }
-
-    public String getSpare19()
-    {
-        return spare19;
-    }
-
-    public void setSpare19(String spare19)
-    {
-        this.spare19 = spare19;
-    }
-
-    public String getSpare20()
-    {
-        return spare20;
-    }
-
-    public void setSpare20(String spare20)
-    {
-        this.spare20 = spare20;
-    }
-
-    public String getSpare21()
-    {
-        return spare21;
-    }
-
-    public void setSpare21(String spare21)
-    {
-        this.spare21 = spare21;
-    }
-
-    public String getSpare22()
-    {
-        return spare22;
-    }
-
-    public void setSpare22(String spare22)
-    {
-        this.spare22 = spare22;
-    }
-
-    public String getSpare23()
-    {
-        return spare23;
-    }
-
-    public void setSpare23(String spare23)
-    {
-        this.spare23 = spare23;
-    }
-
-    public String getSpare24()
-    {
-        return spare24;
-    }
-
-    public void setSpare24(String spare24)
-    {
-        this.spare24 = spare24;
-    }
-
-    public String getSpare25()
-    {
-        return spare25;
-    }
-
-    public void setSpare25(String spare25)
-    {
-        this.spare25 = spare25;
-    }
-
-    public String getSpare26()
-    {
-        return spare26;
-    }
-
-    public void setSpare26(String spare26)
-    {
-        this.spare26 = spare26;
-    }
-
-    public String getSpare27()
-    {
-        return spare27;
-    }
-
-    public void setSpare27(String spare27)
-    {
-        this.spare27 = spare27;
-    }
-
-    public String getSpare28()
-    {
-        return spare28;
-    }
-
-    public void setSpare28(String spare28)
-    {
-        this.spare28 = spare28;
-    }
-
-    public String getSpare29()
-    {
-        return spare29;
-    }
-
-    public void setSpare29(String spare29)
-    {
-        this.spare29 = spare29;
-    }
-
-    public String getSpare30()
-    {
-        return spare30;
-    }
-
-    public void setSpare30(String spare30)
-    {
-        this.spare30 = spare30;
-    }
-
-    public String getSpare31()
-    {
-        return spare31;
-    }
-
-    public void setSpare31(String spare31)
-    {
-        this.spare31 = spare31;
-    }
-
-    public String getSpare32()
-    {
-        return spare32;
-    }
-
-    public void setSpare32(String spare32)
-    {
-        this.spare32 = spare32;
-    }
-
-    public String getSpare33()
-    {
-        return spare33;
-    }
-
-    public void setSpare33(String spare33)
-    {
-        this.spare33 = spare33;
-    }
-
-    public String getSpare34()
-    {
-        return spare34;
-    }
-
-    public void setSpare34(String spare34)
-    {
-        this.spare34 = spare34;
-    }
-
-    public String getSpare35()
-    {
-        return spare35;
-    }
-
-    public void setSpare35(String spare35)
-    {
-        this.spare35 = spare35;
-    }
-
-    public String getSpare36()
-    {
-        return spare36;
-    }
-
-    public void setSpare36(String spare36)
-    {
-        this.spare36 = spare36;
-    }
-
-    public String getSpare37()
-    {
-        return spare37;
-    }
-
-    public void setSpare37(String spare37)
-    {
-        this.spare37 = spare37;
-    }
-
-    public String getSpare38()
-    {
-        return spare38;
-    }
-
-    public void setSpare38(String spare38)
-    {
-        this.spare38 = spare38;
-    }
-
-    public String getSpare39()
-    {
-        return spare39;
-    }
-
-    public void setSpare39(String spare39)
-    {
-        this.spare39 = spare39;
-    }
-
-    @Override
-    public String toString() {
-        return "ViewStockDetail{" +
-                "onlyIdentity=" + onlyIdentity +
-                ", stockId='" + stockId + '\'' +
-                ", cargoSpaceId='" + cargoSpaceId + '\'' +
-                ", trayCode='" + trayCode + '\'' +
-                ", quantity='" + quantity + '\'' +
-                ", jobId='" + jobId + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", stockinDetailId='" + stockinDetailId + '\'' +
-                ", inDate='" + inDate + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", warehouseName='" + warehouseName + '\'' +
-                ", stackingId='" + stackingId + '\'' +
-                ", cargoSpaceName='" + cargoSpaceName + '\'' +
-                ", roadwayId='" + roadwayId + '\'' +
-                ", cargoSpaceStatus='" + cargoSpaceStatus + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", productStatus='" + productStatus + '\'' +
-                ", locked='" + locked + '\'' +
-                ", productGuid='" + productGuid + '\'' +
-                ", productId='" + productId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", spec='" + spec + '\'' +
-                ", unit='" + unit + '\'' +
-                ", price='" + price + '\'' +
-                ", parentId='" + parentId + '\'' +
-                ", cargoNo='" + cargoNo + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare3='" + spare3 + '\'' +
-                ", spare4='" + spare4 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", spare9='" + spare9 + '\'' +
-                ", spare10='" + spare10 + '\'' +
-                ", spare11='" + spare11 + '\'' +
-                ", spare12='" + spare12 + '\'' +
-                ", spare13='" + spare13 + '\'' +
-                ", spare14='" + spare14 + '\'' +
-                ", spare15='" + spare15 + '\'' +
-                ", spare16='" + spare16 + '\'' +
-                ", spare17='" + spare17 + '\'' +
-                ", spare18='" + spare18 + '\'' +
-                ", spare19='" + spare19 + '\'' +
-                ", spare20='" + spare20 + '\'' +
-                ", spare21='" + spare21 + '\'' +
-                ", spare22='" + spare22 + '\'' +
-                ", spare23='" + spare23 + '\'' +
-                ", spare24='" + spare24 + '\'' +
-                ", spare25='" + spare25 + '\'' +
-                ", spare26='" + spare26 + '\'' +
-                ", spare27='" + spare27 + '\'' +
-                ", spare28='" + spare28 + '\'' +
-                ", spare29='" + spare29 + '\'' +
-                ", spare30='" + spare30 + '\'' +
-                ", spare31='" + spare31 + '\'' +
-                ", spare32='" + spare32 + '\'' +
-                ", spare33='" + spare33 + '\'' +
-                ", spare34='" + spare34 + '\'' +
-                ", spare35='" + spare35 + '\'' +
-                ", spare36='" + spare36 + '\'' +
-                ", spare37='" + spare37 + '\'' +
-                ", spare38='" + spare38 + '\'' +
-                ", spare39='" + spare39 + '\'' +
-                ", remark='" + remark + '\'' +
-                '}';
-    }
 }

ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java

@@ -1,6 +1,11 @@
 package com.ruoyi.search.ViewStockoutHistory.domain;
 
 import java.math.BigDecimal;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -12,6 +17,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author gw
  * @date 2025-09-19
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
 public class ViewStockoutHistory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -20,41 +29,41 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "出库单号")
     private String stockoutId;
 
+    /** 出库子单号 */
+    @Excel(name = "出库子单号")
+    private String stockoutDetailId;
+
     /** 出库类型 */
-    @Excel(name = "出库类型")
+    @Excel(name = "出库类型",dictType = "out_bill_type")
     private String outType;
 
     /** 创建日期 */
     @Excel(name = "创建日期")
     private String createDate;
 
-    /** 创建人ID */
+    /** 创建人 */
-    @Excel(name = "创建人ID")
+    @Excel(name = "创建人")
     private String createManId;
 
-    /** 出库状态 */
+    /** 订单号 */
-    @Excel(name = "出库状态")
+    @Excel(name = "订单号")
-    private String status;
+    private String erpStockoutId;
 
-    /** 出库来源 */
+    /** 物料编码 */
-    @Excel(name = "出库来源")
+    @Excel(name = "物料编码")
-    private String stockoutSource;
+    private String productId;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String productName;
 
     /** 出口 */
     @Excel(name = "出口")
     private String exitId;
 
-    /** 仓库ID */
+    /** 出库状态 */
-    @Excel(name = "仓库ID")
+    @Excel(name = "出库状态",dictType = "out_bill_status")
-    private String warehouseId;
+    private String status;
-
-    /** 出库明细ID */
-    @Excel(name = "出库明细ID")
-    private String stockoutDetailId;
-
-    /** 批次号 */
-    @Excel(name = "批次号")
-    private String lotNo;
 
     /** 出库数量 */
     @Excel(name = "出库数量")
@@ -64,16 +73,26 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "分配数量")
     private BigDecimal allotQuantity;
 
+    /** 批次号 */
+    @Excel(name = "批次号")
+    private String lotNo;
+
+    /** 出库来源 */
+//    @Excel(name = "出库来源")
+    private String stockoutSource;
+
+
+    /** 仓库ID */
+//    @Excel(name = "仓库ID")
+    private String warehouseId;
+
     /** 分配编号 */
-    @Excel(name = "分配编号")
+//    @Excel(name = "分配编号")
     private BigDecimal assignNum;
 
-    /** ERP出库单ID */
-    @Excel(name = "ERP出库单ID")
-    private String erpStockoutId;
 
     /** 客户编号 */
-    @Excel(name = "客户编号")
+//    @Excel(name = "客户编号")
     private String entryid;
 
     /** 客户名称 */
@@ -81,15 +100,13 @@ public class ViewStockoutHistory extends BaseEntity
     private String customerName;
 
     /** 物料主键 */
-    @Excel(name = "物料主键")
+//    @Excel(name = "物料主键")
     private String productGuid;
 
-    /** 物料编码 */
+
-    @Excel(name = "物料编码")
-    private String productId;
 
     /** 产品分类 */
-    @Excel(name = "产品分类")
+//    @Excel(name = "产品分类")
     private String parentId;
 
     /** 品号描述 */
@@ -132,10 +149,6 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "功率")
     private String spare6;
 
-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String productName;
-
     /** 相位 */
     @Excel(name = "相位")
     private String spare7;
@@ -267,704 +280,9 @@ public class ViewStockoutHistory extends BaseEntity
     /** 包装材积 */
     @Excel(name = "包装材积")
     private String spare39;
+    /** 描述 */
+    @Excel(name = "描述")
+    private String remark;
 
-    public void setStockoutId(String stockoutId) 
-    {
-        this.stockoutId = stockoutId;
-    }
 
-    public String getStockoutId() 
-    {
-        return stockoutId;
-    }
-
-    public void setOutType(String outType) 
-    {
-        this.outType = outType;
-    }
-
-    public String getOutType() 
-    {
-        return outType;
-    }
-
-    public void setCreateDate(String createDate) 
-    {
-        this.createDate = createDate;
-    }
-
-    public String getCreateDate() 
-    {
-        return createDate;
-    }
-
-    public void setCreateManId(String createManId) 
-    {
-        this.createManId = createManId;
-    }
-
-    public String getCreateManId() 
-    {
-        return createManId;
-    }
-
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-
-    public void setStockoutSource(String stockoutSource) 
-    {
-        this.stockoutSource = stockoutSource;
-    }
-
-    public String getStockoutSource() 
-    {
-        return stockoutSource;
-    }
-
-    public void setExitId(String exitId) 
-    {
-        this.exitId = exitId;
-    }
-
-    public String getExitId() 
-    {
-        return exitId;
-    }
-
-    public void setWarehouseId(String warehouseId) 
-    {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseId() 
-    {
-        return warehouseId;
-    }
-
-    public void setStockoutDetailId(String stockoutDetailId) 
-    {
-        this.stockoutDetailId = stockoutDetailId;
-    }
-
-    public String getStockoutDetailId() 
-    {
-        return stockoutDetailId;
-    }
-
-    public void setLotNo(String lotNo) 
-    {
-        this.lotNo = lotNo;
-    }
-
-    public String getLotNo() 
-    {
-        return lotNo;
-    }
-
-    public void setQuantity(BigDecimal quantity) 
-    {
-        this.quantity = quantity;
-    }
-
-    public BigDecimal getQuantity() 
-    {
-        return quantity;
-    }
-
-    public void setAllotQuantity(BigDecimal allotQuantity) 
-    {
-        this.allotQuantity = allotQuantity;
-    }
-
-    public BigDecimal getAllotQuantity() 
-    {
-        return allotQuantity;
-    }
-
-    public void setAssignNum(BigDecimal assignNum) 
-    {
-        this.assignNum = assignNum;
-    }
-
-    public BigDecimal getAssignNum() 
-    {
-        return assignNum;
-    }
-
-    public void setErpStockoutId(String erpStockoutId) 
-    {
-        this.erpStockoutId = erpStockoutId;
-    }
-
-    public String getErpStockoutId() 
-    {
-        return erpStockoutId;
-    }
-
-    public void setEntryid(String entryid) 
-    {
-        this.entryid = entryid;
-    }
-
-    public String getEntryid() 
-    {
-        return entryid;
-    }
-
-    public void setCustomerName(String customerName) 
-    {
-        this.customerName = customerName;
-    }
-
-    public String getCustomerName() 
-    {
-        return customerName;
-    }
-
-    public void setProductGuid(String productGuid) 
-    {
-        this.productGuid = productGuid;
-    }
-
-    public String getProductGuid() 
-    {
-        return productGuid;
-    }
-
-    public void setProductId(String productId) 
-    {
-        this.productId = productId;
-    }
-
-    public String getProductId() 
-    {
-        return productId;
-    }
-
-    public void setParentId(String parentId) 
-    {
-        this.parentId = parentId;
-    }
-
-    public String getParentId() 
-    {
-        return parentId;
-    }
-
-    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 setUnit(String unit) 
-    {
-        this.unit = unit;
-    }
-
-    public String getUnit() 
-    {
-        return unit;
-    }
-
-    public void setSpec(String spec) 
-    {
-        this.spec = spec;
-    }
-
-    public String getSpec() 
-    {
-        return spec;
-    }
-
-    public void setSpare1(String spare1) 
-    {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare1() 
-    {
-        return spare1;
-    }
-
-    public void setSpare2(String spare2) 
-    {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare2() 
-    {
-        return spare2;
-    }
-
-    public void setSpare3(String spare3) 
-    {
-        this.spare3 = spare3;
-    }
-
-    public String getSpare3() 
-    {
-        return spare3;
-    }
-
-    public void setSpare4(String spare4) 
-    {
-        this.spare4 = spare4;
-    }
-
-    public String getSpare4() 
-    {
-        return spare4;
-    }
-
-    public void setSpare5(String spare5) 
-    {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare5() 
-    {
-        return spare5;
-    }
-
-    public void setSpare6(String spare6) 
-    {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare6() 
-    {
-        return spare6;
-    }
-
-    public void setProductName(String productName) 
-    {
-        this.productName = productName;
-    }
-
-    public String getProductName() 
-    {
-        return productName;
-    }
-
-    public void setSpare7(String spare7) 
-    {
-        this.spare7 = spare7;
-    }
-
-    public String getSpare7() 
-    {
-        return spare7;
-    }
-
-    public void setSpare8(String spare8) 
-    {
-        this.spare8 = spare8;
-    }
-
-    public String getSpare8() 
-    {
-        return spare8;
-    }
-
-    public void setSpare9(String spare9) 
-    {
-        this.spare9 = spare9;
-    }
-
-    public String getSpare9() 
-    {
-        return spare9;
-    }
-
-    public void setSpare10(String spare10) 
-    {
-        this.spare10 = spare10;
-    }
-
-    public String getSpare10() 
-    {
-        return spare10;
-    }
-
-    public void setSpare11(String spare11) 
-    {
-        this.spare11 = spare11;
-    }
-
-    public String getSpare11() 
-    {
-        return spare11;
-    }
-
-    public void setSpare12(String spare12) 
-    {
-        this.spare12 = spare12;
-    }
-
-    public String getSpare12() 
-    {
-        return spare12;
-    }
-
-    public void setSpare13(String spare13) 
-    {
-        this.spare13 = spare13;
-    }
-
-    public String getSpare13() 
-    {
-        return spare13;
-    }
-
-    public void setSpare14(String spare14) 
-    {
-        this.spare14 = spare14;
-    }
-
-    public String getSpare14() 
-    {
-        return spare14;
-    }
-
-    public void setSpare15(String spare15) 
-    {
-        this.spare15 = spare15;
-    }
-
-    public String getSpare15() 
-    {
-        return spare15;
-    }
-
-    public void setSpare16(String spare16) 
-    {
-        this.spare16 = spare16;
-    }
-
-    public String getSpare16() 
-    {
-        return spare16;
-    }
-
-    public void setSpare17(String spare17) 
-    {
-        this.spare17 = spare17;
-    }
-
-    public String getSpare17() 
-    {
-        return spare17;
-    }
-
-    public void setSpare18(String spare18) 
-    {
-        this.spare18 = spare18;
-    }
-
-    public String getSpare18() 
-    {
-        return spare18;
-    }
-
-    public void setSpare19(String spare19) 
-    {
-        this.spare19 = spare19;
-    }
-
-    public String getSpare19() 
-    {
-        return spare19;
-    }
-
-    public void setSpare20(String spare20) 
-    {
-        this.spare20 = spare20;
-    }
-
-    public String getSpare20() 
-    {
-        return spare20;
-    }
-
-    public void setSpare21(String spare21) 
-    {
-        this.spare21 = spare21;
-    }
-
-    public String getSpare21() 
-    {
-        return spare21;
-    }
-
-    public void setSpare22(String spare22) 
-    {
-        this.spare22 = spare22;
-    }
-
-    public String getSpare22() 
-    {
-        return spare22;
-    }
-
-    public void setSpare23(String spare23) 
-    {
-        this.spare23 = spare23;
-    }
-
-    public String getSpare23() 
-    {
-        return spare23;
-    }
-
-    public void setSpare24(String spare24) 
-    {
-        this.spare24 = spare24;
-    }
-
-    public String getSpare24() 
-    {
-        return spare24;
-    }
-
-    public void setSpare25(String spare25) 
-    {
-        this.spare25 = spare25;
-    }
-
-    public String getSpare25() 
-    {
-        return spare25;
-    }
-
-    public void setSpare26(String spare26) 
-    {
-        this.spare26 = spare26;
-    }
-
-    public String getSpare26() 
-    {
-        return spare26;
-    }
-
-    public void setSpare27(String spare27) 
-    {
-        this.spare27 = spare27;
-    }
-
-    public String getSpare27() 
-    {
-        return spare27;
-    }
-
-    public void setSpare28(String spare28) 
-    {
-        this.spare28 = spare28;
-    }
-
-    public String getSpare28() 
-    {
-        return spare28;
-    }
-
-    public void setSpare29(String spare29) 
-    {
-        this.spare29 = spare29;
-    }
-
-    public String getSpare29() 
-    {
-        return spare29;
-    }
-
-    public void setSpare30(String spare30) 
-    {
-        this.spare30 = spare30;
-    }
-
-    public String getSpare30() 
-    {
-        return spare30;
-    }
-
-    public void setSpare31(String spare31) 
-    {
-        this.spare31 = spare31;
-    }
-
-    public String getSpare31() 
-    {
-        return spare31;
-    }
-
-    public void setSpare32(String spare32) 
-    {
-        this.spare32 = spare32;
-    }
-
-    public String getSpare32() 
-    {
-        return spare32;
-    }
-
-    public void setSpare33(String spare33) 
-    {
-        this.spare33 = spare33;
-    }
-
-    public String getSpare33() 
-    {
-        return spare33;
-    }
-
-    public void setSpare34(String spare34) 
-    {
-        this.spare34 = spare34;
-    }
-
-    public String getSpare34() 
-    {
-        return spare34;
-    }
-
-    public void setSpare35(String spare35) 
-    {
-        this.spare35 = spare35;
-    }
-
-    public String getSpare35() 
-    {
-        return spare35;
-    }
-
-    public void setSpare36(String spare36) 
-    {
-        this.spare36 = spare36;
-    }
-
-    public String getSpare36() 
-    {
-        return spare36;
-    }
-
-    public void setSpare37(String spare37) 
-    {
-        this.spare37 = spare37;
-    }
-
-    public String getSpare37() 
-    {
-        return spare37;
-    }
-
-    public void setSpare38(String spare38) 
-    {
-        this.spare38 = spare38;
-    }
-
-    public String getSpare38() 
-    {
-        return spare38;
-    }
-
-    public void setSpare39(String spare39) 
-    {
-        this.spare39 = spare39;
-    }
-
-    public String getSpare39() 
-    {
-        return spare39;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("stockoutId", getStockoutId())
-            .append("outType", getOutType())
-            .append("createDate", getCreateDate())
-            .append("createManId", getCreateManId())
-            .append("status", getStatus())
-            .append("stockoutSource", getStockoutSource())
-            .append("exitId", getExitId())
-            .append("warehouseId", getWarehouseId())
-            .append("stockoutDetailId", getStockoutDetailId())
-            .append("lotNo", getLotNo())
-            .append("quantity", getQuantity())
-            .append("allotQuantity", getAllotQuantity())
-            .append("assignNum", getAssignNum())
-            .append("erpStockoutId", getErpStockoutId())
-            .append("entryid", getEntryid())
-            .append("customerName", getCustomerName())
-            .append("productGuid", getProductGuid())
-            .append("productId", getProductId())
-            .append("parentId", getParentId())
-            .append("price", getPrice())
-            .append("cargoNo", getCargoNo())
-            .append("unit", getUnit())
-            .append("spec", getSpec())
-            .append("remark", getRemark())
-            .append("spare1", getSpare1())
-            .append("spare2", getSpare2())
-            .append("spare3", getSpare3())
-            .append("spare4", getSpare4())
-            .append("spare5", getSpare5())
-            .append("spare6", getSpare6())
-            .append("productName", getProductName())
-            .append("spare7", getSpare7())
-            .append("spare8", getSpare8())
-            .append("spare9", getSpare9())
-            .append("spare10", getSpare10())
-            .append("spare11", getSpare11())
-            .append("spare12", getSpare12())
-            .append("spare13", getSpare13())
-            .append("spare14", getSpare14())
-            .append("spare15", getSpare15())
-            .append("spare16", getSpare16())
-            .append("spare17", getSpare17())
-            .append("spare18", getSpare18())
-            .append("spare19", getSpare19())
-            .append("spare20", getSpare20())
-            .append("spare21", getSpare21())
-            .append("spare22", getSpare22())
-            .append("spare23", getSpare23())
-            .append("spare24", getSpare24())
-            .append("spare25", getSpare25())
-            .append("spare26", getSpare26())
-            .append("spare27", getSpare27())
-            .append("spare28", getSpare28())
-            .append("spare29", getSpare29())
-            .append("spare30", getSpare30())
-            .append("spare31", getSpare31())
-            .append("spare32", getSpare32())
-            .append("spare33", getSpare33())
-            .append("spare34", getSpare34())
-            .append("spare35", getSpare35())
-            .append("spare36", getSpare36())
-            .append("spare37", getSpare37())
-            .append("spare38", getSpare38())
-            .append("spare39", getSpare39())
-            .toString();
-    }
 }

ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="onlyIdentity"    column="only_identity"    />
         <result property="productId"    column="product_id"    />
         <result property="productName"    column="product_name"    />
+        <result property="orderId"    column="order_id"    />
         <result property="spec"    column="spec"    />
         <result property="unit"    column="unit"    />
         <result property="lotNo"    column="lot_no"    />
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupBySpec != null and groupBySpec or groupByUnit != null and groupByUnit or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByCargoSpaceId != null and groupByCargoSpaceId or groupByPrice != null and groupByPrice or groupByParentId != null and groupByParentId or groupByCargoNo != null and groupByCargoNo or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare3 != null and groupBySpare3 or groupBySpare4 != null and groupBySpare4 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8 or groupBySpare9 != null and groupBySpare9 or groupBySpare10 != null and groupBySpare10">
                     <if test="groupByProductId != null and groupByProductId">p.product_id,</if>
                     <if test="groupByProductName != null and groupByProductName">p.product_name,</if>
+                    <if test="groupByOrderId != null and groupByOrderId">s.order_id,</if>
                     <if test="groupBySpec != null and groupBySpec">p.spec,</if>
                     <if test="groupByUnit != null and groupByUnit">p.unit,</if>
                     <if test="groupByPrice != null and groupByPrice">p.price,</if>
@@ -98,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         AND p.product_id IS NOT NULL AND p.product_id != ''
                         <if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
                         <if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
+                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
                         <if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
                         <if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
                         <if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
@@ -111,6 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
                         <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
                         <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+                        <if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+                        <if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
                         <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                             ${params.warehouseDataScope}
                         </if>
@@ -119,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     <trim prefixOverrides=",">
                         <if test="groupByProductId != null and groupByProductId">,p.product_id</if>
                         <if test="groupByProductName != null and groupByProductName">,p.product_name</if>
+                        <if test="groupByOrderId != null and groupByOrderId">,s.order_id</if>
                         <if test="groupBySpec != null and groupBySpec">,p.spec</if>
                         <if test="groupByUnit != null and groupByUnit">,p.unit</if>
                         <if test="groupByPrice != null and groupByPrice">,p.price</if>
@@ -180,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         AND p.product_id IS NOT NULL AND p.product_id != ''
                         <if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
                         <if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
+                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
                         <if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
                         <if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
                         <if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
@@ -228,6 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
                         <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
                         <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+                        <if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
                         <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                             ${params.warehouseDataScope}
                         </if>

ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml

@@ -79,10 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare37"    column="spare37"    />
         <result property="spare38"    column="spare38"    />
         <result property="spare39"    column="spare39"    />
+        <result property="lineId"    column="line_id"    />
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, wlbh, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_in_job_flow
+        select job_id, job_detail_id,line_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, wlbh, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_in_job_flow
     </sql>
 
     <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
@@ -162,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
             <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
             <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
+            <if test="lineId != null  and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml

@@ -81,10 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare38"    column="spare38"    />
         <result property="spare39"    column="spare39"    />
         <result property="customerName"    column="customer_name"    />
+        <result property="lineId"    column="line_id"    />
     </resultMap>
 
     <sql id="selectViewOutJobFlowVo">
-        select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, wlbh, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, customer_name from view_out_job_flow
+        select job_id, job_detail_id,line_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, wlbh, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, customer_name from view_out_job_flow
     </sql>
 
     <select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
@@ -166,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
             <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="lineId != null  and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="stockStatus"    column="stock_status"    />
         <result property="productStatus"    column="product_status"    />
+        <result property="orderId"    column="order_id"    />
     </resultMap>
 
     <sql id="selectViewStockDetailVo">
@@ -49,7 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             s.stockin_detail_id, 
             s.in_date, 
             s.warehouse_id, 
-            s.stacking_id, 
+            s.stacking_id,
+               s.order_id,
             cs.cargo_space_name, 
             cs.roadway_id, 
             cs.status AS cargo_space_status, 
@@ -81,9 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
         <include refid="selectViewStockDetailVo"/>
-        <if test="stockId != null  and stockId != ''"> and s.stock_id = #{stockId}</if>
+        <if test="stockId != null  and stockId != ''"> and s.stock_id like concat('%',#{stockId}, '%')</if>
         <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and s.cargo_space_id = #{cargoSpaceId}</if>
-        <if test="trayCode != null  and trayCode != ''"> and s.tray_code = #{trayCode}</if>
+        <if test="trayCode != null  and trayCode != ''"> and s.tray_code like concat('%',#{trayCode}, '%')</if>
         <if test="quantity != null  and quantity != ''"> and s.quantity = #{quantity}</if>
         <if test="jobId != null  and jobId != ''"> and s.job_id = #{jobId}</if>
         <if test="lotNo != null  and lotNo != ''"> and s.lot_no = #{lotNo}</if>
@@ -98,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="stockStatus != null  and stockStatus != ''"> and s.stock_status = #{stockStatus}</if>
         <if test="productStatus != null  and productStatus != ''"> and s.product_status = #{productStatus}</if>
         <if test="locked != null  and locked != ''"> and cs.locked = #{locked}</if>
-        <if test="productId != null  and productId != ''"> and p.product_id = #{productId}</if>
+        <if test="productId != null  and productId != ''"> and p.product_id like concat('%',#{productId}, '%')</if>
         <if test="productName != null  and productName != ''"> and p.product_name like concat('%', #{productName}, '%')</if>
         <if test="spec != null  and spec != ''"> and p.spec = #{spec}</if>
         <if test="unit != null  and unit != ''"> and p.unit = #{unit}</if>
@@ -110,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="spare7 != null  and spare7 != ''"> and p.spare7 = #{spare7}</if>
         <if test="spare8 != null  and spare8 != ''"> and p.spare8 = #{spare8}</if>
         <if test="remark != null  and remark != ''"> and p.remark = #{remark}</if>
+        <if test="orderId != null  and orderId != ''"> and s.order_id like concat('%',#{orderId}, '%')</if>
     </select>
 
     <select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">

ruoyi-ui/src/views/bas/cargoSpace/index.vue

@@ -11,16 +11,16 @@
         />
       </el-form-item>
       <!-- 仓库ID -->
-      <el-form-item label="仓库名称" prop="warehouseId"><!-- 仓库id -->
+<!--      <el-form-item label="仓库名称" prop="warehouseId">&lt;!&ndash; 仓库id &ndash;&gt;-->
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">
+<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">-->
-          <el-option
+<!--          <el-option-->
-            v-for="item in warehouseOptions"
+<!--            v-for="item in warehouseOptions"-->
-            :key="item.warehouseId"
+<!--            :key="item.warehouseId"-->
-            :label="item.warehouseName"
+<!--            :label="item.warehouseName"-->
-            :value="item.warehouseId"
+<!--            :value="item.warehouseId"-->
-          />
+<!--          />-->
-        </el-select>
+<!--        </el-select>-->
-      </el-form-item>
+<!--      </el-form-item>-->
        <el-form-item label="货位名称" prop="cargoSpaceName">
         <el-input
           v-model="queryParams.cargoSpaceName"
@@ -104,17 +104,17 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <!-- 【新增】按钮 -->
+<!--        &lt;!&ndash; 【新增】按钮 &ndash;&gt;-->
-        <el-button
+<!--        <el-button-->
-          type="primary"
+<!--          type="primary"-->
-          plain
+<!--          plain-->
-          icon="el-icon-plus"
+<!--          icon="el-icon-plus"-->
-          size="mini"
+<!--          size="mini"-->
-          @click="handleAdd"
+<!--          @click="handleAdd"-->
-          v-hasPermi="['bas:cargoSpace:add']"
+<!--          v-hasPermi="['bas:cargoSpace:add']"-->
-        >新增</el-button>
+<!--        >新增</el-button>-->
-      </el-col>
+<!--      </el-col>-->
       <el-col :span="1.5">
         <!-- 【修改】按钮 -->
         <el-button
@@ -127,18 +127,18 @@
           v-hasPermi="['bas:cargoSpace:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">-->
-        <!-- 【删除】按钮 -->
+<!--        &lt;!&ndash; 【删除】按钮 &ndash;&gt;-->
-        <el-button
+<!--        <el-button-->
-          type="danger"
+<!--          type="danger"-->
-          plain
+<!--          plain-->
-          icon="el-icon-delete"
+<!--          icon="el-icon-delete"-->
-          size="mini"
+<!--          size="mini"-->
-          :disabled="multiple"
+<!--          :disabled="multiple"-->
-          @click="handleDelete"
+<!--          @click="handleDelete"-->
-          v-hasPermi="['bas:cargoSpace:remove']"
+<!--          v-hasPermi="['bas:cargoSpace:remove']"-->
-        >删除</el-button>
+<!--        >删除</el-button>-->
-      </el-col>
+<!--      </el-col>-->
       <el-col :span="1.5">
         <!-- 【导入】按钮 -->
         <el-button
@@ -158,7 +158,8 @@
       <!-- 货位ID -->
       <el-table-column label="货位编号" align="left" prop="cargoSpaceId" />
       <!-- 仓库名称 -->
-      <el-table-column label="仓库名称" align="left" prop="warehouseName" />
+      <!--      <el-table-column label="仓库名称" align="left" prop="warehouseName" />-->
+            <el-table-column label="巷道ID" align="left" prop="roadwayId" />
       <!-- 货位名称 -->
       <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
       <!-- 排 -->
@@ -182,7 +183,7 @@
       <!-- 托盘编码 -->
       <el-table-column label="托盘编号" align="left" prop="trayCode" />
       <!-- 货物高度 -->
-      <el-table-column label="货物高度" align="right" prop="cargoHight" />
+<!--      <el-table-column label="货物高度" align="right" prop="cargoHight" />-->
       <!-- 人工操作 -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -195,13 +196,13 @@
             v-hasPermi="['bas:cargoSpace:edit']"
           >修改</el-button>
           <!-- 人工操作---【删除】按钮 -->
-          <el-button
+<!--          <el-button-->
-            size="mini"
+<!--            size="mini"-->
-            type="text"
+<!--            type="text"-->
-            icon="el-icon-delete"
+<!--            icon="el-icon-delete"-->
-            @click="handleDelete(scope.row)"
+<!--            @click="handleDelete(scope.row)"-->
-            v-hasPermi="['bas:cargoSpace:remove']"
+<!--            v-hasPermi="['bas:cargoSpace:remove']"-->
-          >删除</el-button>
+<!--          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -219,47 +220,47 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <!-- 货位ID -->
         <el-form-item label="货位编号" prop="cargoSpaceId">
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" />
+          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" disabled/>
         </el-form-item>
         <!-- 仓库 -->
-        <el-form-item label="仓库名称" prop="warehouseId">
+<!--        <el-form-item label="仓库名称" prop="warehouseId">-->
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">
+<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">-->
-          <el-option
+<!--          <el-option-->
-            v-for="item in warehouseOptions"
+<!--            v-for="item in warehouseOptions"-->
-            :key="item.warehouseId"
+<!--            :key="item.warehouseId"-->
-            :label="item.warehouseName"
+<!--            :label="item.warehouseName"-->
-            :value="item.warehouseId"
+<!--            :value="item.warehouseId"-->
-          />
+<!--          />-->
-        </el-select>
+<!--        </el-select>-->
-      </el-form-item>
+<!--      </el-form-item>-->
         <!-- 巷道号 -->
         <el-form-item label="巷道编号" prop="roadwayId">
-          <el-input v-model="form.roadwayId" placeholder="请输入巷道编号" />
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道编号" disabled/>
         </el-form-item>
         <!-- 货区编码 -->
-        <el-form-item label="货区编号" prop="cargoAreaId">
+<!--        <el-form-item label="货区编号" prop="cargoAreaId">-->
-          <el-input v-model="form.cargoAreaId" placeholder="请输入货区编号" />
+<!--          <el-input v-model="form.cargoAreaId" placeholder="请输入货区编号" disabled/>-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <!-- 货位类型 -->
-        <el-form-item label="货位类型" prop="theTypeName">
+<!--        <el-form-item label="货位类型" prop="theTypeName">-->
-          <el-input v-model="form.theTypeName" placeholder="请输入货位类型" />
+<!--          <el-input v-model="form.theTypeName" placeholder="请输入货位类型" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <!-- 货位名称 -->
         <el-form-item label="货位名称" prop="cargoSpaceName">
-          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
+          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" disabled/>
         </el-form-item>
         <!-- 排 -->
-        <el-form-item label="排" prop="thePlatoon">
+<!--        <el-form-item label="排" prop="thePlatoon">-->
-          <el-input v-model="form.thePlatoon" placeholder="请输入排号" />
+<!--          <el-input v-model="form.thePlatoon" placeholder="请输入排号" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <!-- 列 -->
-        <el-form-item label="列" prop="theColumn">
+<!--        <el-form-item label="列" prop="theColumn">-->
-          <el-input v-model="form.theColumn" placeholder="请输入列号" />
+<!--          <el-input v-model="form.theColumn" placeholder="请输入列号" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <!-- 层 -->
-        <el-form-item label="层" prop="theFloor">
+<!--        <el-form-item label="层" prop="theFloor">-->
-          <el-input v-model="form.theFloor" placeholder="请输入层号" />
+<!--          <el-input v-model="form.theFloor" placeholder="请输入层号" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <!-- 货位状态 -->
         <el-form-item label="货位状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择货位状态">
@@ -287,9 +288,9 @@
           <el-input v-model="form.trayCode" placeholder="请输入托盘编号" />
         </el-form-item>
         <!-- 货位高度 -->
-        <el-form-item label="货物高度" prop="cargoHight">
+<!--        <el-form-item label="货物高度" prop="cargoHight">-->
-          <el-input v-model="form.cargoHight" placeholder="请输入货物高度" />
+<!--          <el-input v-model="form.cargoHight" placeholder="请输入货物高度" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
 
       </el-form>
       <div slot="footer" class="dialog-footer">

ruoyi-ui/src/views/search/StockSummary/index.vue

@@ -3,8 +3,10 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="分组选项">
         <el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
-          <el-checkbox label="productId">品号</el-checkbox>
+          <el-checkbox label="orderId">订单号</el-checkbox>
-          <el-checkbox label="productName">品名</el-checkbox>
+          <el-checkbox label="productId">物料编号</el-checkbox>
+          <el-checkbox label="productName">物料名称</el-checkbox>
+          <el-checkbox label="lotNo">批号</el-checkbox>
           <!-- <el-checkbox label="unit">单位</el-checkbox> -->
           <!-- <el-checkbox label="warehouseId">仓库</el-checkbox> -->
           <el-checkbox label="roadwayId">巷道</el-checkbox>
@@ -65,10 +67,18 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="巷道" prop="roadwayId">
+      <el-form-item label="订单号" prop="orderId">
         <el-input
-          v-model="queryParams.roadwayId"
+          v-model="queryParams.orderId"
-          placeholder="请输入巷道"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位" prop="cargoSpaceName">
+        <el-input
+          v-model="queryParams.cargoSpaceName"
+          placeholder="请输入货位"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -97,14 +107,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="货位" prop="cargoSpaceId">
+<!--      <el-form-item label="货位" prop="cargoSpaceId">-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.cargoSpaceId"
+<!--          v-model="queryParams.cargoSpaceId"-->
-          placeholder="请输入货位"
+<!--          placeholder="请输入货位"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -132,12 +142,14 @@
       max-height="650"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="物料编码" align="left" prop="productId" width="120" v-if="queryParams.groupFields.includes('productId')" />
+      <el-table-column label="订单号" align="center" prop="orderId" width="160" v-if="queryParams.groupFields.includes('orderId')" />
-      <el-table-column label="物料名称" align="center" prop="productName" width="120" v-if="queryParams.groupFields.includes('productName')" />
+      <el-table-column label="物料编码" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
+      <el-table-column label="物料名称" align="center" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
+      <el-table-column label="批号" align="center" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />
       <!-- <el-table-column label="单位" align="center" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" /> -->
-      <el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />
+<!--      <el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />-->
-      <el-table-column label="巷道" align="left" prop="roadwayId" width="120" />
+      <el-table-column label="巷道" align="left" prop="roadwayId" width="160" />
-      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="120" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
+      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="160" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
       <el-table-column label="库存数量" align="right" prop="quantity" width="120" />
       <!-- <el-table-column label="型号" align="center" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" /> -->
       <!-- <el-table-column label="单件净重" align="center" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" /> -->
@@ -145,42 +157,42 @@
       <!-- <el-table-column label="功率" align="center" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" /> -->
       <!-- <el-table-column label="相位" align="center" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" /> -->
       <!-- <el-table-column label="毛重" align="center" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" /> -->
-      <el-table-column label="规格" align="left" prop="spec" width="120" v-if="queryParams.groupFields.includes('spec')" />
+      <el-table-column label="规格" align="left" prop="spec" width="160" v-if="queryParams.groupFields.includes('spec')" />
-      <el-table-column label="品号描述" align="left" prop="price" width="120" v-if="queryParams.groupFields.includes('price')" />
+      <el-table-column label="品号描述" align="left" prop="price" width="160" v-if="queryParams.groupFields.includes('price')" />
-      <el-table-column label="产品分类" align="left" prop="parentId" width="120" v-if="queryParams.groupFields.includes('parentId')" />
+      <el-table-column label="产品分类" align="left" prop="parentId" width="160" v-if="queryParams.groupFields.includes('parentId')" />
-      <el-table-column label="英文描述" align="left" prop="cargoNo" width="120" v-if="queryParams.groupFields.includes('cargoNo')" />
+      <el-table-column label="英文描述" align="left" prop="cargoNo" width="160" v-if="queryParams.groupFields.includes('cargoNo')" />
-      <el-table-column label="NC号" align="left" prop="spare9" width="120" v-if="queryParams.groupFields.includes('spare9')" />
+      <el-table-column label="NC号" align="left" prop="spare9" width="160" v-if="queryParams.groupFields.includes('spare9')" />
-      <el-table-column label="电源线" align="left" prop="spare10" width="120" v-if="queryParams.groupFields.includes('spare10')" />
+      <el-table-column label="电源线" align="left" prop="spare10" width="160" v-if="queryParams.groupFields.includes('spare10')" />
-      <el-table-column label="插头" align="left" prop="spare11" width="120" v-if="queryParams.groupFields.includes('spare11')" />
+      <el-table-column label="插头" align="left" prop="spare11" width="160" v-if="queryParams.groupFields.includes('spare11')" />
-      <el-table-column label="接嘴" align="left" prop="spare12" width="120" v-if="queryParams.groupFields.includes('spare12')" />
+      <el-table-column label="接嘴" align="left" prop="spare12" width="160" v-if="queryParams.groupFields.includes('spare12')" />
-      <el-table-column label="快捷码" align="left" prop="spare13" width="120" v-if="queryParams.groupFields.includes('spare13')" />
+      <el-table-column label="快捷码" align="left" prop="spare13" width="160" v-if="queryParams.groupFields.includes('spare13')" />
-      <el-table-column label="库存单位编号" align="left" prop="spare14" width="120" v-if="queryParams.groupFields.includes('spare14')" />
+      <el-table-column label="库存单位编号" align="left" prop="spare14" width="160" v-if="queryParams.groupFields.includes('spare14')" />
-      <el-table-column label="库存单位名称" align="left" prop="spare15" width="120" v-if="queryParams.groupFields.includes('spare15')" />
+      <el-table-column label="库存单位名称" align="left" prop="spare15" width="160" v-if="queryParams.groupFields.includes('spare15')" />
-      <el-table-column label="品号群组" align="left" prop="spare16" width="120" v-if="queryParams.groupFields.includes('spare16')" />
+      <el-table-column label="品号群组" align="left" prop="spare16" width="160" v-if="queryParams.groupFields.includes('spare16')" />
-      <el-table-column label="归类品" align="left" prop="spare17" width="120" v-if="queryParams.groupFields.includes('spare17')" />
+      <el-table-column label="归类品" align="left" prop="spare17" width="160" v-if="queryParams.groupFields.includes('spare17')" />
-      <el-table-column label="计量体系" align="left" prop="spare18" width="120" v-if="queryParams.groupFields.includes('spare18')" />
+      <el-table-column label="计量体系" align="left" prop="spare18" width="160" v-if="queryParams.groupFields.includes('spare18')" />
-      <el-table-column label="群组名称" align="left" prop="spare19" width="120" v-if="queryParams.groupFields.includes('spare19')" />
+      <el-table-column label="群组名称" align="left" prop="spare19" width="160" v-if="queryParams.groupFields.includes('spare19')" />
-      <el-table-column label="批号管理" align="left" prop="spare20" width="120" v-if="queryParams.groupFields.includes('spare20')" />
+      <el-table-column label="批号管理" align="left" prop="spare20" width="160" v-if="queryParams.groupFields.includes('spare20')" />
-      <el-table-column label="状态" align="left" prop="spare21" width="120" v-if="queryParams.groupFields.includes('spare21')" />
+      <el-table-column label="状态" align="left" prop="spare21" width="160" v-if="queryParams.groupFields.includes('spare21')" />
-      <el-table-column label="产品大类" align="left" prop="spare22" width="120" v-if="queryParams.groupFields.includes('spare22')" />
+      <el-table-column label="产品大类" align="left" prop="spare22" width="160" v-if="queryParams.groupFields.includes('spare22')" />
-      <el-table-column label="产品二类" align="left" prop="spare23" width="120" v-if="queryParams.groupFields.includes('spare23')" />
+      <el-table-column label="产品二类" align="left" prop="spare23" width="160" v-if="queryParams.groupFields.includes('spare23')" />
-      <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="120" v-if="queryParams.groupFields.includes('spare24')" />
+      <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160" v-if="queryParams.groupFields.includes('spare24')" />
-      <el-table-column label="BOM状态" align="left" prop="spare25" width="120" v-if="queryParams.groupFields.includes('spare25')" />
+      <el-table-column label="BOM状态" align="left" prop="spare25" width="160" v-if="queryParams.groupFields.includes('spare25')" />
-      <el-table-column label="产品定位" align="left" prop="spare26" width="120" v-if="queryParams.groupFields.includes('spare26')" />
+      <el-table-column label="产品定位" align="left" prop="spare26" width="160" v-if="queryParams.groupFields.includes('spare26')" />
-      <el-table-column label="电脑板型号" align="left" prop="spare27" width="120" v-if="queryParams.groupFields.includes('spare27')" />
+      <el-table-column label="电脑板型号" align="left" prop="spare27" width="160" v-if="queryParams.groupFields.includes('spare27')" />
-      <el-table-column label="非标要求" align="left" prop="spare28" width="120" v-if="queryParams.groupFields.includes('spare28')" />
+      <el-table-column label="非标要求" align="left" prop="spare28" width="160" v-if="queryParams.groupFields.includes('spare28')" />
-      <el-table-column label="品牌" align="left" prop="spare29" width="120" v-if="queryParams.groupFields.includes('spare29')" />
+      <el-table-column label="品牌" align="left" prop="spare29" width="160" v-if="queryParams.groupFields.includes('spare29')" />
-      <el-table-column label="非标颜色" align="left" prop="spare30" width="120" v-if="queryParams.groupFields.includes('spare30')" />
+      <el-table-column label="非标颜色" align="left" prop="spare30" width="160" v-if="queryParams.groupFields.includes('spare30')" />
-      <el-table-column label="主颜色" align="left" prop="spare31" width="120" v-if="queryParams.groupFields.includes('spare31')" />
+      <el-table-column label="主颜色" align="left" prop="spare31" width="160" v-if="queryParams.groupFields.includes('spare31')" />
-      <el-table-column label="辅助颜色" align="left" prop="spare32" width="120" v-if="queryParams.groupFields.includes('spare32')" />
+      <el-table-column label="辅助颜色" align="left" prop="spare32" width="160" v-if="queryParams.groupFields.includes('spare32')" />
-      <el-table-column label="是否标准款" align="left" prop="spare33" width="120" v-if="queryParams.groupFields.includes('spare33')" />
+      <el-table-column label="是否标准款" align="left" prop="spare33" width="160" v-if="queryParams.groupFields.includes('spare33')" />
-      <el-table-column label="包装方式" align="left" prop="spare34" width="120" v-if="queryParams.groupFields.includes('spare34')" />
+      <el-table-column label="包装方式" align="left" prop="spare34" width="160" v-if="queryParams.groupFields.includes('spare34')" />
-      <el-table-column label="主要包装方式" align="left" prop="spare35" width="120" v-if="queryParams.groupFields.includes('spare35')" />
+      <el-table-column label="主要包装方式" align="left" prop="spare35" width="160" v-if="queryParams.groupFields.includes('spare35')" />
-      <el-table-column label="长" align="right" prop="spare36" width="120" v-if="queryParams.groupFields.includes('spare36')" />
+      <el-table-column label="长" align="right" prop="spare36" width="160" v-if="queryParams.groupFields.includes('spare36')" />
-      <el-table-column label="宽" align="right" prop="spare37" width="120" v-if="queryParams.groupFields.includes('spare37')" />
+      <el-table-column label="宽" align="right" prop="spare37" width="160" v-if="queryParams.groupFields.includes('spare37')" />
-      <el-table-column label="高" align="right" prop="spare38" width="120" v-if="queryParams.groupFields.includes('spare38')" />
+      <el-table-column label="高" align="right" prop="spare38" width="160" v-if="queryParams.groupFields.includes('spare38')" />
-      <el-table-column label="包装材积" align="center" prop="spare39" width="120" v-if="queryParams.groupFields.includes('spare39')" />
+      <el-table-column label="包装材积" align="center" prop="spare39" width="160" v-if="queryParams.groupFields.includes('spare39')" />
-      <el-table-column label="备注" align="left" prop="remark" width="120" />
+      <el-table-column label="备注" align="left" prop="remark" width="160" />
     </el-table>
 
     <pagination
@@ -227,6 +239,7 @@ export default {
         unit: null,
         lotNo: null,
         warehouseId: null,
+        orderId:null,
         roadwayId: null,
         quantity: null,
         parentId: null,
@@ -279,6 +292,7 @@ export default {
       'parentId',
       'cargoNo',
       'roadwayId',
+      'orderId',
       'spare3',
       'spare4',
       'spare5',
@@ -367,6 +381,7 @@ export default {
       this.queryParams.groupFields = [
         'parentId',
         'cargoNo',
+        'orderId',
         'roadwayId',
         'spare3',
         'spare4',
@@ -395,6 +410,16 @@ export default {
         'spare27',
         'spare28',
         'spare29',
+        'spare30',
+        'spare31',
+        'spare32',
+        'spare33',
+        'spare34',
+        'spare35',
+        'spare36',
+        'spare37',
+        'spare38',
+        'spare39',
         'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
         'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
       ];

ruoyi-ui/src/views/search/ViewInJobFlow/index.vue

@@ -9,32 +9,32 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="子作业ID" prop="jobDetailId">
+<!--      <el-form-item label="子作业ID" prop="jobDetailId">-->
-        <el-input
-          v-model="queryParams.jobDetailId"
-          placeholder="请输入子作业ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.mydo_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="任务号" prop="taskNo">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.taskNo"-->
+<!--          v-model="queryParams.jobDetailId"-->
-<!--          placeholder="请输入任务号"-->
+<!--          placeholder="请输入子作业ID"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
+<!--      <el-form-item label="状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.mydo_job_status"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="任务号" prop="taskNo">
+        <el-input
+          v-model="queryParams.taskNo"
+          placeholder="请输入任务号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="托盘号" prop="trayCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.trayCode"-->
@@ -109,7 +109,7 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="入库作业类型" prop="inOrOut">
+      <el-form-item label="作业类型" prop="inOrOut">
         <el-select v-model="queryParams.inOrOut" placeholder="请选择入库作业类型" clearable>
           <el-option
             v-for="dict in dict.type.in_job_type"
@@ -207,18 +207,26 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="品号" prop="productId">
+      <el-form-item label="订单号" prop="lineId">
         <el-input
-          v-model="queryParams.productId"
+          v-model="queryParams.lineId"
-          placeholder="请输入品名"
+          placeholder="请输入订单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品名" prop="productName">
+      <el-form-item label="物料编号" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入物料编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入品名"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -624,33 +632,38 @@
 <!--          v-hasPermi="['search:ViewInJobFlow:remove']"-->
 <!--        >删除</el-button>-->
 <!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
+      <el-col :span="1.5">
-<!--        <el-button-->
+        <el-button
-<!--          type="warning"-->
+          type="warning"
-<!--          plain-->
+          plain
-<!--          icon="el-icon-download"-->
+          icon="el-icon-download"
-<!--          size="mini"-->
+          size="mini"
-<!--          @click="handleExport"-->
+          @click="handleExport"
-<!--          v-hasPermi="['search:ViewInJobFlow:export']"-->
+          v-hasPermi="['search:ViewInJobFlow:export']"
-<!--        >导出</el-button>-->
+        >导出</el-button>
-<!--      </el-col>-->
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column width="120" label="作业ID" align="left" prop="jobId" />
+      <el-table-column width="160" label="作业ID" align="left" prop="jobId" />
-      <el-table-column width="120" label="子作业ID" align="left" prop="jobDetailId" />
+      <el-table-column width="160" label="子作业ID" align="left" prop="jobDetailId" />
-      <el-table-column width="120" label="状态" align="center" prop="status">
+
+      <el-table-column label="作业类型" align="center" prop="inOrOut" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="任务号" align="left" prop="taskNo" />
+      <el-table-column width="160" label="任务号" align="left" prop="taskNo" />
+      <el-table-column width="160" label="订单号" align="left" prop="lineId" />
+
+      <el-table-column width="160" label="物料编号" align="left" prop="productId" />
+      <el-table-column width="160" label="物料名称" align="left" prop="productName" />
 <!--      <el-table-column label="托盘号" align="center" prop="trayCode" />-->
-      <el-table-column width="120" label="巷道ID" align="left" prop="roadwayId" />
+      <el-table-column width="160" label="巷道ID" align="left" prop="roadwayId" />
 <!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
-      <el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
+      <el-table-column width="160" label="货位名称" align="left" prop="cargoSpaceName" />
 <!--      <el-table-column label="排" align="center" prop="thePlatoon" />-->
 <!--      <el-table-column label="列" align="center" prop="theColumn" />-->
 <!--      <el-table-column label="层" align="center" prop="theFloor" />-->
@@ -660,31 +673,35 @@
 <!--          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="作业类型" align="center" prop="inOrOut" >
+      <el-table-column  label="状态" align="center" prop="status">
         <template slot-scope="scope">
-                    <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
-                  </template>
+        </template>
       </el-table-column>
-      <el-table-column width="120" label="入口ID" align="left" prop="entranceId" />
+      <el-table-column width="160" label="入口ID" align="left" prop="entranceId" />
+
 <!--      <el-table-column label="物料ID" align="center" prop="wlbh" />-->
-      <el-table-column width="120" label="批号" align="left" prop="lotNo" />
+      <el-table-column width="160" label="批号" align="left" prop="lotNo" />
 <!--      <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
 <!--      <el-table-column label="库存状态" align="center" prop="stockStatus" />-->
-      <el-table-column width="120" label="入库数量" align="right" prop="inQuantity" />
+      <el-table-column width="160" label="单据ID" align="left" prop="inOrOutId" />
-      <el-table-column width="120" label="单据ID" align="left" prop="inOrOutId" />
+      <el-table-column width="160" label="子单据ID" align="left" prop="inOrOutDId" />
-      <el-table-column width="120" label="子单据ID" align="left" prop="inOrOutDId" />
+      <el-table-column width="160" label="创建时间" align="left">
-      <el-table-column width="150" label="创建时间" align="left" prop="createTime" />
+        <template slot-scope="scope">
+          {{ formatDateTime(scope.row.createTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column width="160" label="入库数量" align="right" prop="inQuantity" />
 <!--      <el-table-column label="开始时间" align="center" prop="startTime" />-->
 <!--      <el-table-column label="结束时间" align="center" prop="finishTime" />-->
 <!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
 <!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-      <el-table-column width="120" label="品号" align="left" prop="productId" />
+
-      <el-table-column width="120" label="品名" align="left" prop="productName" />
+      <el-table-column width="160" label="品号描述" align="left" prop="price" />
-      <el-table-column width="120" label="品号描述" align="left" prop="price" />
+      <el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
-      <el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
+<!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
-      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />
+      <el-table-column width="160" label="图号" align="left" prop="unit" />
-      <el-table-column width="120" label="图号" align="left" prop="unit" />
+      <el-table-column width="160" label="规格" align="left" prop="spec" />
-      <el-table-column width="120" label="规格" align="left" prop="spec" />
 <!--      <el-table-column label="型号" align="center" prop="spare1" />-->
 <!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
 <!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -693,38 +710,38 @@
 <!--      <el-table-column label="功率" align="center" prop="spare6" />-->
 <!--      <el-table-column label="相位" align="center" prop="spare7" />-->
 <!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
-      <el-table-column width="120" label="NC号" align="left" prop="spare9" />
+      <el-table-column width="160" label="NC号" align="left" prop="spare9" />
-      <el-table-column width="120" label="电源线" align="left" prop="spare10" />
+      <el-table-column width="160" label="电源线" align="left" prop="spare10" />
-      <el-table-column width="120" label="插头" align="left" prop="spare11" />
+      <el-table-column width="160" label="插头" align="left" prop="spare11" />
-      <el-table-column width="120" label="接嘴" align="left" prop="spare12" />
+      <el-table-column width="160" label="接嘴" align="left" prop="spare12" />
-      <el-table-column width="120" label="快捷码" align="left" prop="spare13" />
+      <el-table-column width="160" label="快捷码" align="left" prop="spare13" />
-      <el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
+      <el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
-      <el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
+      <el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
-      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="160" label="品号群组" align="left" prop="spare16" />
-      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="160" label="归类品" align="left" prop="spare17" />
-      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="160" label="计量体系" align="left" prop="spare18" />
-      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="160" label="群组名称" align="left" prop="spare19" />
-      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="160" label="批号管理" align="left" prop="spare20" />
-      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="160" label="状态" align="left" prop="spare21" />
-      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="160" label="产品大类" align="left" prop="spare22" />
-      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="160" label="产品二类" align="left" prop="spare23" />
-      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
-      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
-      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="160" label="产品定位" align="left" prop="spare26" />
-      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
-      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="160" label="非标要求" align="left" prop="spare28" />
-      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="160" label="品牌" align="left" prop="spare29" />
-      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
-      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="160" label="主颜色" align="left" prop="spare31" />
-      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
-      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
-      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="160" label="包装方式" align="left" prop="spare34" />
-      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
-      <el-table-column width="120" label="长" align="righ" prop="spare36" />
+      <el-table-column width="160" label="长" align="righ" prop="spare36" />
-      <el-table-column width="120" label="宽" align="righ" prop="spare37" />
+      <el-table-column width="160" label="宽" align="righ" prop="spare37" />
-      <el-table-column width="120" label="高" align="righ" prop="spare38" />
+      <el-table-column width="160" label="高" align="righ" prop="spare38" />
-      <el-table-column width="120" label="包装材积" align="righ" prop="spare39" />
+      <el-table-column width="160" label="包装材积" align="righ" prop="spare39" />
-      <el-table-column width="120" label="描述" align="left" prop="remark" />
+      <el-table-column width="160" label="描述" align="left" prop="remark" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
@@ -1113,12 +1130,24 @@ export default {
   methods: {
     /** 查询入库作业流水列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       listViewInJobFlow(this.queryParams).then(response => {
-        this.ViewInJobFlowList = response.rows
+        this.ViewInJobFlowList = response.rows;
-        this.total = response.total
+        this.total = response.total;
-        this.loading = false
+        this.loading = false;
-      })
+      });
+    },
+    // 格式化日期时间为 yyyy-MM-dd HH:mm:ss
+    formatDateTime(dateTimeStr) {
+      if (!dateTimeStr) return '';
+      const date = new Date(dateTimeStr);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      const hours = String(date.getHours()).padStart(2, '0');
+      const minutes = String(date.getMinutes()).padStart(2, '0');
+      const seconds = String(date.getSeconds()).padStart(2, '0');
+      return `${year}-${month}-${day}  ${hours}:${minutes}:${seconds}`;
     },
     // 取消按钮
     cancel() {

ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue

@@ -9,32 +9,32 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="子作业ID" prop="jobDetailId">
+<!--      <el-form-item label="子作业ID" prop="jobDetailId">-->
-        <el-input
-          v-model="queryParams.jobDetailId"
-          placeholder="请输入子作业ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.mydo_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="任务号" prop="taskNo">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.taskNo"-->
+<!--          v-model="queryParams.jobDetailId"-->
-<!--          placeholder="请输入任务号"-->
+<!--          placeholder="请输入子作业ID"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
+<!--      <el-form-item label="状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.mydo_job_status"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="任务号" prop="taskNo">
+        <el-input
+          v-model="queryParams.taskNo"
+          placeholder="请输入任务号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="托盘码" prop="trayCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.trayCode"-->
@@ -109,16 +109,16 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="作业类型" prop="inOrOut">
+<!--      <el-form-item label="作业类型" prop="inOrOut">-->
-        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
+<!--        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>-->
-          <el-option
+<!--          <el-option-->
-            v-for="dict in dict.type.out_job_type"
+<!--            v-for="dict in dict.type.out_job_type"-->
-            :key="dict.value"
+<!--            :key="dict.value"-->
-            :label="dict.label"
+<!--            :label="dict.label"-->
-            :value="dict.value"
+<!--            :value="dict.value"-->
-          />
+<!--          />-->
-        </el-select>
+<!--        </el-select>-->
-      </el-form-item>
+<!--      </el-form-item>-->
 <!--      <el-form-item label="出口ID" prop="exitId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.exitId"-->
@@ -223,18 +223,26 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="品号" prop="productId">
+      <el-form-item label="订单号" prop="lineId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入品号"
+          placeholder="请输入订单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品名" prop="productName">
+      <el-form-item label="物料编码" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入品名"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -662,18 +670,21 @@
 
     <el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column width="120" label="作业ID" align="left" prop="jobId" />
+      <el-table-column width="160" label="作业ID" align="left" prop="jobId" />
-      <el-table-column width="120" label="子作业ID" align="left" prop="jobDetailId" />
+      <el-table-column width="160" label="子作业ID" align="left" prop="jobDetailId" />
-      <el-table-column width="120" label="状态" align="center" prop="status">
+      <el-table-column width="160" label="作业类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="任务号" align="left" prop="taskNo" />
+      <el-table-column width="160" label="任务号" align="left" prop="taskNo" />
-      <el-table-column width="120" label="托盘码" align="left" prop="trayCode" />
+      <el-table-column width="160" label="订单号" align="left" prop="lineId" />
-      <el-table-column width="120" label="巷道ID" align="left" prop="roadwayId" />
+      <el-table-column width="160" label="物料编码" align="left" prop="productId" />
+      <el-table-column width="160" label="物料名称" align="left" prop="productName" />
+      <el-table-column width="160" label="托盘码" align="left" prop="trayCode" />
+      <el-table-column width="160" label="巷道ID" align="left" prop="roadwayId" />
 <!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
-      <el-table-column width="120" label="货位名称" align="left" prop="cargoSpaceName" />
+      <el-table-column width="160" label="货位名称" align="left" prop="cargoSpaceName" />
 <!--      <el-table-column label="排" align="center" prop="thePlatoon" />-->
 <!--      <el-table-column label="列" align="center" prop="theColumn" />-->
 <!--      <el-table-column label="层" align="center" prop="theFloor" />-->
@@ -683,33 +694,39 @@
 <!--          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column width="120" label="作业类型" align="center" prop="inOrOut">
+
+      <el-table-column width="160" label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="出口ID" align="left" prop="exitId" />
+      <el-table-column width="160" label="出口ID" align="left" prop="exitId" />
 <!--      <el-table-column label="物料ID" align="center" prop="wlbh" />-->
-      <el-table-column width="120" label="批号" align="left" prop="lotNo" />
+      <el-table-column width="160" label="批号" align="left" prop="lotNo" />
 <!--      <el-table-column label="剁型ID" align="center" prop="stackingId" />-->
 <!--      <el-table-column label="库存状态" align="center" prop="stockStatus" />-->
-      <el-table-column width="120" label="出库数量" align="right" prop="outQuantity" />
+
-      <el-table-column width="120" label="回流数量" align="right" prop="giveNum" />
+<!--      <el-table-column width="120" label="回流数量" align="right" prop="giveNum" />-->
-      <el-table-column width="120" label="单据ID" align="left" prop="inOrOutId" />
+      <el-table-column width="160" label="单据ID" align="left" prop="inOrOutId" />
-      <el-table-column width="120" label="子单据ID" align="left" prop="inOrOutDId" />
+      <el-table-column width="160" label="子单据ID" align="left" prop="inOrOutDId" />
-      <el-table-column width="150" label="创建时间" align="left" prop="createTime" />
+      <el-table-column width="160" label="创建时间" align="left">
-<!--      <el-table-column label="开始时间" align="center" prop="startTime" />-->
+        <template slot-scope="scope">
+          {{ formatDateTime(scope.row.createTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column width="160" label="出库数量" align="right" prop="outQuantity" />
+
+      <!--      <el-table-column label="开始时间" align="center" prop="startTime" />-->
 <!--      <el-table-column label="结束时间" align="center" prop="finishTime" />-->
 <!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
 <!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-      <el-table-column width="120" label="客户名称" align="left" prop="customerName" />
+      <el-table-column width="160" label="客户名称" align="left" prop="customerName" />
-      <el-table-column width="120" label="品号" align="left" prop="productId" />
+
-      <el-table-column width="120" label="品名" align="left" prop="productName" />
+      <el-table-column width="160" label="品号描述" align="left" prop="price" />
-      <el-table-column width="120" label="品号描述" align="left" prop="price" />
+      <el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
-      <el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
+<!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
-      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />
+      <el-table-column width="160" label="图号" align="left" prop="unit" />
-      <el-table-column width="120" label="图号" align="left" prop="unit" />
+      <el-table-column width="160" label="规格" align="left" prop="spec" />
-      <el-table-column width="120" label="规格" align="left" prop="spec" />
 <!--      <el-table-column label="型号" align="center" prop="spare1" />-->
 <!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
 <!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -718,38 +735,38 @@
 <!--      <el-table-column label="功率" align="center" prop="spare6" />-->
 <!--      <el-table-column label="相位" align="center" prop="spare7" />-->
 <!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
-      <el-table-column width="120" label="NC号" align="left" prop="spare9" />
+      <el-table-column width="160" label="NC号" align="left" prop="spare9" />
-      <el-table-column width="120" label="电源线" align="left" prop="spare10" />
+      <el-table-column width="160" label="电源线" align="left" prop="spare10" />
-      <el-table-column width="120" label="插头" align="left" prop="spare11" />
+      <el-table-column width="160" label="插头" align="left" prop="spare11" />
-      <el-table-column width="120" label="接嘴" align="left" prop="spare12" />
+      <el-table-column width="160" label="接嘴" align="left" prop="spare12" />
-      <el-table-column width="120" label="快捷码" align="left" prop="spare13" />
+      <el-table-column width="160" label="快捷码" align="left" prop="spare13" />
-      <el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
+      <el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
-      <el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
+      <el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
-      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="160" label="品号群组" align="left" prop="spare16" />
-      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="160" label="归类品" align="left" prop="spare17" />
-      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="160" label="计量体系" align="left" prop="spare18" />
-      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="160" label="群组名称" align="left" prop="spare19" />
-      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="160" label="批号管理" align="left" prop="spare20" />
-      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="160" label="状态" align="left" prop="spare21" />
-      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="160" label="产品大类" align="left" prop="spare22" />
-      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="160" label="产品二类" align="left" prop="spare23" />
-      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
-      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
-      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="160" label="产品定位" align="left" prop="spare26" />
-      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
-      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="160" label="非标要求" align="left" prop="spare28" />
-      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="160" label="品牌" align="left" prop="spare29" />
-      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
-      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="160" label="主颜色" align="left" prop="spare31" />
-      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
-      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
-      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="160" label="包装方式" align="left" prop="spare34" />
-      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
-      <el-table-column width="120" label="长" align="right" prop="spare36" />
+      <el-table-column width="160" label="长" align="right" prop="spare36" />
-      <el-table-column width="120" label="宽" align="right" prop="spare37" />
+      <el-table-column width="160" label="宽" align="right" prop="spare37" />
-      <el-table-column width="120" label="高" align="right" prop="spare38" />
+      <el-table-column width="160" label="高" align="right" prop="spare38" />
-      <el-table-column width="120" label="包装材积" align="right" prop="spare39" />
+      <el-table-column width="160" label="包装材积" align="right" prop="spare39" />
-      <el-table-column width="120" label="描述" align="left" prop="remark" />
+      <el-table-column width="160" label="描述" align="left" prop="remark" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
@@ -1168,6 +1185,18 @@ export default {
       this.open = false
       this.reset()
     },
+    // 格式化日期时间为 yyyy-MM-dd HH:mm:ss
+    formatDateTime(dateTimeStr) {
+      if (!dateTimeStr) return '';
+      const date = new Date(dateTimeStr);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      const hours = String(date.getHours()).padStart(2, '0');
+      const minutes = String(date.getMinutes()).padStart(2, '0');
+      const seconds = String(date.getSeconds()).padStart(2, '0');
+      return `${year}-${month}-${day}  ${hours}:${minutes}:${seconds}`;
+    },
     // 表单重置
     reset() {
       this.form = {

ruoyi-ui/src/views/search/ViewStockDetail/index.vue

@@ -20,6 +20,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="订单号" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!-- <el-form-item label="入库单号" prop="stockinDetailId" style="white-space: nowrap">
         <el-input
           v-model="queryParams.stockinDetailId"
@@ -29,43 +37,50 @@
         />
       </el-form-item> -->
 
-      <el-form-item label="品号" prop="productId">
+      <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入品号"
+          placeholder="请输入物料编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品名" prop="productName">
+      <el-form-item label="物料名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入品名"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="托盘条码" prop="trayCode">
-      <el-form-item label="物料状态" prop="productStatus">
+        <el-input
-        <el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>
+          v-model="queryParams.trayCode"
-          <el-option
+          placeholder="请输入托盘条码"
-            v-for="dict in dict.type.product_status"
+          clearable
-            :key="dict.value"
+          @keyup.enter.native="handleQuery"
-            :label="dict.label"
+        />
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="库存状态" prop="stockStatus">
-        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
-          <el-option
-            v-for="dict in dict.type.stock_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
       </el-form-item>
+<!--      <el-form-item label="物料状态" prop="productStatus">-->
+<!--        <el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.product_status"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="库存状态" prop="stockStatus">-->
+<!--        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.stock_status"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">清空</el-button>
@@ -113,7 +128,7 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['search:ViewStockDetail:export']"
-        >导出Excel</el-button>
+        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -121,48 +136,49 @@
     <el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="right" prop="onlyIdentity" width="80"/> -->
-      <el-table-column label="库存ID" align="left" prop="stockId" width="120"/>
+      <el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
-      <el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>
+      <el-table-column label="订单号" align="left" prop="orderId" width="160"/>
-      <el-table-column label="托盘条码" align="left" prop="trayCode" width="120"/>
+      <el-table-column label="物料编号" align="left" prop="productId" width="160"/>
-      <el-table-column label="数量" align="right" prop="quantity" width="120"/>
+      <el-table-column label="物料名称" align="left" prop="productName" width="160"/>
-      <el-table-column label="作业ID" align="left" prop="jobId" width="120"/>
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160"/>
+      <!--      <el-table-column label="货位ID" align="left" prop="cargoSpaceId" width="120"/>-->
+      <el-table-column label="托盘条码" align="left" prop="trayCode" width="160"/>
+<!--      <el-table-column label="数量" align="right" prop="quantity" width="120"/>-->
+      <el-table-column label="作业ID" align="left" prop="jobId" width="160"/>
       <el-table-column label="批号" align="left" prop="lotNo" width="120"/>
-      <el-table-column label="入库子单ID" align="left" prop="stockinDetailId" width="120"/>
+      <el-table-column label="入库子单ID" align="left" prop="stockinDetailId" width="160"/>
-      <el-table-column label="入库时间" align="left" prop="inDate" width="120"/>
+      <el-table-column label="入库时间" align="left" prop="inDate" width="160"/>
-      <el-table-column label="仓库ID" align="left" prop="warehouseId" width="120"/>
+<!--      <el-table-column label="仓库ID" align="left" prop="warehouseId" width="120"/>-->
-      <el-table-column label="仓库名称" align="left" prop="warehouseName" width="120"/>
+<!--      <el-table-column label="仓库名称" align="left" prop="warehouseName" width="120"/>-->
-      <el-table-column label="垛型ID" align="left" prop="stackingId" width="120"/>
+<!--      <el-table-column label="垛型ID" align="left" prop="stackingId" width="120"/>-->
-      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120"/>
+      <el-table-column label="巷道ID" align="left" prop="roadwayId" width="160"/>
-      <el-table-column label="巷道ID" align="left" prop="roadwayId" width="120"/>
+      <el-table-column label="货位状态" align="left" prop="cargoSpaceStatus" width="160">
-      <el-table-column label="货位状态" align="left" prop="cargoSpaceStatus" width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="库存状态" align="left" prop="stockStatus" width="120">
+      <el-table-column label="库存状态" align="left" prop="stockStatus" width="160">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="物料状态" align="left" prop="productStatus" width="120">
+      <el-table-column label="物料状态" align="left" prop="productStatus" width="160">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否锁定" align="left" prop="locked" width="120">
+<!--      <el-table-column label="是否锁定" align="left" prop="locked" width="160">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
+<!--          <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
       <!-- <el-table-column label="物料GUID" align="left" prop="productGuid" width="180"/> -->
-      <el-table-column label="品名" align="left" prop="productId" width="120"/>
+      <el-table-column label="规格" align="left" prop="spec" width="160"/>
-      <el-table-column label="品号" align="left" prop="productName" width="120"/>
-      <el-table-column label="规格" align="left" prop="spec" width="120"/>
       <!-- <el-table-column label="单位" align="left" prop="unit" width="100"/> -->
-      <el-table-column label="价格" align="right" prop="price" width="120"/>
+      <el-table-column label="价格" align="right" prop="price" width="160"/>
-      <el-table-column label="产品分类" align="left" prop="parentId" width="120"/>
+      <el-table-column label="产品分类" align="left" prop="parentId" width="160"/>
-      <el-table-column label="品号描述" align="left" prop="cargoNo" width="120"/>
+      <el-table-column label="品号描述" align="left" prop="cargoNo" width="160"/>
-      <el-table-column label="英文名称" align="left" prop="spare1" width="120"/>
+      <el-table-column label="英文名称" align="left" prop="spare1" width="160"/>
       <!-- <el-table-column label="单件净重" align="right" prop="spare2" width="120"/> -->
       <!-- <el-table-column label="颜色" align="left" prop="spare3" width="120"/> -->
       <!-- <el-table-column label="序列号" align="left" prop="spare4" width="120"/> -->
@@ -170,38 +186,38 @@
       <!-- <el-table-column label="功率" align="left" prop="spare6" width="120"/> -->
       <!-- <el-table-column label="相位" align="left" prop="spare7" width="120"/> -->
       <!-- <el-table-column label="毛重" align="right" prop="spare8" width="120"/> -->
-      <el-table-column label="NC号" align="left" prop="spare9" width="120"/>
+      <el-table-column label="NC号" align="left" prop="spare9" width="160"/>
-      <el-table-column label="电源线" align="left" prop="spare10" width="120"/>
+      <el-table-column label="电源线" align="left" prop="spare10" width="160"/>
-      <el-table-column label="插头" align="left" prop="spare11" width="120"/>
+      <el-table-column label="插头" align="left" prop="spare11" width="160"/>
-      <el-table-column label="接嘴" align="left" prop="spare12" width="120"/>
+      <el-table-column label="接嘴" align="left" prop="spare12" width="160"/>
-      <el-table-column label="快捷码" align="left" prop="spare13" width="120"/>
+      <el-table-column label="快捷码" align="left" prop="spare13" width="160"/>
-      <el-table-column label="库存单位编号" align="left" prop="spare14" width="120"/>
+      <el-table-column label="库存单位编号" align="left" prop="spare14" width="160"/>
-      <el-table-column label="库存单位名称" align="left" prop="spare15" width="120"/>
+      <el-table-column label="库存单位名称" align="left" prop="spare15" width="160"/>
-      <el-table-column label="品号群组" align="left" prop="spare16" width="120"/>
+      <el-table-column label="品号群组" align="left" prop="spare16" width="160"/>
-      <el-table-column label="归类品" align="left" prop="spare17" width="120"/>
+      <el-table-column label="归类品" align="left" prop="spare17" width="160"/>
-      <el-table-column label="计量体系" align="left" prop="spare18" width="120"/>
+      <el-table-column label="计量体系" align="left" prop="spare18" width="160"/>
-      <el-table-column label="群组名称" align="left" prop="spare19" width="120"/>
+      <el-table-column label="群组名称" align="left" prop="spare19" width="160"/>
-      <el-table-column label="批号管理" align="left" prop="spare20" width="120"/>
+      <el-table-column label="批号管理" align="left" prop="spare20" width="160"/>
-      <el-table-column label="状态" align="left" prop="spare21" width="120"/>
+      <el-table-column label="状态" align="left" prop="spare21" width="160"/>
-      <el-table-column label="产品大类" align="left" prop="spare22" width="120"/>
+      <el-table-column label="产品大类" align="left" prop="spare22" width="160"/>
-      <el-table-column label="产品二类" align="left" prop="spare23" width="120"/>
+      <el-table-column label="产品二类" align="left" prop="spare23" width="160"/>
-      <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="120"/>
+      <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160"/>
-      <el-table-column label="BOM状态" align="left" prop="spare25" width="120"/>
+      <el-table-column label="BOM状态" align="left" prop="spare25" width="160"/>
-      <el-table-column label="产品定位" align="left" prop="spare26" width="120"/>
+      <el-table-column label="产品定位" align="left" prop="spare26" width="160"/>
-      <el-table-column label="电脑板型号" align="left" prop="spare27" width="120"/>
+      <el-table-column label="电脑板型号" align="left" prop="spare27" width="160"/>
-      <el-table-column label="非标要求" align="left" prop="spare28" width="120"/>
+      <el-table-column label="非标要求" align="left" prop="spare28" width="160"/>
-      <el-table-column label="品牌" align="left" prop="spare29" width="120"/>
+      <el-table-column label="品牌" align="left" prop="spare29" width="160"/>
-      <el-table-column label="非标颜色" align="left" prop="spare30" width="120"/>
+      <el-table-column label="非标颜色" align="left" prop="spare30" width="160"/>
-      <el-table-column label="主颜色" align="left" prop="spare31" width="120"/>
+      <el-table-column label="主颜色" align="left" prop="spare31" width="160"/>
-      <el-table-column label="辅助颜色" align="left" prop="spare32" width="120"/>
+      <el-table-column label="辅助颜色" align="left" prop="spare32" width="160"/>
-      <el-table-column label="是否标准款" align="left" prop="spare33" width="120"/>
+      <el-table-column label="是否标准款" align="left" prop="spare33" width="160"/>
-      <el-table-column label="包装方式" align="left" prop="spare34" width="120"/>
+      <el-table-column label="包装方式" align="left" prop="spare34" width="160"/>
-      <el-table-column label="主要包装方式" align="left" prop="spare35" width="120"/>
+      <el-table-column label="主要包装方式" align="left" prop="spare35" width="160"/>
-      <el-table-column label="长" align="right" prop="spare36" width="120"/>
+      <el-table-column label="长" align="right" prop="spare36" width="160"/>
-      <el-table-column label="宽" align="right" prop="spare37" width="120"/>
+      <el-table-column label="宽" align="right" prop="spare37" width="160"/>
-      <el-table-column label="高" align="right" prop="spare38" width="120"/>
+      <el-table-column label="高" align="right" prop="spare38" width="160"/>
-      <el-table-column label="包装材积" align="right" prop="spare39" width="120"/>
+      <el-table-column label="包装材积" align="right" prop="spare39" width="160"/>
-      <el-table-column label="描述" align="left" prop="remark" width="120"/>
+      <el-table-column label="描述" align="left" prop="remark" width="160"/>
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->

ruoyi-ui/src/views/search/ViewStockinHistory/index.vue

@@ -27,14 +27,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createDate">
+<!--      <el-form-item label="创建时间" prop="createDate">-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.createDate"
+<!--          v-model="queryParams.createDate"-->
-          placeholder="请输入创建时间"
+<!--          placeholder="请输入创建时间"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
 <!--      <el-form-item label="创建人" prop="createManId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.createManId"-->
@@ -43,16 +43,16 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="单据状态" prop="status">
+<!--      <el-form-item label="单据状态" prop="status">-->
-        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+<!--        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>-->
-          <el-option
+<!--          <el-option-->
-            v-for="dict in dict.type.in_bill_status"
+<!--            v-for="dict in dict.type.in_bill_status"-->
-            :key="dict.value"
+<!--            :key="dict.value"-->
-            :label="dict.label"
+<!--            :label="dict.label"-->
-            :value="dict.value"
+<!--            :value="dict.value"-->
-          />
+<!--          />-->
-        </el-select>
+<!--        </el-select>-->
-      </el-form-item>
+<!--      </el-form-item>-->
 <!--      <el-form-item label="仓库ID" prop="warehouseId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.warehouseId"-->
@@ -69,10 +69,10 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="ERP单号" prop="erpBill">
+      <el-form-item label="订单号" prop="erpBill">
         <el-input
           v-model="queryParams.erpBill"
-          placeholder="请输入ERP单号"
+          placeholder="请输入订单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -237,16 +237,16 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="库存状态" prop="stockStatus">
+<!--      <el-form-item label="库存状态" prop="stockStatus">-->
-        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
+<!--        <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>-->
-          <el-option
+<!--          <el-option-->
-            v-for="dict in dict.type.stock_status"
+<!--            v-for="dict in dict.type.stock_status"-->
-            :key="dict.value"
+<!--            :key="dict.value"-->
-            :label="dict.label"
+<!--            :label="dict.label"-->
-            :value="dict.value"
+<!--            :value="dict.value"-->
-          />
+<!--          />-->
-        </el-select>
+<!--        </el-select>-->
-      </el-form-item>
+<!--      </el-form-item>-->
 <!--      <el-form-item label="物料主键" prop="productGuid">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.productGuid"-->
@@ -694,33 +694,35 @@
     <el-table v-loading="loading" :data="ViewStockinHistoryList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="入库单guid" align="center" prop="stockinGuid" />-->
-      <el-table-column label="入库单号" align="left"  prop="stockinId" width="120"/>
+      <el-table-column label="入库单号" align="left"  prop="stockinId" width="160"/>
-      <el-table-column label="入库子单号" align="left" prop="stockinDetailId"  width="120"/>
+      <el-table-column label="入库子单号" align="left" prop="stockinDetailId"  width="160"/>
       <el-table-column label="入库类型" align="center" prop="inType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createDate" width="150"/>
+      <el-table-column label="创建时间" align="center" prop="createDate" width="160"/>
-<!--      <el-table-column label="创建人" align="center" prop="createManId" />-->
+      <el-table-column label="创建人" align="center" prop="createManId" width="160"/>
+<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+<!--      <el-table-column label="完成时间" align="center" prop="finishDate" />-->
+      <el-table-column label="订单号" align="left" prop="erpBill" width="160"/>
+      <el-table-column label="物料编码" align="left" prop="productId" width="160"/>
+      <el-table-column label="物料名称" align="left" prop="productName" width="160"/>
+<!--      <el-table-column label="单据来源" align="center" prop="stockSource" />-->
+<!--      <el-table-column label="部门编码" align="center" prop="departmentNo" />-->
+<!--      <el-table-column label="班组编码" align="center" prop="classNo" />-->
+<!--      <el-table-column label="供应商编号" align="center" prop="supplierNo" />-->
+      <el-table-column label="供应商名称" align="left" prop="supplierName" width="160"/>
       <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
-<!--      <el-table-column label="完成时间" align="center" prop="finishDate" />-->
-      <el-table-column label="ERP单号" align="left" prop="erpBill" width="120"/>
-<!--      <el-table-column label="单据来源" align="center" prop="stockSource" />-->
-<!--      <el-table-column label="部门编码" align="center" prop="departmentNo" />-->
-<!--      <el-table-column label="班组编码" align="center" prop="classNo" />-->
-<!--      <el-table-column label="供应商编号" align="center" prop="supplierNo" />-->
-      <el-table-column label="供应商名称" align="left" prop="supplierName" width="120"/>
 <!--      <el-table-column label="供应商简称" align="center" prop="simpleName" />-->
 <!--      <el-table-column label="联系人" align="center" prop="contactName" />-->
 <!--      <el-table-column label="联系电话" align="center" prop="contactNumber" />-->
 <!--      <el-table-column label="供应商地址" align="center" prop="address" />-->
-<!--      <el-table-column label="批次号" align="center" prop="lotNo" />-->
+      <el-table-column label="批次号" align="center" prop="lotNo" width="160"/>
 <!--      <el-table-column label="计划数量" align="center" prop="quantity" />-->
 <!--      <el-table-column label="计划箱数" align="center" prop="quantityX" />-->
 <!--      <el-table-column label="计划件数" align="center" prop="quantityJ" />-->
@@ -737,13 +739,11 @@
         </template>
       </el-table-column>
 <!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
-      <el-table-column label="物料编码" align="left" prop="productId" width="120"/>
+<!--      <el-table-column label="产品分类" align="left" prop="parentId" width="120"/>-->
-      <el-table-column label="物料名称" align="left" prop="productName" width="120"/>
+      <el-table-column label="品号描述" align="left" prop="price" width="160"/>
-      <el-table-column label="产品分类" align="left" prop="parentId" width="120"/>
+      <el-table-column label="英文描述" align="left" prop="cargoNo" width="160"/>
-      <el-table-column label="品号描述" align="left" prop="price" width="120"/>
+      <el-table-column label="图号" align="left" prop="unit" width="160"/>
-      <el-table-column label="英文描述" align="left" prop="cargoNo" width="120"/>
+      <el-table-column label="规格" align="left" prop="spec" width="160"/>
-      <el-table-column label="图号" align="left" prop="unit" width="120"/>
-      <el-table-column label="规格" align="left" prop="spec" width="120"/>
 <!--      <el-table-column label="型号" align="center" prop="spare1" />-->
 <!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
 <!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -752,39 +752,39 @@
 <!--      <el-table-column label="功率" align="center" prop="spare6" />-->
 <!--      <el-table-column label="相位" align="center" prop="spare7" />-->
 <!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
-      <el-table-column label="NC号" align="left" prop="spare9" width="120"/>
+      <el-table-column label="NC号" align="left" prop="spare9" width="160"/>
-      <el-table-column label="电源线" align="left" prop="spare10" width="120"/>
+      <el-table-column label="电源线" align="left" prop="spare10" width="160"/>
-      <el-table-column label="插头" align="left" prop="spare11" width="120"/>
+      <el-table-column label="插头" align="left" prop="spare11" width="160"/>
-      <el-table-column label="接嘴" align="left" prop="spare12" width="120"/>
+      <el-table-column label="接嘴" align="left" prop="spare12" width="160"/>
-      <el-table-column label="快捷码" align="left" prop="spare13" width="120"/>
+      <el-table-column label="快捷码" align="left" prop="spare13" width="160"/>
-      <el-table-column label="库存单位编号" align="left" prop="spare14" width="120"/>
+      <el-table-column label="库存单位编号" align="left" prop="spare14" width="160"/>
-      <el-table-column label="库存单位名称" align="left" prop="spare15" width="120"/>
+      <el-table-column label="库存单位名称" align="left" prop="spare15" width="160"/>
-      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="160" label="品号群组" align="left" prop="spare16" />
-      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="160" label="归类品" align="left" prop="spare17" />
-      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="160" label="计量体系" align="left" prop="spare18" />
-      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="160" label="群组名称" align="left" prop="spare19" />
-      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="160" label="批号管理" align="left" prop="spare20" />
-      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="160" label="状态" align="left" prop="spare21" />
-      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="160" label="产品大类" align="left" prop="spare22" />
-      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="160" label="产品二类" align="left" prop="spare23" />
-      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
-      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
-      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="160" label="产品定位" align="left" prop="spare26" />
-      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
-      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="160" label="非标要求" align="left" prop="spare28" />
-      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="160" label="品牌" align="left" prop="spare29" />
-      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
-      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="160" label="主颜色" align="left" prop="spare31" />
-      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
-      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
-      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="160" label="包装方式" align="left" prop="spare34" />
-      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
-      <el-table-column width="120" label="长" align="right" prop="spare36" />
+      <el-table-column width="160" label="长" align="right" prop="spare36" />
-      <el-table-column width="120" label="宽" align="right" prop="spare37" />
+      <el-table-column width="160" label="宽" align="right" prop="spare37" />
-      <el-table-column width="120" label="高" align="right" prop="spare38" />
+      <el-table-column width="160" label="高" align="right" prop="spare38" />
-      <el-table-column width="120" label="包装材积" align="right" prop="spare39" />
+      <el-table-column width="160" label="包装材积" align="right" prop="spare39" />
-      <el-table-column width="120" label="仓库名称" align="left" prop="warehouseName" />
+<!--      <el-table-column width="160" label="仓库名称" align="left" prop="warehouseName" />-->
-      <el-table-column width="120" label="描述" align="left" prop="remark" />
+      <el-table-column width="160" label="描述" align="left" prop="remark" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->

ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue

@@ -35,16 +35,16 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="出库状态" prop="status">
+<!--      <el-form-item label="出库状态" prop="status">-->
-        <el-select v-model="queryParams.status" placeholder="请选择出库状态" clearable>
+<!--        <el-select v-model="queryParams.status" placeholder="请选择出库状态" clearable>-->
-          <el-option
+<!--          <el-option-->
-            v-for="dict in dict.type.out_bill_status"
+<!--            v-for="dict in dict.type.out_bill_status"-->
-            :key="dict.value"
+<!--            :key="dict.value"-->
-            :label="dict.label"
+<!--            :label="dict.label"-->
-            :value="dict.value"
+<!--            :value="dict.value"-->
-          />
+<!--          />-->
-        </el-select>
+<!--        </el-select>-->
-      </el-form-item>
+<!--      </el-form-item>-->
 <!--      <el-form-item label="出库来源" prop="stockoutSource">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.stockoutSource"-->
@@ -109,10 +109,10 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="ERP出库单号" prop="erpStockoutId">
+      <el-form-item label="订单号" prop="erpStockoutId">
         <el-input
           v-model="queryParams.erpStockoutId"
-          placeholder="请输入ERP出库单号"
+          placeholder="请输入订单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -571,38 +571,39 @@
 
     <el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column width="120" label="出库单号" align="left" prop="stockoutId" />
+      <el-table-column width="160" label="出库单号" align="left" prop="stockoutId" />
-      <el-table-column width="120" label="出库子单号" align="left" prop="stockoutDetailId" />
+      <el-table-column width="160" label="出库子单号" align="left" prop="stockoutDetailId" />
       <el-table-column label="出库类型" align="center" prop="outType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建日期" align="center" prop="createDate" width="150"/>
+      <el-table-column label="创建日期" align="center" prop="createDate" width="160"/>
-<!--      <el-table-column label="创建人ID" align="center" prop="createManId" />-->
+      <el-table-column label="创建人ID" align="center" prop="createManId" width="160"/>
+
+      <el-table-column width="160" label="订单号" align="left" prop="erpStockoutId" />
+      <el-table-column width="160" label="物料编码" align="left" prop="productId" />
+      <el-table-column width="160" label="物料名称" align="left" prop="productName" />
+<!--      <el-table-column label="出库来源" align="center" prop="stockoutSource" />-->
+      <el-table-column width="160" label="出口" align="left" prop="exitId" />
       <el-table-column label="出库状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="出库来源" align="center" prop="stockoutSource" />-->
+<!--      <el-table-column width="120" label="仓库ID" align="left" prop="warehouseId" />-->
-      <el-table-column width="120" label="出口" align="left" prop="exitId" />
+      <el-table-column width="160" label="出库数量" align="right" prop="quantity" />
-      <el-table-column width="120" label="仓库ID" align="left" prop="warehouseId" />
+      <el-table-column width="160" label="分配数量" align="right" prop="allotQuantity" />
-      <el-table-column width="120" label="批次号" align="left" prop="lotNo" />
-      <el-table-column width="120" label="出库数量" align="right" prop="quantity" />
-      <el-table-column width="120" label="分配数量" align="right" prop="allotQuantity" />
 <!--      <el-table-column label="分配编号" align="center" prop="assignNum" />-->
-      <el-table-column width="120" label="ERP出库单号" align="left" prop="erpStockoutId" />
 <!--      <el-table-column label="客户编号" align="center" prop="entryid" />-->
-      <el-table-column width="120" label="客户名称" align="left" prop="customerName" />
+      <el-table-column width="160" label="批次号" align="left" prop="lotNo" />
-<!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
+      <el-table-column width="160" label="客户名称" align="left" prop="customerName" />
-      <el-table-column width="120" label="物料编码" align="left" prop="productId" />
+      <!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
-      <el-table-column width="120" label="物料名称" align="left" prop="productName" />
+<!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
-      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />
+      <el-table-column width="160" label="品号描述" align="left" prop="price" />
-      <el-table-column width="120" label="品号描述" align="left" prop="price" />
+      <el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
-      <el-table-column width="120" label="英文描述" align="left" prop="cargoNo" />
+      <el-table-column width="160" label="图号" align="left" prop="unit" />
-      <el-table-column width="120" label="图号" align="left" prop="unit" />
+      <el-table-column width="160" label="规格" align="left" prop="spec" />
-      <el-table-column width="120" label="规格" align="left" prop="spec" />
 <!--      <el-table-column label="型号" align="center" prop="spare1" />-->
 <!--      <el-table-column label="单件净重" align="center" prop="spare2" />-->
 <!--      <el-table-column label="颜色" align="center" prop="spare3" />-->
@@ -611,38 +612,38 @@
 <!--      <el-table-column label="功率" align="center" prop="spare6" />-->
 <!--      <el-table-column label="相位" align="center" prop="spare7" />-->
 <!--      <el-table-column label="毛重" align="center" prop="spare8" />-->
-      <el-table-column width="120" label="NC号" align="left" prop="spare9" />
+      <el-table-column width="160" label="NC号" align="left" prop="spare9" />
-      <el-table-column width="120" label="电源线" align="left" prop="spare10" />
+      <el-table-column width="160" label="电源线" align="left" prop="spare10" />
-      <el-table-column width="120" label="插头" align="left" prop="spare11" />
+      <el-table-column width="160" label="插头" align="left" prop="spare11" />
-      <el-table-column width="120" label="接嘴" align="left" prop="spare12" />
+      <el-table-column width="160" label="接嘴" align="left" prop="spare12" />
-      <el-table-column width="120" label="快捷码" align="left" prop="spare13" />
+      <el-table-column width="160" label="快捷码" align="left" prop="spare13" />
-      <el-table-column width="120" label="库存单位编号" align="left" prop="spare14" />
+      <el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
-      <el-table-column width="120" label="库存单位名称" align="left" prop="spare15" />
+      <el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
-      <el-table-column width="120" label="品号群组" align="left" prop="spare16" />
+      <el-table-column width="160" label="品号群组" align="left" prop="spare16" />
-      <el-table-column width="120" label="归类品" align="left" prop="spare17" />
+      <el-table-column width="160" label="归类品" align="left" prop="spare17" />
-      <el-table-column width="120" label="计量体系" align="left" prop="spare18" />
+      <el-table-column width="160" label="计量体系" align="left" prop="spare18" />
-      <el-table-column width="120" label="群组名称" align="left" prop="spare19" />
+      <el-table-column width="160" label="群组名称" align="left" prop="spare19" />
-      <el-table-column width="120" label="批号管理" align="left" prop="spare20" />
+      <el-table-column width="160" label="批号管理" align="left" prop="spare20" />
-      <el-table-column width="120" label="状态" align="left" prop="spare21" />
+      <el-table-column width="160" label="状态" align="left" prop="spare21" />
-      <el-table-column width="120" label="产品大类" align="left" prop="spare22" />
+      <el-table-column width="160" label="产品大类" align="left" prop="spare22" />
-      <el-table-column width="120" label="产品二类" align="left" prop="spare23" />
+      <el-table-column width="160" label="产品二类" align="left" prop="spare23" />
-      <el-table-column width="120" label="产品线/产品系列" align="left" prop="spare24" />
+      <el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
-      <el-table-column width="120" label="BOM状态" align="left" prop="spare25" />
+      <el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
-      <el-table-column width="120" label="产品定位" align="left" prop="spare26" />
+      <el-table-column width="160" label="产品定位" align="left" prop="spare26" />
-      <el-table-column width="120" label="电脑板型号" align="left" prop="spare27" />
+      <el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
-      <el-table-column width="120" label="非标要求" align="left" prop="spare28" />
+      <el-table-column width="160" label="非标要求" align="left" prop="spare28" />
-      <el-table-column width="120" label="品牌" align="left" prop="spare29" />
+      <el-table-column width="160" label="品牌" align="left" prop="spare29" />
-      <el-table-column width="120" label="非标颜色" align="left" prop="spare30" />
+      <el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
-      <el-table-column width="120" label="主颜色" align="left" prop="spare31" />
+      <el-table-column width="160" label="主颜色" align="left" prop="spare31" />
-      <el-table-column width="120" label="辅助颜色" align="left" prop="spare32" />
+      <el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
-      <el-table-column width="120" label="是否标准款" align="left" prop="spare33" />
+      <el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
-      <el-table-column width="120" label="包装方式" align="left" prop="spare34" />
+      <el-table-column width="160" label="包装方式" align="left" prop="spare34" />
-      <el-table-column width="120" label="主要包装方式" align="left" prop="spare35" />
+      <el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
-      <el-table-column width="120" label="长" align="right" prop="spare36" />
+      <el-table-column width="160" label="长" align="right" prop="spare36" />
-      <el-table-column width="120" label="宽" align="right" prop="spare37" />
+      <el-table-column width="160" label="宽" align="right" prop="spare37" />
-      <el-table-column width="120" label="高" align="right" prop="spare38" />
+      <el-table-column width="160" label="高" align="right" prop="spare38" />
-      <el-table-column width="120" label="包装材积" align="right" prop="spare39" />
+      <el-table-column width="160" label="包装材积" align="right" prop="spare39" />
-      <el-table-column width="120" label="描述" align="left" prop="remark" />
+      <el-table-column width="160" label="描述" align="left" prop="remark" />
 <!--      <el-table-column width="120" label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->