优化

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -43,6 +43,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -129,7 +131,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
      */
     @Override
     public int insertMydoJob(MydoJob mydoJob) {
-        mydoJob.setCreateTime(new Date());
+        //时间日期处理 新增
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = sdf.format(new Date());
+        ParsePosition pos = new ParsePosition(0);
+        mydoJob.setCreateTime(sdf.parse(date, pos));
         mydoJob.setJobId(basJobIdService.getJobId("RK"));
         mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
         return mydoJobMapper.insertMydoJob(mydoJob);
@@ -455,12 +461,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 updateMydoJob(job);
                 insertHistory(jobId);
                 //通知wcs
-                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
-                if (ajaxResult.isSuccess()){
-                    return AjaxResult.success();
-                }else {
-                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
-                }
+//                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
+//                if (ajaxResult.isSuccess()){
+//                    return AjaxResult.success();
+//                }else {
+//                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
+//                }
             }
 
         } catch (Exception e) {
@@ -475,23 +481,18 @@ public class MydoJobServiceImpl implements IMydoJobService {
     public AjaxResult pointOut(String[] stockIds, String exitId) {
         HashMap<String, Object> map = new HashMap<>();
         String msg = "";
-        String Stringbuilder = "";
+        StringBuilder builder = new StringBuilder();
         for (String stockId : stockIds) {
             map.put("v_stock_id", stockId);
             map.put("v_exit_id", exitId);
             mydoJobMapper.pointOut(map);
+            msg = map.get("v_resultmsg").toString();
+            builder.append("库存编号：" + stockId + "，分配结果：" + msg + "<br/>");
+        }
         iToWcsService.pushOutMydoJob();
-            String result = map.get("v_result").toString();
-            if (!"10".equals(result)) {
-                Stringbuilder += stockId + msg + "<br/>";
+        if (!StrUtil.isEmpty(builder)) {
+            return AjaxResult.warn(builder.toString());
         }
-
-        }
-
-        if (!StrUtil.isEmpty(Stringbuilder)) {
-            return AjaxResult.warn(Stringbuilder);
-        }
-
         return AjaxResult.success();
     }
 

ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java

@@ -164,447 +164,358 @@ public class ViewHandAllotStock extends BaseEntity
     @Excel(name = "货位名称")
     private String cargoSpaceName;
 
-    private Integer thePlatoon;
-    private Integer theColumn;
-    private Integer theFloor;
+    @Excel(name = "排")
+    private String thePlatoon;
+    @Excel(name = "列")
+    private String theColumn;
+    @Excel(name = "层")
+    private String theFloor;
+    @Excel(name = "巷道")
+    private String roadwayId;
+    private String status;
+    private String locked;
 
-    public void setStockId(String stockId) 
-    {
-        this.stockId = stockId;
-    }
-
-    public String getStockId() 
-    {
+    public String getStockId() {
         return stockId;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId) 
-    {
-        this.cargoSpaceId = cargoSpaceId;
+    public void setStockId(String stockId) {
+        this.stockId = stockId;
     }
 
-    public String getCargoSpaceId() 
-    {
+    public String getCargoSpaceId() {
         return cargoSpaceId;
     }
 
-    public void setStockStatus(String stockStatus) 
-    {
-        this.stockStatus = stockStatus;
+    public void setCargoSpaceId(String cargoSpaceId) {
+        this.cargoSpaceId = cargoSpaceId;
     }
 
-    public String getStockStatus() 
-    {
+    public String getStockStatus() {
         return stockStatus;
     }
 
-    public void setProductStatus(String productStatus) 
-    {
-        this.productStatus = productStatus;
+    public void setStockStatus(String stockStatus) {
+        this.stockStatus = stockStatus;
     }
 
-    public String getProductStatus() 
-    {
+    public String getProductStatus() {
         return productStatus;
     }
 
-    public void setLotNo(String lotNo) 
-    {
-        this.lotNo = lotNo;
+    public void setProductStatus(String productStatus) {
+        this.productStatus = productStatus;
     }
 
-    public String getLotNo() 
-    {
+    public String getLotNo() {
         return lotNo;
     }
 
-    public void setInDate(String inDate) 
-    {
-        this.inDate = inDate;
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
     }
 
-    public String getInDate() 
-    {
+    public String getInDate() {
         return inDate;
     }
 
-    public void setBackDate(String backDate) 
-    {
-        this.backDate = backDate;
+    public void setInDate(String inDate) {
+        this.inDate = inDate;
     }
 
-    public String getBackDate() 
-    {
+    public String getBackDate() {
         return backDate;
     }
 
-    public void setProductGuid(String productGuid) 
-    {
-        this.productGuid = productGuid;
+    public void setBackDate(String backDate) {
+        this.backDate = backDate;
     }
 
-    public String getProductGuid() 
-    {
+    public String getProductGuid() {
         return productGuid;
     }
 
-    public void setQuantity(BigDecimal quantity) 
-    {
-        this.quantity = quantity;
+    public void setProductGuid(String productGuid) {
+        this.productGuid = productGuid;
     }
 
-    public BigDecimal getQuantity() 
-    {
+    public BigDecimal getQuantity() {
         return quantity;
     }
 
-    public void setJobId(String jobId) 
-    {
-        this.jobId = jobId;
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
     }
 
-    public String getJobId() 
-    {
+    public String getJobId() {
         return jobId;
     }
 
-    public void setTrayCode(String trayCode) 
-    {
-        this.trayCode = trayCode;
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
     }
 
-    public String getTrayCode() 
-    {
+    public String getTrayCode() {
         return trayCode;
     }
 
-    public void setOutQuantity(String outQuantity) 
-    {
-        this.outQuantity = outQuantity;
+    public void setTrayCode(String trayCode) {
+        this.trayCode = trayCode;
     }
 
-    public String getOutQuantity() 
-    {
+    public String getOutQuantity() {
         return outQuantity;
     }
 
-    public void setStockinDetailId(String stockinDetailId) 
-    {
-        this.stockinDetailId = stockinDetailId;
+    public void setOutQuantity(String outQuantity) {
+        this.outQuantity = outQuantity;
     }
 
-    public String getStockinDetailId() 
-    {
+    public String getStockinDetailId() {
         return stockinDetailId;
     }
 
-    public void setStockinId(String stockinId) 
-    {
-        this.stockinId = stockinId;
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
     }
 
-    public String getStockinId() 
-    {
+    public String getStockinId() {
         return stockinId;
     }
 
-    public void setInType(String inType) 
-    {
-        this.inType = inType;
+    public void setStockinId(String stockinId) {
+        this.stockinId = stockinId;
     }
 
-    public String getInType() 
-    {
+    public String getInType() {
         return inType;
     }
 
-    public void setInClassId(String inClassId) 
-    {
-        this.inClassId = inClassId;
+    public void setInType(String inType) {
+        this.inType = inType;
     }
 
-    public String getInClassId() 
-    {
+    public String getInClassId() {
         return inClassId;
     }
 
-    public void setWarehouseId(String warehouseId) 
-    {
-        this.warehouseId = warehouseId;
+    public void setInClassId(String inClassId) {
+        this.inClassId = inClassId;
     }
 
-    public String getWarehouseId() 
-    {
+    public String getWarehouseId() {
         return warehouseId;
     }
 
-    public void setStackingId(String stackingId) 
-    {
-        this.stackingId = stackingId;
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
     }
 
-    public String getStackingId() 
-    {
+    public String getStackingId() {
         return stackingId;
     }
 
-    public void setSpare1(String spare1) 
-    {
-        this.spare1 = spare1;
+    public void setStackingId(String stackingId) {
+        this.stackingId = stackingId;
     }
 
-    public String getSpare1() 
-    {
+    public String getSpare1() {
         return spare1;
     }
 
-    public void setSpare2(String spare2) 
-    {
-        this.spare2 = spare2;
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
     }
 
-    public String getSpare2() 
-    {
+    public String getSpare2() {
         return spare2;
     }
 
-    public void setSpare3(String spare3) 
-    {
-        this.spare3 = spare3;
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
     }
 
-    public String getSpare3() 
-    {
+    public String getSpare3() {
         return spare3;
     }
 
-    public void setSpare4(String spare4) 
-    {
-        this.spare4 = spare4;
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
     }
 
-    public String getSpare4() 
-    {
+    public String getSpare4() {
         return spare4;
     }
 
-    public void setSpare5(String spare5) 
-    {
-        this.spare5 = spare5;
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
     }
 
-    public String getSpare5() 
-    {
+    public String getSpare5() {
         return spare5;
     }
 
-    public void setSpare6(String spare6) 
-    {
-        this.spare6 = spare6;
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
     }
 
-    public String getSpare6() 
-    {
+    public String getSpare6() {
         return spare6;
     }
 
-    public void setProductId(String productId) 
-    {
-        this.productId = productId;
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
     }
 
-    public String getProductId() 
-    {
+    public String getProductId() {
         return productId;
     }
 
-    public void setProductName(String productName) 
-    {
-        this.productName = productName;
+    public void setProductId(String productId) {
+        this.productId = productId;
     }
 
-    public String getProductName() 
-    {
+    public String getProductName() {
         return productName;
     }
 
-    public void setVoltage(String voltage) 
-    {
-        this.voltage = voltage;
+    public void setProductName(String productName) {
+        this.productName = productName;
     }
 
-    public String getVoltage() 
-    {
+    public String getVoltage() {
         return voltage;
     }
 
-    public void setPower(String power) 
-    {
-        this.power = power;
+    public void setVoltage(String voltage) {
+        this.voltage = voltage;
     }
 
-    public String getPower() 
-    {
+    public String getPower() {
         return power;
     }
 
-    public void setPhase(String phase) 
-    {
-        this.phase = phase;
+    public void setPower(String power) {
+        this.power = power;
     }
 
-    public String getPhase() 
-    {
+    public String getPhase() {
         return phase;
     }
 
-    public void setNetWeight(BigDecimal netWeight) 
-    {
-        this.netWeight = netWeight;
+    public void setPhase(String phase) {
+        this.phase = phase;
     }
 
-    public BigDecimal getNetWeight() 
-    {
+    public BigDecimal getNetWeight() {
         return netWeight;
     }
 
-    public void setGrossWeight(BigDecimal grossWeight) 
-    {
-        this.grossWeight = grossWeight;
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
     }
 
-    public BigDecimal getGrossWeight() 
-    {
+    public BigDecimal getGrossWeight() {
         return grossWeight;
     }
 
-    public void setDistribution(String distribution) 
-    {
-        this.distribution = distribution;
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
     }
 
-    public String getDistribution() 
-    {
+    public String getDistribution() {
         return distribution;
     }
 
-    public void setModel(String model) 
-    {
-        this.model = model;
+    public void setDistribution(String distribution) {
+        this.distribution = distribution;
     }
 
-    public String getModel() 
-    {
+    public String getModel() {
         return model;
     }
 
-    public void setOrderId(String orderId) 
-    {
-        this.orderId = orderId;
+    public void setModel(String model) {
+        this.model = model;
     }
 
-    public String getOrderId() 
-    {
+    public String getOrderId() {
         return orderId;
     }
 
-    public void setSpare7(String spare7) 
-    {
-        this.spare7 = spare7;
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
     }
 
-    public String getSpare7() 
-    {
+    public String getSpare7() {
         return spare7;
     }
 
-    public void setSpare8(String spare8) 
-    {
-        this.spare8 = spare8;
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
     }
 
-    public String getSpare8() 
-    {
+    public String getSpare8() {
         return spare8;
     }
 
-    public void setCargoSpaceName(String cargoSpaceName) 
-    {
-        this.cargoSpaceName = cargoSpaceName;
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
     }
 
-    public String getCargoSpaceName() 
-    {
+    public String getCargoSpaceName() {
         return cargoSpaceName;
     }
 
-    public Integer getThePlatoon() {
+    public void setCargoSpaceName(String cargoSpaceName) {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public String getThePlatoon() {
         return thePlatoon;
     }
 
-    public void setThePlatoon(Integer thePlatoon) {
+    public void setThePlatoon(String thePlatoon) {
         this.thePlatoon = thePlatoon;
     }
 
-    public Integer getTheColumn() {
+    public String getTheColumn() {
         return theColumn;
     }
 
-    public void setTheColumn(Integer theColumn) {
+    public void setTheColumn(String theColumn) {
         this.theColumn = theColumn;
     }
 
-    public Integer getTheFloor() {
+    public String getTheFloor() {
         return theFloor;
     }
 
-    public void setTheFloor(Integer theFloor) {
+    public void setTheFloor(String theFloor) {
         this.theFloor = theFloor;
     }
 
-    @Override
-    public String toString() {
-        return "ViewHandAllotStock{" +
-                "stockId='" + stockId + '\'' +
-                ", cargoSpaceId='" + cargoSpaceId + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", productStatus='" + productStatus + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", inDate='" + inDate + '\'' +
-                ", backDate='" + backDate + '\'' +
-                ", productGuid='" + productGuid + '\'' +
-                ", quantity=" + quantity +
-                ", jobId='" + jobId + '\'' +
-                ", trayCode='" + trayCode + '\'' +
-                ", outQuantity='" + outQuantity + '\'' +
-                ", stockinDetailId='" + stockinDetailId + '\'' +
-                ", stockinId='" + stockinId + '\'' +
-                ", inType='" + inType + '\'' +
-                ", inClassId='" + inClassId + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", stackingId='" + stackingId + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare3='" + spare3 + '\'' +
-                ", spare4='" + spare4 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", productId='" + productId + '\'' +
-                ", productName='" + productName + '\'' +
-                ", voltage='" + voltage + '\'' +
-                ", power='" + power + '\'' +
-                ", phase='" + phase + '\'' +
-                ", netWeight=" + netWeight +
-                ", grossWeight=" + grossWeight +
-                ", distribution='" + distribution + '\'' +
-                ", model='" + model + '\'' +
-                ", orderId='" + orderId + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", cargoSpaceName='" + cargoSpaceName + '\'' +
-                ", thePlatoon=" + thePlatoon +
-                ", theColumn=" + theColumn +
-                ", theFloor=" + theFloor +
-                '}';
+    public String getRoadwayId() {
+        return roadwayId;
+    }
+
+    public void setRoadwayId(String roadwayId) {
+        this.roadwayId = roadwayId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getLocked() {
+        return locked;
+    }
+
+    public void setLocked(String locked) {
+        this.locked = locked;
     }
 }

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

@@ -288,4 +288,585 @@ public class ViewStockDetail extends BaseEntity
     @Excel(name = "描述")
     private String remark;
 
+    private String thePlatoon;
+    private String theColumn;
+    private String theFloor;
+    private String startTime;
+    private String finishTime;
+
+    public Long getOnlyIdentity() {
+        return onlyIdentity;
+    }
+
+    public void setOnlyIdentity(Long onlyIdentity) {
+        this.onlyIdentity = onlyIdentity;
+    }
+
+    public String getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(String stockId) {
+        this.stockId = stockId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getCargoSpaceId() {
+        return cargoSpaceId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getCargoSpaceName() {
+        return cargoSpaceName;
+    }
+
+    public void setCargoSpaceName(String cargoSpaceName) {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public String getTrayCode() {
+        return trayCode;
+    }
+
+    public void setTrayCode(String trayCode) {
+        this.trayCode = trayCode;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getInDate() {
+        return inDate;
+    }
+
+    public void setInDate(String inDate) {
+        this.inDate = inDate;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getStackingId() {
+        return stackingId;
+    }
+
+    public void setStackingId(String stackingId) {
+        this.stackingId = stackingId;
+    }
+
+    public String getRoadwayId() {
+        return roadwayId;
+    }
+
+    public void setRoadwayId(String roadwayId) {
+        this.roadwayId = roadwayId;
+    }
+
+    public String getCargoSpaceStatus() {
+        return cargoSpaceStatus;
+    }
+
+    public void setCargoSpaceStatus(String cargoSpaceStatus) {
+        this.cargoSpaceStatus = cargoSpaceStatus;
+    }
+
+    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 getLocked() {
+        return locked;
+    }
+
+    public void setLocked(String locked) {
+        this.locked = locked;
+    }
+
+    public String getProductGuid() {
+        return productGuid;
+    }
+
+    public void setProductGuid(String productGuid) {
+        this.productGuid = productGuid;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = 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 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 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 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 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;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getThePlatoon() {
+        return thePlatoon;
+    }
+
+    public void setThePlatoon(String thePlatoon) {
+        this.thePlatoon = thePlatoon;
+    }
+
+    public String getTheColumn() {
+        return theColumn;
+    }
+
+    public void setTheColumn(String theColumn) {
+        this.theColumn = theColumn;
+    }
+
+    public String getTheFloor() {
+        return theFloor;
+    }
+
+    public void setTheFloor(String theFloor) {
+        this.theFloor = theFloor;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(String finishTime) {
+        this.finishTime = finishTime;
+    }
 }

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

@@ -343,5 +343,662 @@ public class ViewStockinHistory extends BaseEntity
 //    @Excel(name = "仓库名称")
     private String warehouseName;
 
+    private String startTime;
+    private String finishTime;
 
+    public String getStockinGuid() {
+        return stockinGuid;
+    }
+
+    public void setStockinGuid(String stockinGuid) {
+        this.stockinGuid = stockinGuid;
+    }
+
+    public String getStockinId() {
+        return stockinId;
+    }
+
+    public void setStockinId(String stockinId) {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinDetailId() {
+        return stockinDetailId;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getInType() {
+        return inType;
+    }
+
+    public void setInType(String inType) {
+        this.inType = inType;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateManId() {
+        return createManId;
+    }
+
+    public void setCreateManId(String createManId) {
+        this.createManId = createManId;
+    }
+
+    public String getErpBill() {
+        return erpBill;
+    }
+
+    public void setErpBill(String erpBill) {
+        this.erpBill = erpBill;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getFinishDate() {
+        return finishDate;
+    }
+
+    public void setFinishDate(String finishDate) {
+        this.finishDate = finishDate;
+    }
+
+    public String getStockSource() {
+        return stockSource;
+    }
+
+    public void setStockSource(String stockSource) {
+        this.stockSource = stockSource;
+    }
+
+    public String getDepartmentNo() {
+        return departmentNo;
+    }
+
+    public void setDepartmentNo(String departmentNo) {
+        this.departmentNo = departmentNo;
+    }
+
+    public String getClassNo() {
+        return classNo;
+    }
+
+    public void setClassNo(String classNo) {
+        this.classNo = classNo;
+    }
+
+    public String getSupplierNo() {
+        return supplierNo;
+    }
+
+    public void setSupplierNo(String supplierNo) {
+        this.supplierNo = supplierNo;
+    }
+
+    public String getSimpleName() {
+        return simpleName;
+    }
+
+    public void setSimpleName(String simpleName) {
+        this.simpleName = simpleName;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    public void setContactNumber(String contactNumber) {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getQuantityX() {
+        return quantityX;
+    }
+
+    public void setQuantityX(String quantityX) {
+        this.quantityX = quantityX;
+    }
+
+    public String getQuantityJ() {
+        return quantityJ;
+    }
+
+    public void setQuantityJ(String quantityJ) {
+        this.quantityJ = quantityJ;
+    }
+
+    public String getAssignNum() {
+        return assignNum;
+    }
+
+    public void setAssignNum(String assignNum) {
+        this.assignNum = assignNum;
+    }
+
+    public String getAssignNumX() {
+        return assignNumX;
+    }
+
+    public void setAssignNumX(String assignNumX) {
+        this.assignNumX = assignNumX;
+    }
+
+    public String getAssignNumJ() {
+        return assignNumJ;
+    }
+
+    public void setAssignNumJ(String assignNumJ) {
+        this.assignNumJ = assignNumJ;
+    }
+
+    public String getScanNum() {
+        return scanNum;
+    }
+
+    public void setScanNum(String scanNum) {
+        this.scanNum = scanNum;
+    }
+
+    public String getScanNumX() {
+        return scanNumX;
+    }
+
+    public void setScanNumX(String scanNumX) {
+        this.scanNumX = scanNumX;
+    }
+
+    public String getScanNumJ() {
+        return scanNumJ;
+    }
+
+    public void setScanNumJ(String scanNumJ) {
+        this.scanNumJ = scanNumJ;
+    }
+
+    public String getPrintDate() {
+        return printDate;
+    }
+
+    public void setPrintDate(String printDate) {
+        this.printDate = printDate;
+    }
+
+    public String getStockStatus() {
+        return stockStatus;
+    }
+
+    public void setStockStatus(String stockStatus) {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getProductGuid() {
+        return productGuid;
+    }
+
+    public void setProductGuid(String productGuid) {
+        this.productGuid = productGuid;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getCargoNo() {
+        return cargoNo;
+    }
+
+    public void setCargoNo(String cargoNo) {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    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 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 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 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;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(String finishTime) {
+        this.finishTime = finishTime;
+    }
 }

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

@@ -284,5 +284,534 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "描述")
     private String remark;
 
+    private String startTime;
+    private String finishTime;
 
+    public String getStockoutId() {
+        return stockoutId;
+    }
+
+    public void setStockoutId(String stockoutId) {
+        this.stockoutId = stockoutId;
+    }
+
+    public String getStockoutDetailId() {
+        return stockoutDetailId;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId) {
+        this.stockoutDetailId = stockoutDetailId;
+    }
+
+    public String getOutType() {
+        return outType;
+    }
+
+    public void setOutType(String outType) {
+        this.outType = outType;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateManId() {
+        return createManId;
+    }
+
+    public void setCreateManId(String createManId) {
+        this.createManId = createManId;
+    }
+
+    public String getErpStockoutId() {
+        return erpStockoutId;
+    }
+
+    public void setErpStockoutId(String erpStockoutId) {
+        this.erpStockoutId = erpStockoutId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getExitId() {
+        return exitId;
+    }
+
+    public void setExitId(String exitId) {
+        this.exitId = exitId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
+    }
+
+    public BigDecimal getAllotQuantity() {
+        return allotQuantity;
+    }
+
+    public void setAllotQuantity(BigDecimal allotQuantity) {
+        this.allotQuantity = allotQuantity;
+    }
+
+    public String getLotNo() {
+        return lotNo;
+    }
+
+    public void setLotNo(String lotNo) {
+        this.lotNo = lotNo;
+    }
+
+    public String getStockoutSource() {
+        return stockoutSource;
+    }
+
+    public void setStockoutSource(String stockoutSource) {
+        this.stockoutSource = stockoutSource;
+    }
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public BigDecimal getAssignNum() {
+        return assignNum;
+    }
+
+    public void setAssignNum(BigDecimal assignNum) {
+        this.assignNum = assignNum;
+    }
+
+    public String getEntryid() {
+        return entryid;
+    }
+
+    public void setEntryid(String entryid) {
+        this.entryid = entryid;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getProductGuid() {
+        return productGuid;
+    }
+
+    public void setProductGuid(String productGuid) {
+        this.productGuid = productGuid;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getCargoNo() {
+        return cargoNo;
+    }
+
+    public void setCargoNo(String cargoNo) {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    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 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 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 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;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(String finishTime) {
+        this.finishTime = finishTime;
+    }
 }

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

@@ -42,6 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="thePlatoon"    column="the_platoon"    />
+        <result property="theColumn"    column="the_column"    />
+        <result property="theFloor"    column="the_floor"    />
+        <result property="status"    column="status"    />
+        <result property="locked"    column="locked"    />
     </resultMap>
 
     <sql id="selectViewHandAllotStockVo">
@@ -49,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id,
                warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name,
                voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8,
-               cargo_space_name from view_hand_allot_stock
+               cargo_space_name,roadway_id,the_platoon,the_column,the_floor,status,locked from view_hand_allot_stock
     </sql>
 
     <select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
@@ -92,9 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderId != null  and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
-            <if test="thePlatoon != null  and thePlatoon != ''"> and cargo_space_id in (select cargo_space_id from bas_cargo_space where the_platoon=#{thePlatoon})</if>
-            <if test="theColumn != null  and theColumn != ''"> and cargo_space_id in (select cargo_space_id from bas_cargo_space where the_column=#{theColumn})</if>
-            <if test="theFloor != null  and theFloor != ''"> and cargo_space_id in (select cargo_space_id from bas_cargo_space where the_floor=#{theFloor})</if>
+            <if test="thePlatoon != null  and thePlatoon != ''"> and the_platoon=#{thePlatoon}</if>
+            <if test="theColumn != null  and theColumn != ''"> and the_column=#{theColumn}</if>
+            <if test="theFloor != null  and theFloor != ''"> and the_floor=#{theFloor}</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id=#{roadwayId}</if>
+            <if test="locked != null  and locked != ''"> and locked=#{locked}</if>
         </where>
     </select>
     

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

@@ -83,7 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        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
+        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">
@@ -92,17 +100,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
             <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat('%', #{jobDetailId}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
+            <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
-            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
-            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
+            <if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
+            <if test="theColumn != null "> and the_column = #{theColumn}</if>
+            <if test="theFloor != null "> and the_floor = #{theFloor}</if>
             <if test="priority != null "> and priority like concat('%', #{priority}, '%')</if>
             <if test="executionPhase != null  and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
-            <if test="inOrOut != null  and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
+            <if test="inOrOut != null  and inOrOut != ''"> and in_or_out = #{inOrOut}</if>
             <if test="entranceId != null  and entranceId != ''"> and entrance_id like concat('%', #{entranceId}, '%')</if>
             <if test="wlbh != null  and wlbh != ''"> and wlbh like concat('%', #{wlbh}, '%')</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
@@ -112,8 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
             <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id like concat('%', #{inOrOutDId}, '%')</if>
             <if test="createTime != null  and createTime != ''"> and create_time like concat('%', #{createTime}, '%')</if>
-            <if test="startTime != null  and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
-            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
+            <if test="startTime != null  and startTime != ''"> and create_time &gt;= #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and create_time &lt;= #{finishTime}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
             <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
             <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>

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

@@ -39,46 +39,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockDetailVo">
-        SELECT 
-            ROW_NUMBER() OVER (ORDER BY s.stock_id ASC) AS only_identity, 
-            s.stock_id, 
-            s.cargo_space_id, 
-            s.tray_code, 
-            s.quantity, 
-            s.job_id, 
-            s.lot_no, 
-            s.stockin_detail_id, 
-            s.in_date, 
-            s.warehouse_id, 
-            s.stacking_id,
-               s.order_id,
-            cs.cargo_space_name, 
-            cs.roadway_id, 
-            cs.status AS cargo_space_status, 
-            s.stock_status AS stock_status, 
-            s.product_status AS product_status, 
-            cs.locked, 
-            p.product_guid,
-            p.product_id,
-            p.product_name,
-            p.spec,
-            p.unit,
-            p.price,
-            p.spare1,
-            p.spare2,
-            p.spare5,
-            p.spare6,
-            p.spare7,
-            p.spare8,
-            p.remark,
-            bw.warehouse_name
-        FROM 
-            bas_stock s 
+        SELECT ROW_NUMBER()        OVER (ORDER BY s.stock_id ASC) AS only_identity, s.stock_id,s.cargo_space_id,s.tray_code,
+        s.quantity,s.job_id, s.lot_no,s.stockin_detail_id,s.in_date,s.warehouse_id,s.stacking_id,s.order_id,cs.cargo_space_name,
+        cs.roadway_id,cs.status AS cargo_space_status,s.stock_status AS stock_status,s.product_status AS product_status,
+        cs.locked,p.product_guid,p.product_id,p.product_name,p.spec,p.unit,p.price,p.spare1,p.spare2,p.spare5,p.spare6,
+        p.spare7,p.spare8,p.remark,bw.warehouse_name
+        FROM bas_stock s
         LEFT JOIN bas_cargo_space cs ON cs.cargo_space_id = s.cargo_space_id
         LEFT JOIN bas_product p ON p.product_guid = s.product_guid
         LEFT JOIN bas_warehouse bw on s.warehouse_id = bw.warehouse_id
-        WHERE 
-            cs.status = '2'
+        WHERE cs.status = '2'
     </sql>
 
     <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
@@ -88,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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>
+        <if test="lotNo != null  and lotNo != ''"> and s.lot_no like concat('%',#{lotNo}, '%')</if>
         <if test="stockinDetailId != null  and stockinDetailId != ''"> and s.stockin_detail_id = #{stockinDetailId}</if>
         <if test="inDate != null  and inDate != ''"> and s.in_date = #{inDate}</if>
         <if test="warehouseId != null  and warehouseId != ''"> and s.warehouse_id = #{warehouseId}</if>
@@ -113,6 +83,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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>
+        <if test="thePlatoon != null and thePlatoon != ''"> and cs.the_platoon = #{thePlatoon}</if>
+        <if test="theColumn != null and theColumn != ''"> and cs.the_column = #{theColumn}</if>
+        <if test="theFloor != null and theFloor != ''"> and cs.the_floor = #{theFloor}</if>
+        <if test="startTime != null and startTime != ''"> and s.in_date &gt;= #{startTime}</if>
+        <if test="finishTime != null and finishTime != ''"> and s.in_date &lt;= #{finishTime}</if>
     </select>
 
     <select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">

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

@@ -88,7 +88,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockinHistoryVo">
-        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, 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, warehouse_name from view_stockin_history
+        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date,
+               erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name,
+               contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num,
+               assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, 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, warehouse_name from view_stockin_history
     </sql>
 
     <select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
@@ -98,6 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
             <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
             <if test="createDate != null  and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
+            <if test="startTime != null  and startTime != ''"> and create_date &gt;= #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and create_date &lt;= #{startTime}</if>
             <if test="createManId != null  and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>

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

@@ -72,7 +72,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewStockoutHistoryVo">
-        select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, warehouse_id, stockout_detail_id, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, 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_stockout_history
+        select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, warehouse_id,
+               stockout_detail_id, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name,
+               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_stockout_history
     </sql>
 
     <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
@@ -81,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
             <if test="outType != null  and outType != ''"> and out_type = #{outType}</if>
             <if test="createDate != null  and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
+            <if test="startTime != null  and startTime != ''"> and create_date &gt;= #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and create_date &lt;= #{finishTime}</if>
             <if test="createManId != null  and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat('%', #{stockoutSource}, '%')</if>

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

@@ -236,7 +236,7 @@
                     stripe
                     class="detail-table"
                   >
-                    <el-table-column prop="productId" label="物料编号" width="120" align="center" />
+                    <el-table-column prop="productId" label="品号" width="120" align="center" />
                     <el-table-column prop="productName" label="品名" min-width="150" />
                     <el-table-column prop="quantity" label="数量" width="100" align="center">
                       <template slot-scope="scope">

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

@@ -11,10 +11,10 @@
         />
       </el-form-item>
       <!-- Product ID -->
-      <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"
         />
@@ -143,7 +143,7 @@
       <!-- Container ID -->
       <el-table-column width="120" label="容器编号" align="left" prop="containerId" />
       <!-- Product ID -->
-      <el-table-column width="120" label="物料编号" align="left" prop="productId" />
+      <el-table-column width="120" label="品号" align="left" prop="productId" />
       <!-- Product Name -->
       <el-table-column width="120" label="品名" align="left" prop="productName" />
       <!-- Quantity -->
@@ -189,8 +189,8 @@
           <el-input v-model="form.containerId" placeholder="请输入容器编号" disabled/>
         </el-form-item>
         <!-- Product ID -->
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号" />
+        <el-form-item label="品号" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入品号" />
         </el-form-item>
         <!-- Product Name -->
         <el-form-item label="品名" prop="productName">

ruoyi-ui/src/views/check/difference/index.vue

@@ -33,10 +33,10 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
         />
@@ -115,7 +115,7 @@
       <el-table-column label="库存编号" align="left" prop="stockId" />
       <el-table-column label="托盘编码" align="left" prop="trayCode" />
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
-      <el-table-column label="物料编号" align="left" prop="productId" />
+      <el-table-column label="品号" align="left" prop="productId" />
       <el-table-column label="品名" align="left" prop="extraField.materialDesc"/>
       <el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/>
       <el-table-column label="原值" align="right" prop="oldQuantity" />
@@ -156,8 +156,8 @@
         <el-form-item label="货位编号" prop="cargoSpaceId">
           <el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" />
         </el-form-item>
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号" />
+        <el-form-item label="品号" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入品号" />
         </el-form-item>
         <el-form-item label="批次号" prop="lotNo">
           <el-input v-model="form.lotNo" placeholder="请输入批次号" />

ruoyi-ui/src/views/check/flat/index.vue

@@ -134,7 +134,7 @@
           <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="物料编号" align="left" prop="extraField.productId" />
+      <el-table-column label="品号" align="left" prop="extraField.productId" />
       <el-table-column label="品名" align="left" prop="extraField.materialDesc" />
       <el-table-column label="英文描述" align="left" prop="extraField.englishDesc" />
       <el-table-column label="净重" align="right" prop="extraField.netWeight" />
@@ -214,8 +214,8 @@
         <el-form-item label="库存编号" prop="stockId">
           <el-input v-model="editForm.stockId" placeholder="请输入库存编号" disabled />
         </el-form-item>
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="editForm.extraField.productId" placeholder="请输入物料编号" disabled />
+        <el-form-item label="品号" prop="productId">
+          <el-input v-model="editForm.extraField.productId" placeholder="请输入品号" disabled />
         </el-form-item>
         <el-form-item label="品名" prop="materialDesc">
           <el-input v-model="editForm.extraField.materialDesc" placeholder="请输入品名" disabled />

ruoyi-ui/src/views/in/job/index.vue

@@ -73,7 +73,7 @@
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable
           v-model="queryParams.startTime"
-          type="datetime"
+          type="datetime" style="width: 206px"
           value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="请选择开始时间">
         </el-date-picker>
@@ -81,7 +81,7 @@
       <el-form-item label="结束时间" prop="finishTime">
         <el-date-picker clearable
           v-model="queryParams.finishTime"
-          type="datetime"
+          type="datetime" style="width: 206px"
           value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="请选择结束时间">
         </el-date-picker>
@@ -152,8 +152,8 @@
         </template>
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" />
-      <el-table-column label="巷道" align="left" prop="roadwayId"/>
-      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" />
+      <el-table-column label="巷道" align="left" prop="roadwayId" sortable/>
+      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" sortable/>
 <!--      <el-table-column label="优先级" align="left" prop="priority" />-->
 <!--      <el-table-column label="执行阶段" align="left" prop="executionPhase">-->
 <!--        <template slot-scope="scope">-->
@@ -161,11 +161,11 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column label="订单号" align="left" prop="lineId" />
-      <el-table-column label="入口" align="left" prop="entranceId" />
+      <el-table-column label="入口" align="left" prop="entranceId" sortable/>
 <!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
-      <el-table-column label="创建时间" align="left" prop="createTime" width="180"/>
-      <el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/>
+      <el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/>
+      <el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/>
     </el-table>
 
     <pagination

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -164,11 +164,11 @@
         </template>
       </el-table-column>
       <el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
-      <el-table-column label="供应商" align="left" prop="supplierName"/><!--供应商-->
+      <el-table-column label="供应商" align="left" prop="supplierName" sortable/><!--供应商-->
       <el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
       <el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->
-      <el-table-column label="建立时间" align="left" prop="createDate"/><!--建立时间-->
-      <el-table-column label="完成日期" align="left" prop="finishDate"/><!--完成日期-->
+      <el-table-column label="创建时间" align="left" prop="createDate" sortable/><!--建立时间-->
+      <el-table-column label="确认时间" align="left" prop="finishDate" sortable/><!--完成日期-->
     </el-table>
 
     <pagination
@@ -183,7 +183,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160"/><!--子单ID-->
       <el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
-      <el-table-column label="品号" align="left" prop="productId"/><!--品号-->
+      <el-table-column label="品号" align="left" prop="productId" sortable/><!--品号-->
       <el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
       <el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->

ruoyi-ui/src/views/job/outJobManagement.vue

@@ -135,7 +135,7 @@
 
     <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow" max-height="400">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务ID" align="left" prop="jobId" /> <!-- 任务ID -->
+      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/> <!-- 任务ID -->
       <el-table-column label="任务状态" align="left" prop="status"> <!-- 任务状态 -->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -153,14 +153,14 @@
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" /> <!-- 任务号 -->
 <!--      <el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> &lt;!&ndash; 客户ID &ndash;&gt;-->
-<!--      <el-table-column label="托盘码" align="left" prop="trayCode" /> &lt;!&ndash; 托盘码 &ndash;&gt;-->
-      <el-table-column label="巷道" align="left" prop="roadwayId" /> <!-- 巷道ID -->
-      <el-table-column label="货位" align="left" prop="cargoSpaceName" /> <!-- 货位ID -->
-      <el-table-column label="订单号" align="left" prop="lineId" /> <!-- 结束时间 -->
+      <el-table-column label="序列号" align="left" prop="trayCode"  width="130" sortable/>
+      <el-table-column label="巷道" align="left" prop="roadwayId" sortable/> <!-- 巷道ID -->
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="130"/> <!-- 货位ID -->
+      <el-table-column label="订单号" align="left" prop="lineId" width="130"/> <!-- 结束时间 -->
       <el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
-      <el-table-column label="创建时间" align="left" prop="createTime" width="180"/> <!-- 创建时间 -->
-      <el-table-column label="开始时间" align="left" prop="startTime" width="180"/> <!-- 开始时间 -->
-      <el-table-column label="结束时间" align="left" prop="finishTime" width="180"/> <!-- 结束时间 -->
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/> <!-- 创建时间 -->
+      <el-table-column label="开始时间" align="left" prop="startTime" width="180" sortable/> <!-- 开始时间 -->
+      <el-table-column label="结束时间" align="left" prop="finishTime" width="180" sortable/> <!-- 结束时间 -->
 <!--      <el-table-column :label="$t('outJobManagement.warehouseId')" align="left" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
 <!--      <el-table-column label="仓库ID" align="left" prop="warehouseName" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
     </el-table>

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

@@ -135,25 +135,25 @@
     <!-- 主表数据 -->
     <el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="'出库单编号'" align="left" prop="stockoutId" /> <!-- 出库单编号 -->
-      <el-table-column :label="'出库类型'" align="left" prop="outType"> <!-- 出库类型 -->
+      <el-table-column :label="'出库单编号'" align="left" prop="stockoutId" />
+      <el-table-column :label="'出库类型'" align="left" 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="left" prop="status"> <!-- 单据状态 -->
+      <el-table-column :label="'单据状态'" align="left" 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="left" prop="exitId" />
-      <el-table-column :label="'客户编码'" align="left" prop="customerNo" /><!-- 客户编码 -->
-      <el-table-column :label="'客户名称'" align="left" prop="customerName" />
-      <el-table-column :label="'建单人'" align="left" prop="createManId" /> <!-- 建单人 -->
-      <el-table-column :label="'创建时间'" align="left" prop="createDate" /><!-- 创建时间 -->
-      <el-table-column :label="'开始时间'" align="left" prop="startDate" /><!-- 开始时间 -->
-      <el-table-column :label="'确认时间'" align="left" prop="finishDate" /> <!-- 确认时间 -->
-<!--      <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />&lt;!&ndash; 仓库名称 &ndash;&gt;-->
+      <el-table-column :label="'出口'" align="left" prop="exitId" sortable/>
+<!--      <el-table-column :label="'客户编码'" align="left" prop="customerNo" />-->
+      <el-table-column :label="'客户名称'" align="left" prop="customerName" width="200"/>
+      <el-table-column :label="'建单人'" align="left" prop="createManId" />
+      <el-table-column :label="'创建时间'" align="left" prop="createDate" width="160" sortable/>
+      <el-table-column :label="'开始时间'" align="left" prop="startDate" width="160" sortable/>
+      <el-table-column :label="'确认时间'" align="left" prop="finishDate" width="160" sortable/>
+<!--     <el-table-column :label="'仓库名称'" align="left" prop="warehouseName" />-->
     </el-table>
 
     <pagination
@@ -168,7 +168,7 @@
     <el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 -->
-      <el-table-column :label="'品号'" align="center" prop="productId" /> <!-- 品号 -->
+      <el-table-column :label="'品号'" align="center" prop="productId" sortable/> <!-- 品号 -->
       <el-table-column :label="'品名'" align="center" prop="productName" />
       <el-table-column :label="'批次号'" align="center" prop="lotNo"/><!--英文描述-->
       <el-table-column :label="'序列号'" align="center"  prop="printDate"/> <!--序列号-->

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

@@ -4,7 +4,7 @@
       <el-form-item label="分组选项">
         <el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
           <el-checkbox label="orderId">订单号</el-checkbox>
-          <el-checkbox label="productId">物料编号</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> -->
@@ -57,16 +57,7 @@
         </el-checkbox-group>
       </el-form-item>
       <br>
-      <!-- <el-form-item label="仓库" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
-          <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item> -->
+
       <el-form-item label="订单号" prop="orderId">
         <el-input
           v-model="queryParams.orderId"
@@ -75,14 +66,6 @@
           @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"
-        />
-      </el-form-item>
       <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -94,7 +77,7 @@
       <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入品名关键字"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />

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

@@ -43,10 +43,10 @@
           />
         </el-select>
       </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"
         />
@@ -165,7 +165,7 @@
       <el-table-column label="仓库名称" width="120" align="left" prop="warehouseName" />
       <el-table-column label="入库单号" width="120" align="left" prop="inOrOutSotckId" />
       <el-table-column label="入库子单号" width="120" align="left" prop="inOrOutSotckDetailId" />
-      <el-table-column label="物料编号" width="120" align="left" prop="productId" />
+      <el-table-column label="品号" width="120" align="left" prop="productId" />
       <el-table-column label="品名" width="120" align="left" prop="productName" />
       <el-table-column label="英文名称" width="120" align="left" prop="spare1" />
       <el-table-column label="单件净重(kg)" width="120" align="right" prop="spare2" />
@@ -202,8 +202,8 @@
         <el-form-item label="入库子单号" prop="inOrOutSotckDetailId">
           <el-input v-model="form.inOrOutSotckDetailId" placeholder="请输入入库子单号" />
         </el-form-item>
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号(SKU)" />
+        <el-form-item label="品号" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入品号(SKU)" />
         </el-form-item>
         <el-form-item label="数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入数量(件)" />
@@ -319,7 +319,7 @@ export default {
           { required: true, message: "流水号不能为空", trigger: "blur" }
         ],
         productId: [
-          { required: true, message: "物料编号不能为空", trigger: "blur" }
+          { required: true, message: "品号不能为空", trigger: "blur" }
         ],
         quantity: [
           { required: true, message: "数量不能为空", trigger: "blur" },

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

@@ -11,10 +11,10 @@
           />
         </el-select>
       </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"
         />
@@ -51,7 +51,7 @@
       <el-table-column label="仓库名称" width="120" align="left" prop="warehouseName" />
       <el-table-column label="出库单号" width="120" align="left" prop="inOrOutSotckId" />
       <el-table-column label="出库子单号" width="120" align="left" prop="inOrOutSotckDetailId" />
-      <el-table-column label="物料编号" width="120" align="left" prop="productId" />
+      <el-table-column label="品号" width="120" align="left" prop="productId" />
       <el-table-column label="品名" width="120" align="left" prop="productName" />
       <el-table-column label="英文名称" width="120" align="left" prop="spare1" />
       <el-table-column label="单件净重(kg)" align="right" width="120" prop="spare2" />
@@ -87,8 +87,8 @@
         <el-form-item label="出库子单号" prop="inOrOutSotckDetailId">
           <el-input v-model="form.inOrOutSotckDetailId" placeholder="请输入出库子单号" />
         </el-form-item>
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号(SKU)" />
+        <el-form-item label="品号" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入品号(SKU)" />
         </el-form-item>
         <el-form-item label="数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入数量(件)" />
@@ -198,7 +198,7 @@ export default {
           { required: true, message: "流水号不能为空", trigger: "blur" }
         ],
         productId: [
-          { required: true, message: "请输入物料编号(SKU)", trigger: "blur" }
+          { required: true, message: "请输入品号(SKU)", trigger: "blur" }
         ],
         quantity: [
           { required: true, message: "请输入数量(件)", trigger: "blur" }

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

@@ -1,32 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="作业ID" prop="jobId">
-        <el-input
-          v-model="queryParams.jobId"
-          placeholder="请输入作业ID"
-          clearable
-          @keyup.enter.native="handleQuery"
+      <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="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
+          <el-option
+            v-for="dict in dict.type.out_all_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-<!--      <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"
@@ -35,178 +29,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="托盘号" prop="trayCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.trayCode"-->
-<!--          placeholder="请输入托盘号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="巷道ID" prop="roadwayId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.roadwayId"-->
-<!--          placeholder="请输入巷道ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="货位ID" prop="cargoSpaceId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoSpaceId"-->
-<!--          placeholder="请输入货位ID"-->
-<!--          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"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="排" prop="thePlatoon">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.thePlatoon"-->
-<!--          placeholder="请输入排"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="列" prop="theColumn">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.theColumn"-->
-<!--          placeholder="请输入列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="层" prop="theFloor">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.theFloor"-->
-<!--          placeholder="请输入层"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="优先级" prop="priority">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.priority"-->
-<!--          placeholder="请输入优先级"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="执行阶段" prop="executionPhase">-->
-<!--        <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.execution_phase_type"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-      <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"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+      <el-form-item label="巷道" prop="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="序列号" prop="trayCode">
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入序列号"
+          clearable
+          @keyup.enter.native="handleQuery"
         />
-        </el-select>
       </el-form-item>
-<!--      <el-form-item label="入口ID" prop="entranceId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.entranceId"-->
-<!--          placeholder="请输入入口ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="物料ID" prop="wlbh">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.wlbh"-->
-<!--          placeholder="请输入物料ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号" prop="lotNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNo"-->
-<!--          placeholder="请输入批号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="垛型ID" prop="stackingId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stackingId"-->
-<!--          placeholder="请输入垛型ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="单据ID" prop="inOrOutId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.inOrOutId"-->
-<!--          placeholder="请输入单据ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="子单据ID" prop="inOrOutDId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.inOrOutDId"-->
-<!--          placeholder="请输入子单据ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="创建时间" prop="createTime">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createTime"-->
-<!--          placeholder="请输入创建时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="开始时间" prop="startTime">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.startTime"-->
-<!--          placeholder="请输入开始时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="结束时间" prop="finishTime">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.finishTime"-->
-<!--          placeholder="请输入结束时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请输入仓库ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="物料GUID" prop="productGuid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productGuid"-->
-<!--          placeholder="请输入物料GUID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item label="订单号" prop="lineId">
         <el-input
           v-model="queryParams.lineId"
@@ -215,10 +53,10 @@
           @keyup.enter.native="handleQuery"
         />
       </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"
         />
@@ -231,368 +69,47 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="品号描述" prop="price">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          placeholder="请输入品号描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="英文描述" prop="cargoNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
-<!--          placeholder="请输入英文描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品分类" prop="parentId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.parentId"-->
-<!--          placeholder="请输入产品分类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图号" prop="unit">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入图号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格" prop="spec">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
 
-<!--      <el-form-item label="型号" prop="spare1">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare1"-->
-<!--          placeholder="请输入型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="单件净重" prop="spare2">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare2"-->
-<!--          placeholder="请输入单件净重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="颜色" prop="spare3">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare3"-->
-<!--          placeholder="请输入颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="序列号" prop="spare4">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare4"-->
-<!--          placeholder="请输入序列号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电压" prop="spare5">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare5"-->
-<!--          placeholder="请输入电压"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="功率" prop="spare6">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare6"-->
-<!--          placeholder="请输入功率"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-
-<!--      <el-form-item label="相位" prop="spare7">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare7"-->
-<!--          placeholder="请输入相位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="毛重" prop="spare8">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare8"-->
-<!--          placeholder="请输入毛重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="NC号" prop="spare9">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare9"-->
-<!--          placeholder="请输入NC号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电源线" prop="spare10">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare10"-->
-<!--          placeholder="请输入电源线"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="插头" prop="spare11">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare11"-->
-<!--          placeholder="请输入插头"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="接嘴" prop="spare12">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare12"-->
-<!--          placeholder="请输入接嘴"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="快捷码" prop="spare13">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare13"-->
-<!--          placeholder="请输入快捷码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位编号" prop="spare14">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare14"-->
-<!--          placeholder="请输入库存单位编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位名称" prop="spare15">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare15"-->
-<!--          placeholder="请输入库存单位名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号群组" prop="spare16">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare16"-->
-<!--          placeholder="请输入品号群组"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="归类品" prop="spare17">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare17"-->
-<!--          placeholder="请输入归类品"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计量体系" prop="spare18">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare18"-->
-<!--          placeholder="请输入计量体系"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="群组名称" prop="spare19">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare19"-->
-<!--          placeholder="请输入群组名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号管理" prop="spare20">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare20"-->
-<!--          placeholder="请输入批号管理"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="spare21">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare21"-->
-<!--          placeholder="请输入状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品大类" prop="spare22">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare22"-->
-<!--          placeholder="请输入产品大类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品二类" prop="spare23">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare23"-->
-<!--          placeholder="请输入产品二类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare24"-->
-<!--          placeholder="请输入产品线/产品系列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="BOM状态" prop="spare25">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare25"-->
-<!--          placeholder="请输入BOM状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品定位" prop="spare26">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare26"-->
-<!--          placeholder="请输入产品定位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电脑板型号" prop="spare27">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare27"-->
-<!--          placeholder="请输入电脑板型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标要求" prop="spare28">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare28"-->
-<!--          placeholder="请输入非标要求"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品牌" prop="spare29">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare29"-->
-<!--          placeholder="请输入品牌"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标颜色" prop="spare30">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare30"-->
-<!--          placeholder="请输入非标颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主颜色" prop="spare31">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare31"-->
-<!--          placeholder="请输入主颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="辅助颜色" prop="spare32">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare32"-->
-<!--          placeholder="请输入辅助颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="是否标准款" prop="spare33">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare33"-->
-<!--          placeholder="请输入是否标准款"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装方式" prop="spare34">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare34"-->
-<!--          placeholder="请输入包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主要包装方式" prop="spare35">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare35"-->
-<!--          placeholder="请输入主要包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="长" prop="spare36">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare36"-->
-<!--          placeholder="请输入长"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="宽" prop="spare37">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare37"-->
-<!--          placeholder="请输入宽"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="高" prop="spare38">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare38"-->
-<!--          placeholder="请输入高"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装材积" prop="spare39">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare39"-->
-<!--          placeholder="请输入包装材积"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="描述" prop="remark">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.remark"-->
-<!--          placeholder="请输入描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="货位-排" prop="thePlatoon">
+        <el-input
+          v-model="queryParams.thePlatoon"
+          placeholder="请输入货位-排"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位-列" prop="theColumn">
+        <el-input
+          v-model="queryParams.theColumn"
+          placeholder="请输入货位-列"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位-层" prop="theFloor">
+        <el-input
+          v-model="queryParams.theFloor"
+          placeholder="请输入货位-层"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择开始时间" style="width: 206px">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.finishTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择结束时间" style="width: 206px">
+        </el-date-picker>
+      </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>
@@ -640,68 +157,53 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['search:ViewInJobFlow:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </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="160" label="作业ID" align="left" prop="jobId" />
-      <el-table-column width="160" label="子作业ID" align="left" prop="jobDetailId" />
-
+      <el-table-column label="作业ID" align="left" prop="jobId" width="140" />
       <el-table-column label="作业类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.in_all_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <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="160" label="巷道ID" align="left" prop="roadwayId" />
-<!--      <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
-      <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" />-->
-<!--      <el-table-column label="优先级" align="center" prop="priority" />-->
-<!--      <el-table-column label="执行阶段" align="center" prop="executionPhase">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column  label="状态" align="center" prop="status">
+      <el-table-column label="作业状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column width="160" label="入口ID" align="left" prop="entranceId" />
-
+      <el-table-column label="任务号" align="left" prop="taskNo"/>
+      <el-table-column label="巷道" align="left" prop="roadwayId"/>
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120" />
+      <el-table-column label="入口" align="left" prop="entranceId"/>
+      <el-table-column label="订单号" align="left" prop="lineId" 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="trayCode" width="160"/>
+      <el-table-column label="入库数量" align="right" prop="inQuantity"/>
+      <el-table-column label="排" align="center" prop="thePlatoon"/>
+      <el-table-column label="列" align="center" prop="theColumn"/>
+      <el-table-column label="层" align="center" prop="theFloor"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="开始时间" align="center" prop="startTime" width="160"/>
+      <el-table-column label="结束时间" align="center" prop="finishTime" width="160"/>
       <!--      <el-table-column label="物料ID" align="center" prop="wlbh" />-->
-      <el-table-column width="160" label="批号" align="left" prop="lotNo" />
+      <el-table-column 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="160" label="单据ID" align="left" prop="inOrOutId" />
-      <el-table-column width="160" label="子单据ID" align="left" prop="inOrOutDId" />
-      <el-table-column width="160" label="创建时间" align="left">
-        <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="left" prop="inOrOutId"/>
+      <el-table-column label="子单据ID" align="left" prop="inOrOutDId"/>
       <!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
       <!--      <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
-
-      <el-table-column width="160" label="品号描述" align="left" prop="price" />
-      <el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
+      <el-table-column label="品号描述" align="left" prop="price"/>
+      <el-table-column label="英文描述" align="left" prop="cargoNo"/>
       <!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
-      <el-table-column width="160" label="图号" align="left" prop="unit" />
-      <el-table-column width="160" label="规格" align="left" prop="spec" />
+      <el-table-column label="图号" align="left" prop="unit"/>
+      <el-table-column 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" />-->
@@ -710,38 +212,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="160" label="NC号" align="left" prop="spare9" />
-      <el-table-column width="160" label="电源线" align="left" prop="spare10" />
-      <el-table-column width="160" label="插头" align="left" prop="spare11" />
-      <el-table-column width="160" label="接嘴" align="left" prop="spare12" />
-      <el-table-column width="160" label="快捷码" align="left" prop="spare13" />
-      <el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
-      <el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
-      <el-table-column width="160" label="品号群组" align="left" prop="spare16" />
-      <el-table-column width="160" label="归类品" align="left" prop="spare17" />
-      <el-table-column width="160" label="计量体系" align="left" prop="spare18" />
-      <el-table-column width="160" label="群组名称" align="left" prop="spare19" />
-      <el-table-column width="160" label="批号管理" align="left" prop="spare20" />
-      <el-table-column width="160" label="状态" align="left" prop="spare21" />
-      <el-table-column width="160" label="产品大类" align="left" prop="spare22" />
-      <el-table-column width="160" label="产品二类" align="left" prop="spare23" />
-      <el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
-      <el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
-      <el-table-column width="160" label="产品定位" align="left" prop="spare26" />
-      <el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
-      <el-table-column width="160" label="非标要求" align="left" prop="spare28" />
-      <el-table-column width="160" label="品牌" align="left" prop="spare29" />
-      <el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
-      <el-table-column width="160" label="主颜色" align="left" prop="spare31" />
-      <el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
-      <el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
-      <el-table-column width="160" label="包装方式" align="left" prop="spare34" />
-      <el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
-      <el-table-column width="160" label="长" align="righ" prop="spare36" />
-      <el-table-column width="160" label="宽" align="righ" prop="spare37" />
-      <el-table-column width="160" label="高" align="righ" prop="spare38" />
-      <el-table-column width="160" label="包装材积" align="righ" prop="spare39" />
-      <el-table-column width="160" label="描述" align="left" prop="remark" />
+      <el-table-column label="NC号" align="left" prop="spare9"/>
+      <el-table-column label="电源线" align="left" prop="spare10"/>
+      <el-table-column label="插头" align="left" prop="spare11"/>
+      <el-table-column label="接嘴" align="left" prop="spare12"/>
+      <el-table-column label="快捷码" align="left" prop="spare13"/>
+      <el-table-column label="库存单位编号" align="left" prop="spare14"/>
+      <el-table-column label="库存单位名称" align="left" prop="spare15"/>
+      <el-table-column label="品号群组" align="left" prop="spare16"/>
+      <el-table-column label="归类品" align="left" prop="spare17"/>
+      <el-table-column label="计量体系" align="left" prop="spare18"/>
+      <el-table-column label="群组名称" align="left" prop="spare19"/>
+      <el-table-column label="批号管理" align="left" prop="spare20"/>
+      <el-table-column label="状态" align="left" prop="spare21"/>
+      <el-table-column label="产品大类" align="left" prop="spare22"/>
+      <el-table-column label="产品二类" align="left" prop="spare23"/>
+      <el-table-column label="产品线/产品系列" align="left" prop="spare24"/>
+      <el-table-column label="BOM状态" align="left" prop="spare25"/>
+      <el-table-column label="产品定位" align="left" prop="spare26"/>
+      <el-table-column label="电脑板型号" align="left" prop="spare27"/>
+      <el-table-column label="非标要求" align="left" prop="spare28"/>
+      <el-table-column label="品牌" align="left" prop="spare29"/>
+      <el-table-column label="非标颜色" align="left" prop="spare30"/>
+      <el-table-column label="主颜色" align="left" prop="spare31"/>
+      <el-table-column label="辅助颜色" align="left" prop="spare32"/>
+      <el-table-column label="是否标准款" align="left" prop="spare33"/>
+      <el-table-column label="包装方式" align="left" prop="spare34"/>
+      <el-table-column label="主要包装方式" align="left" prop="spare35"/>
+      <el-table-column label="长" align="righ" prop="spare36"/>
+      <el-table-column label="宽" align="righ" prop="spare37"/>
+      <el-table-column label="高" align="righ" prop="spare38"/>
+      <el-table-column label="包装材积" align="righ" prop="spare39"/>
+      <el-table-column label="描述" align="left" prop="remark"/>
       <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
       <!--        <template slot-scope="scope">-->
       <!--          <el-button-->
@@ -1010,11 +512,17 @@
 </template>
 
 <script>
-import { listViewInJobFlow, getViewInJobFlow, delViewInJobFlow, addViewInJobFlow, updateViewInJobFlow } from "@/api/search/ViewInJobFlow"
+import {
+  listViewInJobFlow,
+  getViewInJobFlow,
+  delViewInJobFlow,
+  addViewInJobFlow,
+  updateViewInJobFlow
+} from "@/api/search/ViewInJobFlow"
 
 export default {
   name: "ViewInJobFlow",
-  dicts: ['execution_phase_type', 'mydo_job_status','in_job_type'],
+  dicts: ['execution_phase_type', 'mydo_job_status', 'in_all_job_type'],
   data() {
     return {
       // 遮罩层
@@ -1294,7 +802,8 @@ export default {
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1309,6 +818,7 @@ export default {
 .el-table >>> .current-row {
   background-color: #f0f9eb;
 }
+
 .el-form-item >>> .el-form-item__label {
   white-space: nowrap;
   width: auto;

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

@@ -1,32 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="作业ID" prop="jobId">
-        <el-input
-          v-model="queryParams.jobId"
-          placeholder="请输入作业ID"
-          clearable
-          @keyup.enter.native="handleQuery"
+      <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="inOrOut">
+        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
+          <el-option
+            v-for="dict in dict.type.out_all_job_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-<!--      <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"
@@ -35,194 +29,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="托盘码" prop="trayCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.trayCode"-->
-<!--          placeholder="请输入托盘码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="巷道ID" prop="roadwayId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.roadwayId"-->
-<!--          placeholder="请输入巷道ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="货位ID" prop="cargoSpaceId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoSpaceId"-->
-<!--          placeholder="请输入货位ID"-->
-<!--          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"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="排" prop="thePlatoon">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.thePlatoon"-->
-<!--          placeholder="请输入排"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="列" prop="theColumn">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.theColumn"-->
-<!--          placeholder="请输入列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="层" prop="theFloor">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.theFloor"-->
-<!--          placeholder="请输入层"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="优先级" prop="priority">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.priority"-->
-<!--          placeholder="请输入优先级"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="执行阶段" prop="executionPhase">-->
-<!--        <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.execution_phase_type"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="作业类型" prop="inOrOut">-->
-<!--        <el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.out_job_type"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出口ID" prop="exitId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.exitId"-->
-<!--          placeholder="请输入出口ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="物料ID" prop="wlbh">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.wlbh"-->
-<!--          placeholder="请输入物料ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号" prop="lotNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNo"-->
-<!--          placeholder="请输入批号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="剁型ID" prop="stackingId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stackingId"-->
-<!--          placeholder="请输入剁型ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出库数量" prop="outQuantity">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.outQuantity"-->
-<!--          placeholder="请输入出库数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="回流数量" prop="giveNum">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.giveNum"-->
-<!--          placeholder="请输入回流数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="单据ID" prop="inOrOutId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.inOrOutId"-->
-<!--          placeholder="请输入单据ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="子单据ID" prop="inOrOutDId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.inOrOutDId"-->
-<!--          placeholder="请输入子单据ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="创建时间" prop="createTime">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createTime"-->
-<!--          placeholder="请输入创建时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="开始时间" prop="startTime">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.startTime"-->
-<!--          placeholder="请输入开始时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="结束时间" prop="finishTime">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.finishTime"-->
-<!--          placeholder="请输入结束时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请输入仓库ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="物料GUID" prop="productGuid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productGuid"-->
-<!--          placeholder="请输入物料GUID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="巷道" prop="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="序列号" prop="trayCode">
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入序列号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="订单号" prop="lineId">
         <el-input
           v-model="queryParams.productId"
@@ -247,375 +69,46 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="产品分类" prop="parentId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.parentId"-->
-<!--          placeholder="请输入产品分类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号描述" prop="price">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          placeholder="请输入品号描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="英文描述" prop="cargoNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
-<!--          placeholder="请输入英文描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图号" prop="unit">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入图号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格" prop="spec">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="描述" prop="remark">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.remark"-->
-<!--          placeholder="请输入描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="型号" prop="spare1">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare1"-->
-<!--          placeholder="请输入型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="单件净重" prop="spare2">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare2"-->
-<!--          placeholder="请输入单件净重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="颜色" prop="spare3">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare3"-->
-<!--          placeholder="请输入颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="序列号" prop="spare4">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare4"-->
-<!--          placeholder="请输入序列号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电压" prop="spare5">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare5"-->
-<!--          placeholder="请输入电压"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="功率" prop="spare6">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare6"-->
-<!--          placeholder="请输入功率"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      -->
-<!--      <el-form-item label="相位" prop="spare7">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare7"-->
-<!--          placeholder="请输入相位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="毛重" prop="spare8">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare8"-->
-<!--          placeholder="请输入毛重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="NC号" prop="spare9">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare9"-->
-<!--          placeholder="请输入NC号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电源线" prop="spare10">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare10"-->
-<!--          placeholder="请输入电源线"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="插头" prop="spare11">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare11"-->
-<!--          placeholder="请输入插头"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="接嘴" prop="spare12">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare12"-->
-<!--          placeholder="请输入接嘴"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="快捷码" prop="spare13">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare13"-->
-<!--          placeholder="请输入快捷码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位编号" prop="spare14">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare14"-->
-<!--          placeholder="请输入库存单位编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位名称" prop="spare15">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare15"-->
-<!--          placeholder="请输入库存单位名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号群组" prop="spare16">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare16"-->
-<!--          placeholder="请输入品号群组"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="归类品" prop="spare17">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare17"-->
-<!--          placeholder="请输入归类品"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计量体系" prop="spare18">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare18"-->
-<!--          placeholder="请输入计量体系"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="群组名称" prop="spare19">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare19"-->
-<!--          placeholder="请输入群组名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号管理" prop="spare20">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare20"-->
-<!--          placeholder="请输入批号管理"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="spare21">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare21"-->
-<!--          placeholder="请输入状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品大类" prop="spare22">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare22"-->
-<!--          placeholder="请输入产品大类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品二类" prop="spare23">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare23"-->
-<!--          placeholder="请输入产品二类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare24"-->
-<!--          placeholder="请输入产品线/产品系列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="BOM状态" prop="spare25">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare25"-->
-<!--          placeholder="请输入BOM状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品定位" prop="spare26">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare26"-->
-<!--          placeholder="请输入产品定位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电脑板型号" prop="spare27">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare27"-->
-<!--          placeholder="请输入电脑板型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标要求" prop="spare28">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare28"-->
-<!--          placeholder="请输入非标要求"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品牌" prop="spare29">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare29"-->
-<!--          placeholder="请输入品牌"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标颜色" prop="spare30">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare30"-->
-<!--          placeholder="请输入非标颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主颜色" prop="spare31">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare31"-->
-<!--          placeholder="请输入主颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="辅助颜色" prop="spare32">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare32"-->
-<!--          placeholder="请输入辅助颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="是否标准款" prop="spare33">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare33"-->
-<!--          placeholder="请输入是否标准款"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装方式" prop="spare34">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare34"-->
-<!--          placeholder="请输入包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主要包装方式" prop="spare35">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare35"-->
-<!--          placeholder="请输入主要包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="长" prop="spare36">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare36"-->
-<!--          placeholder="请输入长"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="宽" prop="spare37">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare37"-->
-<!--          placeholder="请输入宽"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="高" prop="spare38">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare38"-->
-<!--          placeholder="请输入高"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装材积" prop="spare39">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare39"-->
-<!--          placeholder="请输入包装材积"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="客户名称" prop="customerName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.customerName"-->
-<!--          placeholder="请输入客户名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="货位-排" prop="thePlatoon">
+        <el-input
+          v-model="queryParams.thePlatoon"
+          placeholder="请输入货位-排"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位-列" prop="theColumn">
+        <el-input
+          v-model="queryParams.theColumn"
+          placeholder="请输入货位-列"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位-层" prop="theFloor">
+        <el-input
+          v-model="queryParams.theFloor"
+          placeholder="请输入货位-层"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择开始时间" style="width: 206px">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.finishTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择结束时间" style="width: 206px">
+        </el-date-picker>
+      </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>
@@ -663,70 +156,61 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['search:ViewOutJobFlow:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <left-toolbar :showSearch.sync="showSearch" @queryTable="getList"></left-toolbar>
     </el-row>
 
     <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="160" label="作业ID" align="left" prop="jobId" />
-      <el-table-column width="160" label="子作业ID" align="left" prop="jobDetailId" />
-      <el-table-column width="160" label="作业类型" align="center" prop="inOrOut">
+      <el-table-column label="作业ID" align="left" prop="jobId" width="150" />
+<!--      <el-table-column label="子作业ID" align="left" prop="jobDetailId" display="display"/>-->
+      <el-table-column label="作业类型" align="left" prop="inOrOut">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.out_all_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-      <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 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="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" />-->
-<!--      <el-table-column label="优先级" align="center" prop="priority" />-->
-<!--      <el-table-column label="执行阶段" align="center" prop="executionPhase">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-
-      <el-table-column width="160" label="状态" align="center" prop="status">
+      <el-table-column label="作业状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column width="160" label="出口ID" align="left" prop="exitId" />
+      <el-table-column label="任务号" align="left" prop="taskNo"/>
+      <el-table-column label="巷道" align="left" prop="roadwayId"/>
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="120"/>
+      <el-table-column label="出口" align="left" prop="exitId"/>
+
+      <el-table-column label="订单号" align="left" prop="lineId" 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="left" prop="trayCode" width="160"/>
+      <el-table-column label="出库数量" align="left" prop="outQuantity"/>
+      <el-table-column label="排" align="left" prop="thePlatoon"/>
+      <el-table-column label="列" align="left" prop="theColumn"/>
+      <el-table-column label="层" align="left" prop="theFloor"/>
+      <el-table-column label="创建时间" align="left" prop="createTime" width="160"/>
+      <el-table-column label="开始时间" align="left" prop="startTime" width="160"/>
+      <el-table-column label="结束时间" align="left" prop="finishTime" width="160"/>
+
       <!--      <el-table-column label="物料ID" align="center" prop="wlbh" />-->
-      <el-table-column width="160" label="批号" align="left" prop="lotNo" />
+      <el-table-column 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="giveNum" />-->
-      <el-table-column width="160" label="单据ID" align="left" prop="inOrOutId" />
-      <el-table-column width="160" label="子单据ID" align="left" prop="inOrOutDId" />
-      <el-table-column width="160" label="创建时间" align="left">
-        <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 width="120" label="回流数量" align="left" prop="giveNum" />-->
+      <el-table-column label="单据ID" align="left" prop="inOrOutId"/>
+      <el-table-column label="子单据ID" align="left" prop="inOrOutDId"/>
 
-      <!--      <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="160" label="客户名称" align="left" prop="customerName" />
+      <el-table-column label="客户名称" align="left" prop="customerName"/>
 
-      <el-table-column width="160" label="品号描述" align="left" prop="price" />
-      <el-table-column width="160" label="英文描述" align="left" prop="cargoNo" />
+      <el-table-column label="品号描述" align="left" prop="price"/>
+      <el-table-column label="英文描述" align="left" prop="cargoNo"/>
       <!--      <el-table-column width="120" label="产品分类" align="left" prop="parentId" />-->
-      <el-table-column width="160" label="图号" align="left" prop="unit" />
-      <el-table-column width="160" label="规格" align="left" prop="spec" />
+      <el-table-column label="图号" align="left" prop="unit"/>
+      <el-table-column 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" />-->
@@ -735,38 +219,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="160" label="NC号" align="left" prop="spare9" />
-      <el-table-column width="160" label="电源线" align="left" prop="spare10" />
-      <el-table-column width="160" label="插头" align="left" prop="spare11" />
-      <el-table-column width="160" label="接嘴" align="left" prop="spare12" />
-      <el-table-column width="160" label="快捷码" align="left" prop="spare13" />
-      <el-table-column width="160" label="库存单位编号" align="left" prop="spare14" />
-      <el-table-column width="160" label="库存单位名称" align="left" prop="spare15" />
-      <el-table-column width="160" label="品号群组" align="left" prop="spare16" />
-      <el-table-column width="160" label="归类品" align="left" prop="spare17" />
-      <el-table-column width="160" label="计量体系" align="left" prop="spare18" />
-      <el-table-column width="160" label="群组名称" align="left" prop="spare19" />
-      <el-table-column width="160" label="批号管理" align="left" prop="spare20" />
-      <el-table-column width="160" label="状态" align="left" prop="spare21" />
-      <el-table-column width="160" label="产品大类" align="left" prop="spare22" />
-      <el-table-column width="160" label="产品二类" align="left" prop="spare23" />
-      <el-table-column width="160" label="产品线/产品系列" align="left" prop="spare24" />
-      <el-table-column width="160" label="BOM状态" align="left" prop="spare25" />
-      <el-table-column width="160" label="产品定位" align="left" prop="spare26" />
-      <el-table-column width="160" label="电脑板型号" align="left" prop="spare27" />
-      <el-table-column width="160" label="非标要求" align="left" prop="spare28" />
-      <el-table-column width="160" label="品牌" align="left" prop="spare29" />
-      <el-table-column width="160" label="非标颜色" align="left" prop="spare30" />
-      <el-table-column width="160" label="主颜色" align="left" prop="spare31" />
-      <el-table-column width="160" label="辅助颜色" align="left" prop="spare32" />
-      <el-table-column width="160" label="是否标准款" align="left" prop="spare33" />
-      <el-table-column width="160" label="包装方式" align="left" prop="spare34" />
-      <el-table-column width="160" label="主要包装方式" align="left" prop="spare35" />
-      <el-table-column width="160" label="长" align="right" prop="spare36" />
-      <el-table-column width="160" label="宽" align="right" prop="spare37" />
-      <el-table-column width="160" label="高" align="right" prop="spare38" />
-      <el-table-column width="160" label="包装材积" align="right" prop="spare39" />
-      <el-table-column width="160" label="描述" align="left" prop="remark" />
+      <el-table-column label="NC号" align="left" prop="spare9"/>
+      <el-table-column label="电源线" align="left" prop="spare10"/>
+      <el-table-column label="插头" align="left" prop="spare11"/>
+      <el-table-column label="接嘴" align="left" prop="spare12"/>
+      <el-table-column label="快捷码" align="left" prop="spare13"/>
+      <el-table-column label="库存单位编号" align="left" prop="spare14"/>
+      <el-table-column label="库存单位名称" align="left" prop="spare15"/>
+      <el-table-column label="品号群组" align="left" prop="spare16"/>
+      <el-table-column label="归类品" align="left" prop="spare17"/>
+      <el-table-column label="计量体系" align="left" prop="spare18"/>
+      <el-table-column label="群组名称" align="left" prop="spare19"/>
+      <el-table-column label="批号管理" align="left" prop="spare20"/>
+      <el-table-column label="状态" align="left" prop="spare21"/>
+      <el-table-column label="产品大类" align="left" prop="spare22"/>
+      <el-table-column label="产品二类" align="left" prop="spare23"/>
+      <el-table-column label="产品线/产品系列" align="left" prop="spare24"/>
+      <el-table-column label="BOM状态" align="left" prop="spare25"/>
+      <el-table-column label="产品定位" align="left" prop="spare26"/>
+      <el-table-column label="电脑板型号" align="left" prop="spare27"/>
+      <el-table-column label="非标要求" align="left" prop="spare28"/>
+      <el-table-column label="品牌" align="left" prop="spare29"/>
+      <el-table-column label="非标颜色" align="left" prop="spare30"/>
+      <el-table-column label="主颜色" align="left" prop="spare31"/>
+      <el-table-column label="辅助颜色" align="left" prop="spare32"/>
+      <el-table-column label="是否标准款" align="left" prop="spare33"/>
+      <el-table-column label="包装方式" align="left" prop="spare34"/>
+      <el-table-column label="主要包装方式" align="left" prop="spare35"/>
+      <el-table-column label="长" align="left" prop="spare36"/>
+      <el-table-column label="宽" align="left" prop="spare37"/>
+      <el-table-column label="高" align="left" prop="spare38"/>
+      <el-table-column label="包装材积" align="left" prop="spare39"/>
+      <el-table-column label="描述" align="left" prop="remark"/>
       <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
       <!--        <template slot-scope="scope">-->
       <!--          <el-button-->
@@ -1051,11 +535,17 @@
 </template>
 
 <script>
-import { listViewOutJobFlow, getViewOutJobFlow, delViewOutJobFlow, addViewOutJobFlow, updateViewOutJobFlow } from "@/api/search/ViewOutJobFlow"
+import {
+  listViewOutJobFlow,
+  getViewOutJobFlow,
+  delViewOutJobFlow,
+  addViewOutJobFlow,
+  updateViewOutJobFlow
+} from "@/api/search/ViewOutJobFlow"
 
 export default {
   name: "ViewOutJobFlow",
-  dicts: ['execution_phase_type', 'mydo_job_status', 'out_job_type'],
+  dicts: ['execution_phase_type', 'mydo_job_status', 'out_all_job_type'],
   data() {
     return {
       // 遮罩层
@@ -1339,7 +829,8 @@ export default {
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -1,25 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <!-- <el-form-item label="仓库名称" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称" clearable>
-          <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item> -->
 
-      <el-form-item label="库存ID" prop="stockId">
-        <el-input
-          v-model="queryParams.stockId"
-          placeholder="请输入库存ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="订单号" prop="orderId">
         <el-input
           v-model="queryParams.orderId"
@@ -28,15 +10,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="入库单号" prop="stockinDetailId" style="white-space: nowrap">
-        <el-input
-          v-model="queryParams.stockinDetailId"
-          placeholder="请输入入库单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-
       <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -53,34 +26,65 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="托盘条码" prop="trayCode">
+      <el-form-item label="序列号" prop="trayCode">
         <el-input
           v-model="queryParams.trayCode"
-          placeholder="请输入托盘条码"
+          placeholder="请输入序列号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </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 label="巷道" prop="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位-排" prop="thePlatoon">
+        <el-input
+          v-model="queryParams.thePlatoon"
+          placeholder="请输入货位-排"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- 列 -->
+      <el-form-item label="货位-列" prop="theColumn">
+        <el-input
+          v-model="queryParams.theColumn"
+          placeholder="请输入货位-列"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- 层 -->
+      <el-form-item label="货位-层" prop="theFloor">
+        <el-input
+          v-model="queryParams.theFloor"
+          placeholder="请输入货位-层"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择开始时间" style="width: 206px">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.finishTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择结束时间" style="width: 206px">
+        </el-date-picker>
+      </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>
@@ -138,11 +142,12 @@
       <!-- <el-table-column label="序号" align="right" prop="onlyIdentity" width="80"/> -->
       <el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
       <el-table-column label="订单号" align="left" prop="orderId" width="160"/>
-      <el-table-column label="物料编号" align="left" prop="productId" 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="left" prop="roadwayId" width="160"/>
       <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="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"/>
@@ -151,7 +156,7 @@
 <!--      <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="垛型ID" align="left" prop="stackingId" width="120"/>-->
-      <el-table-column label="巷道ID" align="left" prop="roadwayId" width="160"/>
+
       <el-table-column label="货位状态" align="left" prop="cargoSpaceStatus" width="160">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
@@ -167,11 +172,11 @@
           <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="是否锁定" align="left" prop="locked" width="160">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="是否锁定" align="left" prop="locked" width="160">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="物料GUID" align="left" prop="productGuid" width="180"/> -->
       <el-table-column label="规格" align="left" prop="spec" width="160"/>
       <!-- <el-table-column label="单位" align="left" prop="unit" width="100"/> -->
@@ -413,7 +418,12 @@ export default {
         spare37: null,
         spare38: null,
         spare39: null,
-        remark: null
+        remark: null,
+        thePlatoon: null,
+        theColumn: null,
+        theFloor: null,
+        startTime: null,
+        finishTime: null
       },
       // 表单参数
       form: {},

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

@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="入库单guid" prop="stockinGuid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stockinGuid"-->
-<!--          placeholder="请输入入库单guid"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item label="入库单号" prop="stockinId">
         <el-input
           v-model="queryParams.stockinId"
@@ -27,48 +19,16 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="创建时间" prop="createDate">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createDate"-->
-<!--          placeholder="请输入创建时间"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="创建人" prop="createManId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createManId"-->
-<!--          placeholder="请输入创建人"-->
-<!--          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.in_bill_status"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请输入仓库ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="完成时间" prop="finishDate">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.finishDate"-->
-<!--          placeholder="请输入完成时间"-->
-<!--          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.in_bill_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="订单号" prop="erpBill">
         <el-input
           v-model="queryParams.erpBill"
@@ -77,184 +37,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="单据来源" prop="stockSource">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stockSource"-->
-<!--          placeholder="请输入单据来源"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="班组编码" prop="classNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.classNo"-->
-<!--          placeholder="请输入班组编码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="供应商编号" prop="supplierNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.supplierNo"-->
-<!--          placeholder="请输入供应商编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="供应商名称" prop="supplierName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.supplierName"-->
-<!--          placeholder="请输入供应商名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="供应商简称" prop="simpleName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.simpleName"-->
-<!--          placeholder="请输入供应商简称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="联系人" prop="contactName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.contactName"-->
-<!--          placeholder="请输入联系人"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="联系电话" prop="contactNumber">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.contactNumber"-->
-<!--          placeholder="请输入联系电话"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="供应商地址" prop="address">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.address"-->
-<!--          placeholder="请输入供应商地址"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="入库明细ID" prop="stockinDetailId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stockinDetailId"-->
-<!--          placeholder="请输入入库明细ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批次号" prop="lotNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNo"-->
-<!--          placeholder="请输入批次号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计划数量" prop="quantity">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.quantity"-->
-<!--          placeholder="请输入计划数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计划箱数" prop="quantityX">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.quantityX"-->
-<!--          placeholder="请输入计划箱数"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计划件数" prop="quantityJ">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.quantityJ"-->
-<!--          placeholder="请输入计划件数"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="实际数量" prop="assignNum">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.assignNum"-->
-<!--          placeholder="请输入实际数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="实际箱数" prop="assignNumX">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.assignNumX"-->
-<!--          placeholder="请输入实际箱数"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="实际件数" prop="assignNumJ">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.assignNumJ"-->
-<!--          placeholder="请输入实际件数"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="扫码数量" prop="scanNum">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.scanNum"-->
-<!--          placeholder="请输入扫码数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="扫码箱数" prop="scanNumX">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.scanNumX"-->
-<!--          placeholder="请输入扫码箱数"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="扫码件数" prop="scanNumJ">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.scanNumJ"-->
-<!--          placeholder="请输入扫码件数"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="入库日期" prop="printDate">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.printDate"-->
-<!--          placeholder="请输入入库日期"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </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="productGuid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productGuid"-->
-<!--          placeholder="请输入物料主键"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+
       <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -263,102 +46,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="产品分类" prop="parentId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.parentId"-->
-<!--          placeholder="请输入产品分类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号描述" prop="price">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          placeholder="请输入品号描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="英文描述" prop="cargoNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
-<!--          placeholder="请输入英文描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图号" prop="unit">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入图号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格" prop="spec">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="描述" prop="remark">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.remark"-->
-<!--          placeholder="请输入描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="型号" prop="spare1">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare1"-->
-<!--          placeholder="请输入型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="单件净重" prop="spare2">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare2"-->
-<!--          placeholder="请输入单件净重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="颜色" prop="spare3">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare3"-->
-<!--          placeholder="请输入颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="序列号" prop="spare4">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare4"-->
-<!--          placeholder="请输入序列号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电压" prop="spare5">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare5"-->
-<!--          placeholder="请输入电压"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="功率" prop="spare6">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare6"-->
-<!--          placeholder="请输入功率"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -367,278 +54,31 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="相位" prop="spare7">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare7"-->
-<!--          placeholder="请输入相位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="毛重" prop="spare8">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare8"-->
-<!--          placeholder="请输入毛重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="NC号" prop="spare9">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare9"-->
-<!--          placeholder="请输入NC号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电源线" prop="spare10">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare10"-->
-<!--          placeholder="请输入电源线"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="插头" prop="spare11">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare11"-->
-<!--          placeholder="请输入插头"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="接嘴" prop="spare12">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare12"-->
-<!--          placeholder="请输入接嘴"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="快捷码" prop="spare13">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare13"-->
-<!--          placeholder="请输入快捷码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位编号" prop="spare14">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare14"-->
-<!--          placeholder="请输入库存单位编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位名称" prop="spare15">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare15"-->
-<!--          placeholder="请输入库存单位名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号群组" prop="spare16">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare16"-->
-<!--          placeholder="请输入品号群组"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="归类品" prop="spare17">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare17"-->
-<!--          placeholder="请输入归类品"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计量体系" prop="spare18">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare18"-->
-<!--          placeholder="请输入计量体系"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="群组名称" prop="spare19">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare19"-->
-<!--          placeholder="请输入群组名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号管理" prop="spare20">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare20"-->
-<!--          placeholder="请输入批号管理"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="spare21">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare21"-->
-<!--          placeholder="请输入状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品大类" prop="spare22">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare22"-->
-<!--          placeholder="请输入产品大类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品二类" prop="spare23">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare23"-->
-<!--          placeholder="请输入产品二类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare24"-->
-<!--          placeholder="请输入产品线/产品系列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="BOM状态" prop="spare25">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare25"-->
-<!--          placeholder="请输入BOM状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品定位" prop="spare26">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare26"-->
-<!--          placeholder="请输入产品定位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电脑板型号" prop="spare27">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare27"-->
-<!--          placeholder="请输入电脑板型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标要求" prop="spare28">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare28"-->
-<!--          placeholder="请输入非标要求"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品牌" prop="spare29">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare29"-->
-<!--          placeholder="请输入品牌"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标颜色" prop="spare30">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare30"-->
-<!--          placeholder="请输入非标颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主颜色" prop="spare31">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare31"-->
-<!--          placeholder="请输入主颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="辅助颜色" prop="spare32">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare32"-->
-<!--          placeholder="请输入辅助颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="是否标准款" prop="spare33">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare33"-->
-<!--          placeholder="请输入是否标准款"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装方式" prop="spare34">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare34"-->
-<!--          placeholder="请输入包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主要包装方式" prop="spare35">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare35"-->
-<!--          placeholder="请输入主要包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="长" prop="spare36">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare36"-->
-<!--          placeholder="请输入长"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="宽" prop="spare37">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare37"-->
-<!--          placeholder="请输入宽"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="高" prop="spare38">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare38"-->
-<!--          placeholder="请输入高"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装材积" prop="spare39">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare39"-->
-<!--          placeholder="请输入包装材积"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库名称" prop="warehouseName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseName"-->
-<!--          placeholder="请输入仓库名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="序列号" prop="spare4">
+        <el-input
+          v-model="queryParams.spare4"
+          placeholder="请输入序列号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择开始时间" style="width: 206px">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.finishTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择结束时间" style="width: 206px">
+        </el-date-picker>
+      </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>
@@ -701,10 +141,10 @@
           <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="160"/>
       <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="center" prop="createDate" width="160"/>
+      <el-table-column label="完成时间" align="center" prop="finishDate" width="160"/>
       <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"/>
@@ -1195,7 +635,9 @@ export default {
         spare37: null,
         spare38: null,
         spare39: null,
-        warehouseName: null
+        warehouseName: null,
+        startTime: null,
+        finishTime: null
       },
       // 表单参数
       form: {},

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

@@ -19,96 +19,16 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="创建日期" prop="createDate">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createDate"-->
-<!--          placeholder="请输入创建日期"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="创建人ID" prop="createManId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createManId"-->
-<!--          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.out_bill_status"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出库来源" prop="stockoutSource">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stockoutSource"-->
-<!--          placeholder="请输入出库来源"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出口" prop="exitId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.exitId"-->
-<!--          placeholder="请输入出口"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="仓库ID" prop="warehouseId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请输入仓库ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出库明细ID" prop="stockoutDetailId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stockoutDetailId"-->
-<!--          placeholder="请输入出库明细ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批次号" prop="lotNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNo"-->
-<!--          placeholder="请输入批次号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="出库数量" prop="quantity">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.quantity"-->
-<!--          placeholder="请输入出库数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="分配数量" prop="allotQuantity">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.allotQuantity"-->
-<!--          placeholder="请输入分配数量"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="分配编号" prop="assignNum">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.assignNum"-->
-<!--          placeholder="请输入分配编号"-->
-<!--          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.out_bill_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="订单号" prop="erpStockoutId">
         <el-input
           v-model="queryParams.erpStockoutId"
@@ -117,30 +37,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="客户编号" prop="entryid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.entryid"-->
-<!--          placeholder="请输入客户编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="客户名称" prop="customerName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.customerName"-->
-<!--          placeholder="请输入客户名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="物料主键" prop="productGuid">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productGuid"-->
-<!--          placeholder="请输入物料主键"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
@@ -149,102 +45,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="产品分类" prop="parentId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.parentId"-->
-<!--          placeholder="请输入产品分类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号描述" prop="price">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          placeholder="请输入品号描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="英文描述" prop="cargoNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.cargoNo"-->
-<!--          placeholder="请输入英文描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图号" prop="unit">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.unit"-->
-<!--          placeholder="请输入图号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格" prop="spec">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="描述" prop="remark">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.remark"-->
-<!--          placeholder="请输入描述"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="型号" prop="spare1">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare1"-->
-<!--          placeholder="请输入型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="单件净重" prop="spare2">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare2"-->
-<!--          placeholder="请输入单件净重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="颜色" prop="spare3">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare3"-->
-<!--          placeholder="请输入颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="序列号" prop="spare4">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare4"-->
-<!--          placeholder="请输入序列号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电压" prop="spare5">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare5"-->
-<!--          placeholder="请输入电压"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="功率" prop="spare6">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare6"-->
-<!--          placeholder="请输入功率"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+
       <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
@@ -253,270 +54,31 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="相位" prop="spare7">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare7"-->
-<!--          placeholder="请输入相位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="毛重" prop="spare8">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare8"-->
-<!--          placeholder="请输入毛重"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="NC号" prop="spare9">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare9"-->
-<!--          placeholder="请输入NC号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电源线" prop="spare10">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare10"-->
-<!--          placeholder="请输入电源线"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="插头" prop="spare11">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare11"-->
-<!--          placeholder="请输入插头"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="接嘴" prop="spare12">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare12"-->
-<!--          placeholder="请输入接嘴"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="快捷码" prop="spare13">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare13"-->
-<!--          placeholder="请输入快捷码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位编号" prop="spare14">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare14"-->
-<!--          placeholder="请输入库存单位编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="库存单位名称" prop="spare15">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare15"-->
-<!--          placeholder="请输入库存单位名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品号群组" prop="spare16">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare16"-->
-<!--          placeholder="请输入品号群组"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="归类品" prop="spare17">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare17"-->
-<!--          placeholder="请输入归类品"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="计量体系" prop="spare18">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare18"-->
-<!--          placeholder="请输入计量体系"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="群组名称" prop="spare19">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare19"-->
-<!--          placeholder="请输入群组名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="批号管理" prop="spare20">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare20"-->
-<!--          placeholder="请输入批号管理"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="状态" prop="spare21">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare21"-->
-<!--          placeholder="请输入状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品大类" prop="spare22">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare22"-->
-<!--          placeholder="请输入产品大类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品二类" prop="spare23">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare23"-->
-<!--          placeholder="请输入产品二类"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品线/产品系列" prop="spare24">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare24"-->
-<!--          placeholder="请输入产品线/产品系列"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="BOM状态" prop="spare25">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare25"-->
-<!--          placeholder="请输入BOM状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产品定位" prop="spare26">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare26"-->
-<!--          placeholder="请输入产品定位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="电脑板型号" prop="spare27">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare27"-->
-<!--          placeholder="请输入电脑板型号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标要求" prop="spare28">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare28"-->
-<!--          placeholder="请输入非标要求"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="品牌" prop="spare29">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare29"-->
-<!--          placeholder="请输入品牌"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="非标颜色" prop="spare30">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare30"-->
-<!--          placeholder="请输入非标颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主颜色" prop="spare31">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare31"-->
-<!--          placeholder="请输入主颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="辅助颜色" prop="spare32">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare32"-->
-<!--          placeholder="请输入辅助颜色"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="是否标准款" prop="spare33">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare33"-->
-<!--          placeholder="请输入是否标准款"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装方式" prop="spare34">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare34"-->
-<!--          placeholder="请输入包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="主要包装方式" prop="spare35">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare35"-->
-<!--          placeholder="请输入主要包装方式"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="长" prop="spare36">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare36"-->
-<!--          placeholder="请输入长"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="宽" prop="spare37">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare37"-->
-<!--          placeholder="请输入宽"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="高" prop="spare38">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare38"-->
-<!--          placeholder="请输入高"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="包装材积" prop="spare39">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spare39"-->
-<!--          placeholder="请输入包装材积"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="序列号" prop="spare4">
+        <el-input
+          v-model="queryParams.spare4"
+          placeholder="请输入序列号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime"> <!-- 开始时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择开始时间" style="width: 206px">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="结束时间" prop="finishTime"> <!-- 结束时间 -->
+        <el-date-picker clearable
+                        v-model="queryParams.finishTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择结束时间" style="width: 206px">
+        </el-date-picker>
+      </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>
@@ -578,24 +140,22 @@
           <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="160"/>
-      <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 width="120" label="仓库ID" align="left" prop="warehouseId" />-->
+
+      <el-table-column label="创建人ID" align="center" prop="createManId" width="160"/>
+      <el-table-column width="160" label="订单号" align="left" prop="erpStockoutId" />
+      <el-table-column label="创建时间" align="center" prop="createDate" width="160" sortable/>
+      <el-table-column label="开始时间" align="center" prop="startDate" width="160"/>
+      <el-table-column label="完成时间" align="center" prop="finishDate" width="160"/>
+      <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="right" prop="quantity" />
       <el-table-column width="160" label="分配数量" align="right" prop="allotQuantity" />
-<!--      <el-table-column label="分配编号" align="center" prop="assignNum" />-->
-<!--      <el-table-column label="客户编号" align="center" prop="entryid" />-->
+      <el-table-column width="160" label="确认数量" align="right" prop="assignNum" />
       <el-table-column width="160" label="批次号" align="left" prop="lotNo" />
       <el-table-column width="160" label="客户名称" align="left" prop="customerName" />
       <!--      <el-table-column label="物料主键" align="center" prop="productGuid" />-->
@@ -982,7 +542,9 @@ export default {
         spare36: null,
         spare37: null,
         spare38: null,
-        spare39: null
+        spare39: null,
+        startTime: null,
+        finishTime: null
       },
       // 表单参数
       form: {},

ruoyi-ui/src/views/stock/pointOut.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="品名" prop="productName"><!-- 品名 -->
+      <el-form-item label="品号" prop="productId"><!-- 品名 -->
         <el-input
-          v-model="queryParams.productName"
-          placeholder="请输入品名"
+          v-model="queryParams.productId"
+          placeholder="请输入品号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -33,6 +33,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="巷道" prop="roadwayId"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="货位-排" prop="thePlatoon"><!-- 货位id -->
         <el-input
           v-model="queryParams.thePlatoon"
@@ -79,13 +87,16 @@
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
-      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
+      <el-table-column label="库存编码" align="center" prop="stockId" width="120"/>
+      <el-table-column label="巷道" align="center" prop="roadwayId" sortable/>
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/>
+      <el-table-column label="入库日期" align="center" prop="inDate" width="160" sortable/>
       <el-table-column label="批次号" align="center" prop="lotNo"/>
-      <el-table-column label="订单号" align="center" prop="orderId" width="160"/>
-      <el-table-column label="品号" align="center" prop="productId"/>
+      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>
+      <el-table-column label="序列号" align="center" prop="trayCode"  width="130" sortable/>
+      <el-table-column label="品号" align="center" prop="productId" sortable/>
       <el-table-column label="品名" align="center" prop="productName"/>
-      <el-table-column label="数量" align="center" prop="quantity" width="80"/>
+      <el-table-column label="数量" align="center" prop="quantity"/>
       <el-table-column label="规格" align="center" prop="spare1"/>
       <el-table-column label="单位" align="center" prop="spare3"/>
       <el-table-column label="型号" align="center" prop="spare4"/>
@@ -220,7 +231,8 @@ export default {
         spare3: null,
         spare4: null,
         spare5: null,
-        spare6: null
+        spare6: null,
+        roadwayId: null
       },
       // 表单参数
       form: {},
@@ -304,7 +316,8 @@ export default {
         spare3: null,
         spare4: null,
         spare5: null,
-        spare6: null
+        spare6: null,
+        roadwayId: null
       }
       this.resetForm("form")
     },
@@ -378,12 +391,9 @@ export default {
         this.$modal.msgError("请至少选择一行数据");
         return;
       }
-
       // 获取选中的完整数据
       const selectedData = this.managementList.filter(item => this.ids.includes(item.stockId));
       this.selectedStockData = selectedData;
-
-
       // 显示出口选择弹窗
       this.exitDialogVisible = true;
       this.exitForm.exitId = null;
@@ -396,7 +406,7 @@ export default {
         if (valid) {
           const stockIds = this.ids;
           // 调用API将stockIds数组和出口信息传给后端
-          console.log("指定货位出库：", stockIds, this.exitForm.exitId)
+          //console.log("指定货位出库：", stockIds, this.exitForm.exitId)
           pointOut(stockIds, this.exitForm.exitId).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.getList();