diff --git a/RuoYi-App-master/locales/zh-CN.json b/RuoYi-App-master/locales/zh-CN.json
index cedb262..32f461d 100644
--- a/RuoYi-App-master/locales/zh-CN.json
+++ b/RuoYi-App-master/locales/zh-CN.json
@@ -124,8 +124,8 @@
       "executing": "正执行",
       "noTasks": "暂无任务",
       "materialDetails": "物料详情",
-      "materialCode": "物料编码",
-      "materialName": "物料名称",
+      "materialCode": "品号",
+      "materialName": "品名",
       "quantity": "数量",
       "inboundSuccess": "入库成功",
       "inboundFailed": "入库失败",
@@ -196,15 +196,15 @@
       "subOrderInfo": "子单据信息",
       "warehouse": "仓库：",
       "orderNumber": "单据号：",
-      "materialCode": "物料编码：",
-      "materialName": "物料名称：",
+      "materialCode": "品号：",
+      "materialName": "品名：",
       "quantity": "数量：",
       "maxQuantity": "最大可输入",
       "noData": "暂无数据",
       "bind": "绑定",
       "cancel": "取消",
       "warehouseColumn": "仓库",
-      "materialNameColumn": "物料名称",
+      "materialNameColumn": "品名",
       "quantityColumn": "数量",
       "operationColumn": "操作",
       "unbind": "解绑",
@@ -260,8 +260,8 @@
       "desc": "退料入库",
       "rackCode": "料架条码：",
       "rackCodePlaceholder": "请输入或扫码输入料架条码",
-      "materialCode": "物料编码：",
-      "materialName": "物料名称：",
+      "materialCode": "品号：",
+      "materialName": "品名：",
       "quantity": "数量：",
       "quantityPlaceholder": "请输入数量",
       "submit": "提交",
@@ -377,8 +377,8 @@
       "title": "异常出库",
       "desc": "异常出库",
       "trayCodePlaceholder": "请输入或扫码输入托盘条码",
-      "materialCode": "物资编码",
-      "materialName": "物料名称",
+      "materialCode": "品号",
+      "materialName": "品名",
       "outQuantity": "出库数量",
       "pickQuantity": "拣选数量",
       "submit": "提交",
@@ -418,15 +418,15 @@
       "trayCodePlaceholder": "请输入或扫码输入托盘条码",
       "getTrayInfoFailed": "获取托盘信息失败",
       "addMaterial": "新增物料",
-      "materialCode": "物料编码",
-      "materialDesc": "物料名称",
+      "materialCode": "品号",
+      "materialDesc": "品名",
       "systemQuantity": "系统",
       "unit": "件",
       "clearQuantity": "清零",
       "confirmStocktaking": "确认盘点",
       "addMaterialTitle": "新增物料",
-      "materialCodeLabel": "物料编码",
-      "materialCodePlaceholder": "请输入物料编码",
+      "materialCodeLabel": "品号",
+      "materialCodePlaceholder": "请输入品号",
       "quantityLabel": "数量",
       "quantityPlaceholder": "请输入数量",
       "cancel": "取消",
@@ -445,13 +445,13 @@
       "selectWarehouse": "请选择仓库",
       "addMaterial": "新增物料",
       "noInventoryData": "暂无盘点数据",
-      "materialCode": "物料编码",
-      "materialName": "物料名称",
+      "materialCode": "品号",
+      "materialName": "品名",
       "inventoryQuantity": "库存数量",
       "countQuantity": "盘点数量",
       "countButton": "盘点",
       "addMaterialTitle": "新增物料",
-      "materialCodeLabel": "物料编码",
+      "materialCodeLabel": "品号",
       "quantityLabel": "数量",
       "cancel": "取消",
       "confirm": "确定",
diff --git a/RuoYi-App-master/pages/in/bindPro.vue b/RuoYi-App-master/pages/in/bindPro.vue
index c938136..9fd0376 100644
--- a/RuoYi-App-master/pages/in/bindPro.vue
+++ b/RuoYi-App-master/pages/in/bindPro.vue
@@ -18,7 +18,7 @@
 
 		<view class="info-group">
 			<view class="info-item">
-				<text class="info-label">物料名称：</text>
+				<text class="info-label">品名：</text>
 				<text class="info-value">{{productInfo.name}}</text>
 			</view>
 			<!-- <view class="info-item">
diff --git a/RuoYi-App-master/pages/out/ckMakeSure.vue b/RuoYi-App-master/pages/out/ckMakeSure.vue
index 73baea5..87c50bf 100644
--- a/RuoYi-App-master/pages/out/ckMakeSure.vue
+++ b/RuoYi-App-master/pages/out/ckMakeSure.vue
@@ -21,8 +21,8 @@
 					<view class="table-cell checkbox-cell">
 						<checkbox :checked="isAllSelected" @click="toggleSelectAll" />
 					</view>
-					<view class="table-cell">物资编码</view>
-					<view class="table-cell">物料名称</view>
+					<view class="table-cell">品号</view>
+					<view class="table-cell">品名</view>
 					<view class="table-cell">出库数量</view>
 					<view class="table-cell">绑定数量</view>
 				</view>
diff --git a/RuoYi-App-master/pages/out/errorout.vue b/RuoYi-App-master/pages/out/errorout.vue
index ad963eb..dafcde9 100644
--- a/RuoYi-App-master/pages/out/errorout.vue
+++ b/RuoYi-App-master/pages/out/errorout.vue
@@ -186,7 +186,7 @@ export default {
 			
 			if (!isValid) return
 			
-			// 准备提交数据，包含所有物料编码和pickQuantity
+			// 准备提交数据，包含所有品号和pickQuantity
 			const materialDetails = this.materialList.map(item => {
 				return {
 					jobDetailId: item.jobDetailId,
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
index fa2196b..9f37224 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
@@ -88,12 +88,16 @@ public class ToErpServiceImpl implements IToErpService {
         erpStdData.setParameter(objectErpParameter);
         param.setStd_data(erpStdData);
         RequestLog requestLog = requestLogService.getRequestLog(WORKSHOP_INBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建工艺单","wms","erp");
-        String post = requestLog.getResponseBody();
-        ErpInterfaceParam bean = JSONUtil.toBean(post, ErpInterfaceParam.class);
-        if ("0".equals(bean.getStd_data().getExecution().getCode())) {
+//        String post = requestLog.getResponseBody();
+//        ErpInterfaceParam bean = JSONUtil.toBean(post, ErpInterfaceParam.class);
+//        if ("0".equals(bean.getStd_data().getExecution().getCode())) {
+//            return AjaxResult.success();
+//        }
+        if(requestLog != null && "1".equals(requestLog.getIsSuccessful())){
             return AjaxResult.success();
+        }else{
+            return AjaxResult.error();
         }
-        return AjaxResult.error();
     }
 
 
@@ -146,11 +150,17 @@ public class ToErpServiceImpl implements IToErpService {
         erpStdData.setParameter(objectErpParameter);
         param.setStd_data(erpStdData);
         RequestLog requestLog = requestLogService.getRequestLog( OTHER_IN_OUTBOUND_ORDER_URL, JSONUtil.toJsonStr(param), "创建其他入出库单","wms","erp");
-        String post = requestLog.getResponseBody();
-        ErpInterfaceParam bean = JSONUtil.toBean(post, ErpInterfaceParam.class);
-        if ("0".equals(bean.getStd_data().getExecution().getCode())) {
+
+        if(requestLog != null && "1".equals(requestLog.getIsSuccessful())){
             return AjaxResult.success();
+        }else{
+            return AjaxResult.error();
         }
-        return AjaxResult.error();
+//        String post = requestLog.getResponseBody();
+//        ErpInterfaceParam bean = JSONUtil.toBean(post, ErpInterfaceParam.class);
+//        if ("0".equals(bean.getStd_data().getExecution().getCode())) {
+//            return AjaxResult.success();
+//        }
+//        return AjaxResult.error();
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index 1129b00..8360120 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -35,6 +35,8 @@ import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
 import com.ruoyi.log.service.IRequestLogService;
 import com.ruoyi.out.outStockout.service.IOutStockoutService;
+import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.service.IBasStockService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,8 +59,6 @@ public class ToWmsServiceImpl implements IToWmsService {
     private IMydoJobDetailService mydoJobDetailService;
     @Autowired
     private IBasContainerService basContainerService;
-
-
     @Autowired
     private IBasTaskNoService basTaskNoService;
     @Autowired
@@ -85,6 +85,8 @@ public class ToWmsServiceImpl implements IToWmsService {
     private IBasRoadwayService basRoadwayService;
     @Autowired
     private IRequestLogService requestLogService;
+    @Autowired
+    private IBasStockService stockService;
 
 
     @Override
@@ -94,11 +96,10 @@ public class ToWmsServiceImpl implements IToWmsService {
         HashMap<String, String> result = new HashMap<>();
 
 
-        if (StrUtil.isEmpty(requestEnter.getTrayCode())) {
-            return AjaxResult.error("托盘条码不能为空");
-        }
-        log.info("扫码内容{}", requestEnter.getTrayCode());
-
+//        if (StrUtil.isEmpty(requestEnter.getTrayCode())) {
+//            return AjaxResult.error("托盘条码不能为空");
+//        }
+//        log.info("扫码内容{}", requestEnter.getTrayCode());
 
         //解析扫码内容
         String trayCode = requestEnter.getTrayCode();
@@ -122,31 +123,41 @@ public class ToWmsServiceImpl implements IToWmsService {
         log.info("二维码详情 productId:{} model:{},color:{},serial:{},v:{},hz:{},ph:{},nw:{},gw:{},erpBill:{},xh:{},jx:{},fx:{},xlh:{}", productId, model, color, serial, v, hz, ph, nw, gw, erpBill, xh, jx, fx, xlh);
         for (String s : split) {
             if (StrUtil.isEmpty(s)) {
-                return new AjaxResult(1, "二维码内容错误");
+                return new AjaxResult(1, "二维码内容错误！");
             }
         }
 
+        List<MydoJob> inList = mydoJobService.getInJobBySerial(serial);
+        List<BasStock> stockList = stockService.getStockBySerial(serial);
+        if(!CollUtil.isEmpty(inList) || !CollUtil.isEmpty(stockList)) {
+            return new AjaxResult(2,"该序列号已有作业或库存！");
+        }
+
         //查询物料信息
         BasProduct basProductParam = new BasProduct();
         basProductParam.setProductId(productId);
         List<BasProduct> basProducts = basProductService.selectBasProductList(basProductParam);
         if (CollUtil.isEmpty(basProducts)) {
-            return new AjaxResult(2, "物料不存在");
+            return new AjaxResult(3, "物料不存在！");
         }
 
         BasProduct basProduct = basProducts.get(0);
-
-
         int size = Convert.toInt(basProduct.getSpare10());
 
+        if(size == 1){
+            if("L1001".equals(requestEnter.getEntranceId()) || "L2004".equals(requestEnter.getEntranceId())){
+                return new AjaxResult(4, "入口与托盘尺寸对应错误！");
+            }
+        }
+
         //超大托盘不处理 直接返回
         if (size == 5) {
-            return new AjaxResult(3, "超大托盘");
+            return new AjaxResult(5, "超大托盘！");
         }
         //托盘大小与电气返回不匹配
 
         if (StrUtil.isNotBlank(requestEnter.getSize()) && !"1".equals(requestEnter.getType()) && size != Integer.parseInt(requestEnter.getSize())) {
-            return new AjaxResult(4, "托盘大小不匹配");
+            return new AjaxResult(6, "托盘大小不匹配！");
         }
 
         String inOrOutType = null;
@@ -155,31 +166,31 @@ public class ToWmsServiceImpl implements IToWmsService {
         //创建作业标准
         if ("1".equals(requestEnter.getFloor())) {
             //一楼入库  其它入库 和 退料入库 存在单据，需要修改单据数量
-            InStockin inStockinParam = new InStockin();
-            inStockinParam.setErpBill(erpBill);
-            List<InStockin> inStockins = inStockinService.selectInStockinListApi(inStockinParam);
-            if (CollUtil.isEmpty(inStockins)) {
-                return AjaxResult.error("单据不存在");
-            }
-            InStockin inStockin = inStockins.get(0);
-            if ("1".equals(inStockin.getStatus()) || "2".equals(inStockin.getStatus())) {
-                inStockin.setStatus("3");
-                inStockinService.updateInStockin(inStockin);
-            }
-            inOrOutType = inStockin.getInType();
-            inStockId = inStockin.getStockinId();
-            InStockinDetail inStockinDetailParam = new InStockinDetail();
-            inStockinDetailParam.setStockinId(inStockin.getStockinGuid());
-            inStockinDetailParam.setProductId(basProduct.getProductId());
-            List<InStockinDetail> inStockinDetails = inStockinDetailService.selectInStockinDetailList(inStockinDetailParam);
-            if (CollUtil.isEmpty(inStockinDetails)) {
-                return AjaxResult.error("单据明细不存在");
-            }
-            InStockinDetail inStockinDetail = inStockinDetails.get(0);
-            inStockDetailId = inStockinDetail.getStockinDetailId();
-            inStockinDetail.setScanNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getScanNum()).add(Convert.toBigDecimal(1))));
-            inStockinDetailService.updateInStockinDetail(inStockinDetail);
-
+//            InStockin inStockinParam = new InStockin();
+//            inStockinParam.setErpBill(erpBill);
+//            List<InStockin> inStockins = inStockinService.selectInStockinListApi(inStockinParam);
+//            if (CollUtil.isEmpty(inStockins)) {
+//                return AjaxResult.error("单据不存在");
+//            }
+//            InStockin inStockin = inStockins.get(0);
+//            if ("1".equals(inStockin.getStatus()) || "2".equals(inStockin.getStatus())) {
+//                inStockin.setStatus("3");
+//                inStockinService.updateInStockin(inStockin);
+//            }
+//            inOrOutType = inStockin.getInType();
+//            inStockId = inStockin.getStockinId();
+//            InStockinDetail inStockinDetailParam = new InStockinDetail();
+//            inStockinDetailParam.setStockinId(inStockin.getStockinGuid());
+//            inStockinDetailParam.setProductId(basProduct.getProductId());
+//            List<InStockinDetail> inStockinDetails = inStockinDetailService.selectInStockinDetailList(inStockinDetailParam);
+//            if (CollUtil.isEmpty(inStockinDetails)) {
+//                return AjaxResult.error("单据明细不存在");
+//            }
+//            InStockinDetail inStockinDetail = inStockinDetails.get(0);
+//            inStockDetailId = inStockinDetail.getStockinDetailId();
+//            inStockinDetail.setScanNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getScanNum()).add(Convert.toBigDecimal(1))));
+//            inStockinDetailService.updateInStockinDetail(inStockinDetail);
+            inOrOutType = "2";
         }else if ("2".equals(requestEnter.getFloor())) {
             inOrOutType = "1";
         }
@@ -196,11 +207,11 @@ public class ToWmsServiceImpl implements IToWmsService {
         BasRoadway basRoadway = basRoadwayService.selectBasRoadwayById(mydoJob.getRoadwayId());
         if ("1".equals(requestEnter.getFloor())) {
             if ("Y".equals(basRoadway.getInLocked())) {
-                return new AjaxResult(6, "巷道已锁");
+                return new AjaxResult(7, "巷道入库锁定！");
             }
         } else {
             if ("Y".equals(basRoadway.getInLocked2())) {
-                return new AjaxResult(6, "巷道已锁");
+                return new AjaxResult(7, "巷道入库锁定！");
             }
         }
 
@@ -210,7 +221,7 @@ public class ToWmsServiceImpl implements IToWmsService {
         basCargoSpaceParam.setRoadwayId(mydoJob.getRoadwayId());
         BasCargoSpace basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(basCargoSpaceParam);
         if (ObjUtil.isNull(basCargoSpace)) {
-            return new AjaxResult(5, "没有货位");
+            return new AjaxResult(8, "没有可用货位！");
         }
         mydoJob.setCargoSpaceId(basCargoSpace.getCargoSpaceId());
         mydoJob.setEntranceId(requestEnter.getEntranceId());
@@ -254,12 +265,11 @@ public class ToWmsServiceImpl implements IToWmsService {
         if ("2".equals(requestEnter.getFloor())){
             AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct);
             if (!workshopInboundOrder.isSuccess()){
-                throw new RuntimeException("创建工单失败");
+                //throw new RuntimeException("创建工单失败");
+                return new AjaxResult(9, "创建工艺入库单失败！");
             }
         }
 
-
-
         //修改作业状态为正执行
         result.put("jobId", mydoJob.getJobId());
         result.put("taskNo", mydoJob.getTaskNo());
@@ -275,8 +285,8 @@ public class ToWmsServiceImpl implements IToWmsService {
 
     private String getRoadway(int size) {
         return switch (size) {
-            case 1 -> "1";
-            case 2, 3, 4 -> "2";
+            case 1 -> "2";
+            case 2, 3, 4 -> "1";
             default -> null;
         };
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
index 44f87b2..5bba920 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
@@ -26,8 +26,8 @@ public class BasProduct extends BaseEntity
     /** 主键 */
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 产品分类 */
@@ -74,8 +74,8 @@ public class BasProduct extends BaseEntity
     @Excel(name = "功率")
     private String spare6;
 
-    /** 物料名称 */
-    @Excel(name = "物料名称")
+    /** 品名 */
+    @Excel(name = "品名")
     private String productName;
 
     /** 相位 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
index fce6d1a..074e036 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
@@ -104,4 +104,216 @@ Y锁、N开 */
     private String spare7;
 
     private String stockStatus;
+    private String productId;
+    private String productName;
+    private String spare6;
+    private String quantity;
+
+    public String getCargoSpaceId() {
+        return cargoSpaceId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    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 getRoadwayId() {
+        return roadwayId;
+    }
+
+    public void setRoadwayId(String roadwayId) {
+        this.roadwayId = roadwayId;
+    }
+
+    public String getCargoAreaId() {
+        return cargoAreaId;
+    }
+
+    public void setCargoAreaId(String cargoAreaId) {
+        this.cargoAreaId = cargoAreaId;
+    }
+
+    public String getTheType() {
+        return theType;
+    }
+
+    public void setTheType(String theType) {
+        this.theType = theType;
+    }
+
+    public String getTheTypeName() {
+        return theTypeName;
+    }
+
+    public void setTheTypeName(String theTypeName) {
+        this.theTypeName = theTypeName;
+    }
+
+    public String getCargoSpaceName() {
+        return cargoSpaceName;
+    }
+
+    public void setCargoSpaceName(String cargoSpaceName) {
+        this.cargoSpaceName = cargoSpaceName;
+    }
+
+    public Long getThePlatoon() {
+        return thePlatoon;
+    }
+
+    public void setThePlatoon(Long thePlatoon) {
+        this.thePlatoon = thePlatoon;
+    }
+
+    public Long getTheColumn() {
+        return theColumn;
+    }
+
+    public void setTheColumn(Long theColumn) {
+        this.theColumn = theColumn;
+    }
+
+    public Long getTheFloor() {
+        return theFloor;
+    }
+
+    public void setTheFloor(Long theFloor) {
+        this.theFloor = theFloor;
+    }
+
+    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;
+    }
+
+    public String getTrayCode() {
+        return trayCode;
+    }
+
+    public void setTrayCode(String trayCode) {
+        this.trayCode = trayCode;
+    }
+
+    public String getCargoHight() {
+        return cargoHight;
+    }
+
+    public void setCargoHight(String cargoHight) {
+        this.cargoHight = cargoHight;
+    }
+
+    public String getIssDouble() {
+        return issDouble;
+    }
+
+    public void setIssDouble(String issDouble) {
+        this.issDouble = issDouble;
+    }
+
+    public String getGroupCodingNo() {
+        return groupCodingNo;
+    }
+
+    public void setGroupCodingNo(String groupCodingNo) {
+        this.groupCodingNo = groupCodingNo;
+    }
+
+    public String getGroupCoding() {
+        return groupCoding;
+    }
+
+    public void setGroupCoding(String groupCoding) {
+        this.groupCoding = groupCoding;
+    }
+
+    public String getCargoSpaceLogo() {
+        return cargoSpaceLogo;
+    }
+
+    public void setCargoSpaceLogo(String cargoSpaceLogo) {
+        this.cargoSpaceLogo = cargoSpaceLogo;
+    }
+
+    public String getThisCargoArea() {
+        return thisCargoArea;
+    }
+
+    public void setThisCargoArea(String thisCargoArea) {
+        this.thisCargoArea = thisCargoArea;
+    }
+
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getStockStatus() {
+        return stockStatus;
+    }
+
+    public void setStockStatus(String stockStatus) {
+        this.stockStatus = stockStatus;
+    }
+
+    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 getSpare6() {
+        return spare6;
+    }
+
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/domain/BasContainerDetails.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/domain/BasContainerDetails.java
index f8321b8..6008d08 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/domain/BasContainerDetails.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/domain/BasContainerDetails.java
@@ -26,12 +26,12 @@ public class BasContainerDetails extends BaseEntity
     @Excel(name = "容器编号")
     private String containerId;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
-    /** 物料名称 */
-    @Excel(name = "物料名称")
+    /** 品名 */
+    @Excel(name = "品名")
     private String productName;
 
     /** 数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/portrel/domain/BasProductPortRel.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/portrel/domain/BasProductPortRel.java
index 2438ddf..87365fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/portrel/domain/BasProductPortRel.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/portrel/domain/BasProductPortRel.java
@@ -43,7 +43,7 @@ public class BasProductPortRel extends BaseEntity
      */
     private String bindStatus;
     /**
-     * 物料名称
+     * 品名
      */
     private String productName;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java
index fe71977..7bc7db5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java
@@ -181,7 +181,7 @@ public class CheckDifferenceRecordController extends BaseController {
                 // 初始化extraField对象
                 ExtraField extraField = new ExtraField();
                 extraField.setProductId(record.getProductId());
-                // 物料名称和其他信息会通过关联查询自动填充
+                // 品名和其他信息会通过关联查询自动填充
                 newStock.setExtraField(extraField);
 
                 // 最后设置库存ID
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java
index ac8d8cb..9b67a92 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java
@@ -43,7 +43,7 @@ public class CheckStockinController extends BaseController
     {
         startPage();
         List<CheckStockin> list = new ArrayList<>();
-        if (Convert.toInt(checkStockin.getStatus())<4){
+        if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus())<4){
             list =  checkStockinService.selectCheckStockinList(checkStockin);
         }else {
             list = checkStockinFinishService.selectCheckStockinList(checkStockin);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java
index 924a890..3261cd9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java
@@ -28,8 +28,8 @@ public class CheckStockin extends BaseEntity
     @Excel(name = "盘点单据ID")
     private String stockCheckId;
 
-    /** 盘库类型 */
-    @Excel(name = "盘库类型")
+    /** 盘点类型 */
+    @Excel(name = "盘点类型")
     private String checkType;
 
     /** 建立时间 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
index 8b2831f..53be5f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
@@ -38,8 +38,7 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class CheckStockinServiceImpl implements ICheckStockinService
-{
+public class CheckStockinServiceImpl implements ICheckStockinService {
     @Autowired
     private CheckStockinMapper checkStockinMapper;
     @Autowired
@@ -60,8 +59,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
      * @return 盘库单据主信息
      */
     @Override
-    public CheckStockin selectCheckStockinByStockGuid(String stockGuid)
-    {
+    public CheckStockin selectCheckStockinByStockGuid(String stockGuid) {
         return checkStockinMapper.selectCheckStockinByStockGuid(stockGuid);
     }
 
@@ -73,8 +71,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
      */
     @Override
     @DataScope(warehouseAlias = "bw")
-    public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin)
-    {
+    public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin) {
         return checkStockinMapper.selectCheckStockinList(checkStockin);
     }
 
@@ -85,8 +82,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
      * @return 结果
      */
     @Override
-    public int insertCheckStockin(CheckStockin checkStockin)
-    {
+    public int insertCheckStockin(CheckStockin checkStockin) {
         return checkStockinMapper.insertCheckStockin(checkStockin);
     }
 
@@ -98,34 +94,33 @@ public class CheckStockinServiceImpl implements ICheckStockinService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult updateCheckStockin(CheckStockin checkStockin)
-    {
+    public AjaxResult updateCheckStockin(CheckStockin checkStockin) {
         CheckStockin old = selectCheckStockinByStockGuid(checkStockin.getStockGuid());
-        if ("5".equals(checkStockin.getStatus())){
+        if ("5".equals(checkStockin.getStatus())) {
             //作废
-            if (!"1".equals(old.getStatus())){
-                log.error("单据状态非未执行状态!");
+            if (!"1".equals(old.getStatus()) && !"2".equals(old.getStatus())) {
+                log.error("单据已执行，无法作废!");
                 return AjaxResult.error(MessageUtils.message("error.message21"));
             }
             checkStockinMapper.updateCheckStockin(checkStockin);
             //插入历史单据
             insertCheckStockinHistory(checkStockin);
-        }else if ("2".equals(checkStockin.getStatus())){
-            if (StrUtil.isEmpty(checkStockin.getSpare1())){
-                log.error("请选择出口!");
-                return AjaxResult.error(MessageUtils.message("error.message22"));
-            }
+        } else if ("2".equals(checkStockin.getStatus())) {
+//            if (StrUtil.isEmpty(checkStockin.getSpare1())){
+//                log.error("请选择出口!");
+//                return AjaxResult.error(MessageUtils.message("error.message22"));
+//            }
             //审核
-            if (!"1".equals(old.getStatus())){
-                log.error("单据状态非未执行状态!");
+            if (!"1".equals(old.getStatus())) {
+                log.error("单据已审核!");
                 return AjaxResult.error(MessageUtils.message("error.message21"));
             }
             checkStockinMapper.updateCheckStockin(checkStockin);
 
-        }else if ("4".equals(checkStockin.getStatus())){
+        } else if ("4".equals(checkStockin.getStatus())) {
             //确认
-            if (!"3".equals(old.getStatus())){
-                log.error("单据状态非正执行状态!");
+            if (!"3".equals(old.getStatus())) {
+                log.error("单据未执行，无需确认!");
                 return AjaxResult.error(MessageUtils.message("error.message23"));
             }
             checkStockinMapper.updateCheckStockin(checkStockin);
@@ -150,8 +145,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
      * @return 结果
      */
     @Override
-    public int deleteCheckStockinByStockGuids(String[] stockGuids)
-    {
+    public int deleteCheckStockinByStockGuids(String[] stockGuids) {
         return checkStockinMapper.deleteCheckStockinByStockGuids(stockGuids);
     }
 
@@ -162,8 +156,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
      * @return 结果
      */
     @Override
-    public int deleteCheckStockinByStockGuid(String stockGuid)
-    {
+    public int deleteCheckStockinByStockGuid(String stockGuid) {
         return checkStockinMapper.deleteCheckStockinByStockGuid(stockGuid);
     }
 
@@ -183,7 +176,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
         checkStockin.setStockSource("0");
         checkStockin.setCheckType(checkStockin.getCheckType());
         //checkStockin.setErpBill(checkStockin.getErpBill());
-        if ("1".equals(checkStockin.getCheckType())){
+        if ("1".equals(checkStockin.getCheckType())) {
             //物料盘点
             for (int i = 0; i < detailList.size(); i++) {
                 CheckStockinDetail checkStockinDetail = detailList.get(i);
@@ -197,21 +190,20 @@ public class CheckStockinServiceImpl implements ICheckStockinService
 //                checkStockinDetail.
                 checkStockinDetailService.insertCheckStockinDetail(checkStockinDetail);
             }
-        }else if ("2".equals(checkStockin.getCheckType())){
+        } else if ("2".equals(checkStockin.getCheckType())) {
             //货位盘点
             for (int i = 0; i < detailList.size(); i++) {
-                BasStock param = new BasStock();
-                param.setCargoSpaceId(detailList.get(i).getSpare1());
-                List<BasStock> basStocks = basStockService.selectBasStockList(param);
-                Integer quantity = 0;
-                for (BasStock basStock : basStocks) {
-                    quantity += Convert.toInt(basStock.getQuantity());
-                }
+//                BasStock param = new BasStock();
+//                param.setCargoSpaceId(detailList.get(i).getSpare1());
+//                List<BasStock> basStocks = basStockService.selectBasStockList(param);
+//                Integer quantity = 0;
+//                for (BasStock basStock : basStocks) {
+//                    quantity += Convert.toInt(basStock.getQuantity());
+//                }
                 CheckStockinDetail checkStockinDetail = detailList.get(i);
                 checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1));
                 checkStockinDetail.setStockCheckId(stockCheckId);
                 checkStockinDetail.setStockCheckGuid(checkStockin.getStockGuid());
-                checkStockinDetail.setQuantity(quantity.toString());
                 checkStockinDetail.setScanNum("0");
                 checkStockinDetail.setAssignNum("0");
                 checkStockinDetailService.insertCheckStockinDetail(checkStockinDetail);
@@ -225,18 +217,21 @@ public class CheckStockinServiceImpl implements ICheckStockinService
     @Override
     public AjaxResult autoAllocation(CheckStockin checkStockin) {
         CheckStockin currentCheckStock = selectCheckStockinByStockGuid(checkStockin.getStockGuid());
-        if (ObjUtil.isNull(currentCheckStock)){
-            log.warn("单据不存在! stockGudi:{}",checkStockin.getStockGuid());
+        if (ObjUtil.isNull(currentCheckStock)) {
+            log.warn("单据不存在! stockGudi:{}", checkStockin.getStockGuid());
             return AjaxResult.error(MessageUtils.message("error.message27"));
         }
         HashMap<String, String> map = new HashMap<>();
-        map.put("v_stock_check_id", currentCheckStock.getStockCheckId());
-        checkStockinMapper.autoAllot(map);
-        iToWcsService.pushOutMydoJob();
-        if ("10".equals(map.get("v_result"))){
-            return AjaxResult.success();
-        }else {
-            return AjaxResult.warn(map.get("v_resultmsg"));
+        List<CheckStockinDetail> list = checkStockinDetailService.getCheckDetailById(currentCheckStock.getStockCheckId());
+        StringBuilder builder = new StringBuilder();
+        for (CheckStockinDetail checkStockinDetail : list) {
+            map.put("v_stock_check_detail_id", checkStockinDetail.getStockCheckDetailId());
+            checkStockinMapper.autoAllot(map);
+            builder.append("行明细：" + checkStockinDetail.getStockCheckDetailId() + "，分配结果：" + map.get("v_resultmsg") + "<br />");
         }
+        iToWcsService.pushOutMydoJob();
+
+        return AjaxResult.success(builder.toString());
+
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java
index 4383399..c60f185 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java
@@ -43,8 +43,8 @@ public class CheckStockinDetail extends BaseEntity
     @Excel(name = "物料ID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 计划数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/mapper/CheckStockinDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/mapper/CheckStockinDetailMapper.java
index 722dea7..2507bf4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/mapper/CheckStockinDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/mapper/CheckStockinDetailMapper.java
@@ -64,4 +64,6 @@ public interface CheckStockinDetailMapper
     void insertCheckStockinDetailHistory(CheckStockin checkStockin);
 
     void deleteCheckStockinDetailByStockinGuid(String stockGuid);
+
+    List<CheckStockinDetail> getCheckDetailById(String stockCheckId);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/ICheckStockinDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/ICheckStockinDetailService.java
index a8c39bc..3b02378 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/ICheckStockinDetailService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/ICheckStockinDetailService.java
@@ -64,4 +64,6 @@ public interface ICheckStockinDetailService
     void insertCheckStockinDetailHistory(CheckStockin checkStockin);
 
     void deleteCheckStockinDetailByStockinGuid(String stockGuid);
+
+    List<CheckStockinDetail> getCheckDetailById(String stockCheckId);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java
index a74736b..9b68f4d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java
@@ -102,4 +102,9 @@ public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService
     public void deleteCheckStockinDetailByStockinGuid(String stockGuid) {
         checkStockinDetailMapper.deleteCheckStockinDetailByStockinGuid(stockGuid);
     }
+
+    @Override
+    public List<CheckStockinDetail> getCheckDetailById(String stockCheckId) {
+        return checkStockinDetailMapper.getCheckDetailById(stockCheckId);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/domain/CheckStockinDetailFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/domain/CheckStockinDetailFinish.java
index d5d88cf..9068635 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/domain/CheckStockinDetailFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/domain/CheckStockinDetailFinish.java
@@ -34,8 +34,8 @@ public class CheckStockinDetailFinish extends BaseEntity
     @Excel(name = "物料ID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 计划数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/domain/CheckStockinFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/domain/CheckStockinFinish.java
index 09f4987..9e64053 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/domain/CheckStockinFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/domain/CheckStockinFinish.java
@@ -22,8 +22,8 @@ public class CheckStockinFinish extends BaseEntity
     @Excel(name = "盘点单据ID")
     private String stockCheckId;
 
-    /** 盘库类型 */
-    @Excel(name = "盘库类型")
+    /** 盘点类型 */
+    @Excel(name = "盘点类型")
     private String checkType;
 
     /** 建立时间 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
index df62ac5..e82e973 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
@@ -102,9 +102,18 @@ public class InStockin extends BaseEntity
 
     private String lotNo;
     private String materialDesc;
+    private String startDate;
 
     private List<String> typeData;
 
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
     public List<String> getTypeData() {
         return typeData;
     }
@@ -353,26 +362,34 @@ public class InStockin extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("stockinGuid", getStockinGuid())
-            .append("stockinId", getStockinId())
-            .append("inType", getInType())
-            .append("createDate", getCreateDate())
-            .append("createManId", getCreateManId())
-            .append("status", getStatus())
-            .append("warehouseId", getWarehouseId())
-            .append("finishDate", getFinishDate())
-            .append("erpBill", getErpBill())
-            .append("stockSource", getStockSource())
-            .append("departmentNo", getDepartmentNo())
-            .append("customerNo", getCustomerNo())
-            .append("classNo", getClassNo())
-            .append("supplierNo", getSupplierNo())
-            .append("spare1", getSpare1())
-            .append("spare2", getSpare2())
-            .append("spare4", getSpare4())
-            .append("spare3", getSpare3())
-            .append("spare5", getSpare5())
-            .toString();
+        return "InStockin{" +
+                "stockinGuid='" + stockinGuid + '\'' +
+                ", stockinId='" + stockinId + '\'' +
+                ", inType='" + inType + '\'' +
+                ", createDate='" + createDate + '\'' +
+                ", createManId='" + createManId + '\'' +
+                ", createManName='" + createManName + '\'' +
+                ", status='" + status + '\'' +
+                ", warehouseId='" + warehouseId + '\'' +
+                ", warehouseName='" + warehouseName + '\'' +
+                ", finishDate='" + finishDate + '\'' +
+                ", erpBill='" + erpBill + '\'' +
+                ", stockSource='" + stockSource + '\'' +
+                ", departmentNo='" + departmentNo + '\'' +
+                ", departmentName='" + departmentName + '\'' +
+                ", customerNo='" + customerNo + '\'' +
+                ", classNo='" + classNo + '\'' +
+                ", supplierNo='" + supplierNo + '\'' +
+                ", supplierName='" + supplierName + '\'' +
+                ", spare1='" + spare1 + '\'' +
+                ", spare2='" + spare2 + '\'' +
+                ", spare4='" + spare4 + '\'' +
+                ", spare3='" + spare3 + '\'' +
+                ", spare5='" + spare5 + '\'' +
+                ", lotNo='" + lotNo + '\'' +
+                ", materialDesc='" + materialDesc + '\'' +
+                ", startDate='" + startDate + '\'' +
+                ", typeData=" + typeData +
+                '}';
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
index 7a20124..2f00a9d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
@@ -41,10 +41,10 @@ public class InStockinDetail extends BaseEntity
     @Excel(name = "物料ID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
-    @Excel(name = "物料名称")
+    @Excel(name = "品名")
     private String productName;
 
     /** 计划数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java
index 7ce13d0..2ab28e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java
@@ -41,8 +41,8 @@ public class InStockinDetailFinish extends BaseEntity
     @Excel(name = "物料ID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 计划数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
index cb2a54d..37d7e25 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
@@ -40,8 +40,8 @@ public class InMydoJobController extends BaseController
     {
         startPage();
         List<MydoJob> list = null;
-        //mydoJob.setInOut("1");
-        if(Integer.parseInt(mydoJob.getStatus())<4) {
+//        mydoJob.setInOut("1");
+        if(mydoJob.getStatus() == null || Integer.parseInt(mydoJob.getStatus())<4) {
             list = mydoJobService.selectMydoJobList(mydoJob);
         }else{
             list= mydoJobFinishService.selectMydoJobFinishListByMydoJob(mydoJob);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java
index baa48bc..97d5f9d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java
@@ -36,7 +36,7 @@ public class OutMydoJobController extends BaseController {
     {
         startPage();
         List<MydoJob> list;
-        if(Integer.parseInt(mydoJob.getStatus())<4) {
+        if(mydoJob.getStatus() == null || Integer.parseInt(mydoJob.getStatus())<4) {
             list = mydoJobService.selectMydoJobList(mydoJob);
         }else{
             list=mydoJobFinishService.selectMydoJobFinishListByMydoJob(mydoJob);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
index d91aa46..8648241 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
@@ -95,8 +95,6 @@ public class MydoJob extends BaseEntity
     @Excel(name = "任务类型",dictType = "in_or_out_type")
     private String inOrOut;
 
-
-
     /** 开始时间 */
     @Excel(name = "开始时间")
     private String startTime;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
index 3c3e1ea..9497638 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
@@ -74,4 +74,6 @@ public interface MydoJobMapper
     MydoJob selectByTrayCode(String trayCode);
 
     MydoJob selectMydoJobByEntranceId(MydoJob mydoJob);
+
+    List<MydoJob> getInJobBySerial(String trayCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java
index 51619d0..7bc45ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java
@@ -107,4 +107,6 @@ public interface IMydoJobService
     MydoJob selectMydoJobByTrayCode(String trayCode);
 
     MydoJob selectMydoJobByEntranceId(MydoJob mydoJob);
+
+    List<MydoJob> getInJobBySerial(String serial);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index ff2490a..586aca8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -313,13 +313,13 @@ public class MydoJobServiceImpl implements IMydoJobService {
             if (CollUtil.isNotEmpty(mydoJobDetails)) {
                 List<BasStock> list = new ArrayList<>();
                 for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
-                    if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) {
-                        //修改单据实际数量  2-退料入库 3-其它入库
-                        String inOrOutDId = mydoJobDetail.getInOrOutDId();
-                        InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
-                        inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity()))));
-                        inStockinDetailService.updateInStockinDetail(inStockinDetail);
-                    }
+//                    if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) {
+//                        //修改单据实际数量  2-退料入库 3-其它入库
+//                        String inOrOutDId = mydoJobDetail.getInOrOutDId();
+//                        InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
+//                        inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity()))));
+//                        inStockinDetailService.updateInStockinDetail(inStockinDetail);
+//                    }
                     //正常库存
                     BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");
                     stockByInStockinDetail.setSpare7("0");
@@ -504,4 +504,9 @@ public class MydoJobServiceImpl implements IMydoJobService {
     public MydoJob selectMydoJobByEntranceId(MydoJob mydoJob) {
         return mydoJobMapper.selectMydoJobByEntranceId(mydoJob);
     }
+
+    @Override
+    public List<MydoJob> getInJobBySerial(String trayCode) {
+        return mydoJobMapper.getInJobBySerial(trayCode);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java
index 7afee23..3f258c2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java
@@ -54,10 +54,10 @@ public class MydoJobDetail extends BaseEntity
     @Excel(name = "物料GUID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
-    @Excel(name = "物料名称")
+    @Excel(name = "品名")
     private String productName;
 
     /** 库存状态 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/domain/MydoJobDetailFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/domain/MydoJobDetailFinish.java
index 9933185..045e6e3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/domain/MydoJobDetailFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/domain/MydoJobDetailFinish.java
@@ -47,8 +47,8 @@ public class MydoJobDetailFinish extends BaseEntity
     @Excel(name = "物料GUID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 库存状态 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
index 7c687b1..129f143 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
@@ -438,7 +438,7 @@ public class KpiServiceImpl implements KpiService
             StringBuilder info = new StringBuilder();
 
             // 拼接货位信息
-            info.append("货位名称：").append(space.getCargoSpaceName()).append("<br>");
+//            info.append("货位名称：").append(space.getCargoSpaceName()).append("<br>");
             info.append("是否锁定：").append("Y".equals(space.getLocked()) ? "是" : "否").append("<br>");
             info.append("托盘条码：").append(space.getTrayCode() != null ? space.getTrayCode() : "无").append("<br>");
             
@@ -448,8 +448,8 @@ public class KpiServiceImpl implements KpiService
             List<BasStock> stockList = basStockMapper.selectBasStockList(stockQuery);
             if (!stockList.isEmpty()) {
                 BasStock stock = stockList.get(0);
-                info.append("物料编码：").append(stock.getProductId() != null ? stock.getProductId() : "无").append("<br>");
-                info.append("物料名称：").append(stock.getProductName() != null ? stock.getProductName() : "无").append("<br>");
+                info.append("品号：").append(stock.getProductId() != null ? stock.getProductId() : "无").append("<br>");
+                info.append("品名：").append(stock.getProductName() != null ? stock.getProductName() : "无").append("<br>");
             }
 
             response.put("msg", info.toString());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
index d2120b9..7979357 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
@@ -164,6 +164,10 @@ public class ViewHandAllotStock extends BaseEntity
     @Excel(name = "货位名称")
     private String cargoSpaceName;
 
+    private Integer thePlatoon;
+    private Integer theColumn;
+    private Integer theFloor;
+
     public void setStockId(String stockId) 
     {
         this.stockId = stockId;
@@ -534,46 +538,73 @@ public class ViewHandAllotStock extends BaseEntity
         return cargoSpaceName;
     }
 
+    public Integer getThePlatoon() {
+        return thePlatoon;
+    }
+
+    public void setThePlatoon(Integer thePlatoon) {
+        this.thePlatoon = thePlatoon;
+    }
+
+    public Integer getTheColumn() {
+        return theColumn;
+    }
+
+    public void setTheColumn(Integer theColumn) {
+        this.theColumn = theColumn;
+    }
+
+    public Integer getTheFloor() {
+        return theFloor;
+    }
+
+    public void setTheFloor(Integer theFloor) {
+        this.theFloor = theFloor;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("stockId", getStockId())
-            .append("cargoSpaceId", getCargoSpaceId())
-            .append("stockStatus", getStockStatus())
-            .append("productStatus", getProductStatus())
-            .append("lotNo", getLotNo())
-            .append("inDate", getInDate())
-            .append("backDate", getBackDate())
-            .append("productGuid", getProductGuid())
-            .append("quantity", getQuantity())
-            .append("jobId", getJobId())
-            .append("trayCode", getTrayCode())
-            .append("outQuantity", getOutQuantity())
-            .append("stockinDetailId", getStockinDetailId())
-            .append("stockinId", getStockinId())
-            .append("inType", getInType())
-            .append("inClassId", getInClassId())
-            .append("warehouseId", getWarehouseId())
-            .append("stackingId", getStackingId())
-            .append("spare1", getSpare1())
-            .append("spare2", getSpare2())
-            .append("spare3", getSpare3())
-            .append("spare4", getSpare4())
-            .append("spare5", getSpare5())
-            .append("spare6", getSpare6())
-            .append("productId", getProductId())
-            .append("productName", getProductName())
-            .append("voltage", getVoltage())
-            .append("power", getPower())
-            .append("phase", getPhase())
-            .append("netWeight", getNetWeight())
-            .append("grossWeight", getGrossWeight())
-            .append("distribution", getDistribution())
-            .append("model", getModel())
-            .append("orderId", getOrderId())
-            .append("spare7", getSpare7())
-            .append("spare8", getSpare8())
-            .append("cargoSpaceName", getCargoSpaceName())
-            .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 +
+                '}';
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
index f53e452..e438e28 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
@@ -30,7 +30,7 @@ public class OutStockoutController extends BaseController {
     @Autowired
     private IOutStockoutService outStockoutService;
     @Autowired
-    private IOutStockoutFinishService  outStockoutFinishService;
+    private IOutStockoutFinishService outStockoutFinishService;
 
     /**
      * 查询出库主单列表
@@ -40,10 +40,10 @@ public class OutStockoutController extends BaseController {
     public TableDataInfo list(OutStockout outStockout) {
         startPage();
         List<OutStockout> list = new ArrayList<>();
-        if(Integer.parseInt(outStockout.getStatus())<4){
-        list =outStockoutService.selectOutStockoutList(outStockout);
-        }else{
-        list=outStockoutFinishService.selectOutStockoutFinishListByOutStockout(outStockout);
+        if (outStockout.getStatus() == null || (outStockout.getStatus() != null &&Integer.parseInt(outStockout.getStatus()) < 4)) {
+            list = outStockoutService.selectOutStockoutList(outStockout);
+        } else {
+            list = outStockoutFinishService.selectOutStockoutFinishListByOutStockout(outStockout);
         }
         return getDataTable(list);
     }
@@ -121,13 +121,14 @@ public class OutStockoutController extends BaseController {
     @Log(title = "出库主单状态改变", businessType = BusinessType.OTHER)
     @RequestMapping("/changeStatus")
     @ResponseBody
-    public String changeStatus(@RequestParam("stockoutIds") String[] stockoutIds, @RequestParam("status") String status,@RequestParam("newStatus")String newStatus,@RequestParam(value = "exitId",required = false)String exitId) {
-        String s = outStockoutService.updateOutStockoutStatus(stockoutIds, status, newStatus,exitId);
+    public String changeStatus(@RequestParam("stockoutIds") String[] stockoutIds, @RequestParam("status") String status, @RequestParam("newStatus") String newStatus, @RequestParam(value = "exitId", required = false) String exitId) {
+        String s = outStockoutService.updateOutStockoutStatus(stockoutIds, status, newStatus, exitId);
         return s;
     }
 
     /**
      * 自动出库
+     *
      * @param stockoutId
      * @return
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
index 4cf935e..f6b3843 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
@@ -38,8 +38,8 @@ public class OutStockoutDetail extends BaseEntity
     @Excel(name = "物资guid")
     private String productGuid;
 
-    /** 物资编码 */
-    @Excel(name = "物资编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 计划数量 */
@@ -122,8 +122,8 @@ public class OutStockoutDetail extends BaseEntity
     @Excel(name = "规格 SPEC")
     private String spec;
 
-    /** 物资名称 ASMAT_NAME */
-//    @Excel(name = "物资名称 ASMAT_NAME")
+    /** 品名 ASMAT_NAME */
+//    @Excel(name = "品名 ASMAT_NAME")
     private String productName;
 
     /** 供应商代码 SUPPLIER_CODE */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailFinish/domain/OutStockoutDetailFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailFinish/domain/OutStockoutDetailFinish.java
index 029e690..e12a8ef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailFinish/domain/OutStockoutDetailFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailFinish/domain/OutStockoutDetailFinish.java
@@ -37,8 +37,8 @@ public class OutStockoutDetailFinish extends BaseEntity
     @Excel(name = "物资guid")
     private String productGuid;
 
-    /** 物资编码 */
-    @Excel(name = "物资编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 计划数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/submit/domain/OutPickSubmit.java b/ruoyi-admin/src/main/java/com/ruoyi/out/submit/domain/OutPickSubmit.java
index 2ddc574..049aa55 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/submit/domain/OutPickSubmit.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/submit/domain/OutPickSubmit.java
@@ -30,8 +30,8 @@ public class OutPickSubmit extends BaseEntity
     @Excel(name = "子任务id")
     private String jobDetailId;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 物料数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveProductVo.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveProductVo.java
index 05cf51e..17a9040 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveProductVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveProductVo.java
@@ -18,11 +18,11 @@ public class ReceiveProductVo {
     @Excel(name = "子件")
     private String subItem;
 
-    @Excel(name = "物料编码")
+    @Excel(name = "品号")
     @NotEmpty(message = "物料GUID不能为空")
     private String productId;
 
-    @Excel(name = "物料描述")
+    @Excel(name = "品名")
     private String materialDesc;
 
     @Excel(name = "英文描述")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java
index b12c6c7..6fcce5f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java
@@ -41,8 +41,8 @@ public class ReceiveStockinDetail extends BaseEntity
     @Excel(name = "物料ID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 计划数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/domain/ReceiveStockinDetailFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/domain/ReceiveStockinDetailFinish.java
index a599858..942bbfd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/domain/ReceiveStockinDetailFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/domain/ReceiveStockinDetailFinish.java
@@ -34,8 +34,8 @@ public class ReceiveStockinDetailFinish extends BaseEntity
     @Excel(name = "物料ID")
     private String productGuid;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 计划数量 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
index 7f5baf9..02d40d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
@@ -27,12 +27,12 @@ public class StockSummary extends BaseEntity
 
     @Excel(name = "订单号")
     private String orderId;
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
-    /** 物料名称 */
-    @Excel(name = "物料名称")
+    /** 品名 */
+    @Excel(name = "品名")
     private String productName;
 
     /** 规格 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java
index a6b6cf9..29eff1a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java
@@ -40,7 +40,7 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
     @Excel(name = "${search.ViewFlatWarehouseInFlow.productId}")
     private String productId;
 
-    /** 物料名称 */
+    /** 品名 */
     @Excel(name = "${search.ViewFlatWarehouseInFlow.productName}")
     private String productName;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java
index d10eaf2..941993d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java
@@ -40,7 +40,7 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
     @Excel(name = "${search.ViewFlatWarehouseOutFlow.productId}")
     private String productId;
 
-    /** 物料名称 */
+    /** 品名 */
     @Excel(name = "${search.ViewFlatWarehouseOutFlow.productName}")
     private String productName;
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
index 0132339..92e1c01 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
@@ -41,12 +41,12 @@ public class ViewInJobFlow extends BaseEntity
     @Excel(name = "订单号")
     private String lineId;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 品名 */
-    @Excel(name = "物料名称")
+    @Excel(name = "品名")
     private String productName;
 
     /** 巷道ID */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
index 59a2288..34c5c90 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
@@ -38,12 +38,12 @@ public class ViewOutJobFlow extends BaseEntity
     @Excel(name = "订单号")
     private String lineId;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
     /** 品名 */
-    @Excel(name = "物料名称")
+    @Excel(name = "品名")
     private String productName;
 
     /** 托盘码 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
index 6b23bf5..70bcf23 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
@@ -32,12 +32,12 @@ public class ViewStockDetail extends BaseEntity
     @Excel(name = "订单号")
     private String orderId;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
-    /** 物料名称 */
-    @Excel(name = "物料名称")
+    /** 品名 */
+    @Excel(name = "品名")
     private String productName;
 
     /** 货位ID */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
index 100e6f4..6a9382c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
@@ -49,11 +49,11 @@ public class ViewStockinHistory extends BaseEntity
     @Excel(name = "订单号")
     private String erpBill;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
-    /** 物料名称 */
-    @Excel(name = "物料名称")
+    /** 品名 */
+    @Excel(name = "品名")
     private String productName;
     /** 供应商名称 */
     @Excel(name = "供应商名称")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
index 7aa3416..448a065 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
@@ -49,12 +49,12 @@ public class ViewStockoutHistory extends BaseEntity
     @Excel(name = "订单号")
     private String erpStockoutId;
 
-    /** 物料编码 */
-    @Excel(name = "物料编码")
+    /** 品号 */
+    @Excel(name = "品号")
     private String productId;
 
-    /** 物料名称 */
-    @Excel(name = "物料名称")
+    /** 品名 */
+    @Excel(name = "品名")
     private String productName;
 
     /** 出口 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
index e8e4b88..56e3ed1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
@@ -55,8 +55,8 @@ public class BasStock extends BaseEntity
 
     //额外字段
     @Excels({
-            @Excel(name = "${stock.BasStock.productId}", targetAttr = "productId"),// 物料编码
-            @Excel(name = "${stock.BasStock.materialDesc}", targetAttr = "materialDesc"),// 物料描述
+            @Excel(name = "${stock.BasStock.productId}", targetAttr = "productId"),// 品号
+            @Excel(name = "${stock.BasStock.materialDesc}", targetAttr = "materialDesc"),// 品名
             @Excel(name = "${stock.BasStock.englishDesc}", targetAttr = "englishDesc"),//物料英文描述
             @Excel(name = "${stock.BasStock.netWeight}", targetAttr = "netWeight"),//净重
             @Excel(name = "${stock.BasStock.length}",targetAttr = "length"),//长度
@@ -66,11 +66,11 @@ public class BasStock extends BaseEntity
     })
     private ExtraField extraField;
 
-    /** 物料编码 */
+    /** 品号 */
 //    @Excel(name = "${stock.BasStock.productId}")
     private String productId;
 
-    //物料描述
+    //品名
 //    @Excel(name = "${stock.BasStock.materialDesc}")
     private String materialDesc;
 
@@ -177,8 +177,8 @@ public class BasStock extends BaseEntity
     private String spare4;
 
 
-    //物料名称
-//    @Excel(name = "物料名称")
+    //品名
+//    @Excel(name = "品名")
     private String productName;
 
     private List<String> typeData;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
index 8e243c0..cf9f1f1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
@@ -68,4 +68,6 @@ public interface BasStockMapper
     int updateStockStatusByTrayCode(@Param("stockStatus") String stockStatus,@Param("trayCode") String trayCode);
 
     void resetPdRecord();
+
+    List<BasStock> getStockBySerial(String trayCode);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java
index c5f33e2..c3ea57b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java
@@ -81,4 +81,6 @@ public interface IBasStockService
     List<BasStock> selectKtpStock(BasStock basStock);
 
     AjaxResult resetPdRecord();
+
+    List<BasStock> getStockBySerial(String serial);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
index 3effe05..f9ff3f3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
@@ -189,6 +189,11 @@ public class BasStockServiceImpl implements IBasStockService
         return AjaxResult.success();
     }
 
+    @Override
+    public List<BasStock> getStockBySerial(String trayCode) {
+        return basStockMapper.getStockBySerial(trayCode);
+    }
+
     /**
      * 新增库存信息（不记录维护记录）
      *
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
index 2fe6427..1286d57 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -25,6 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="groupCoding"    column="group_coding"    />
         <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
         <result property="thisCargoArea"    column="this_cargo_area"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="quantity"    column="quantity"    />
     </resultMap>
 
     <sql id="selectBasCargoSpaceVo">
@@ -191,34 +196,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY the_platoon, the_floor,the_column
     </select>
     <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
-        select bcs.cargo_space_id, bcs.warehouse_id, bw.warehouse_name, bcs.roadway_id, bcs.cargo_area_id, bcs.the_type,
-        bcs.the_type_name, bcs.cargo_space_name, bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.status, bcs.locked,
-        bcs.tray_code, bcs.cargo_hight, bcs.iss_double, bcs.group_coding_no, bcs.group_coding, bcs.cargo_space_logo,
-        bcs.this_cargo_area
-        from bas_cargo_space bcs
-        left join bas_warehouse bw on bw.warehouse_id = bcs.warehouse_id
-        left join bas_roadway br on br.roadway_id = bcs.roadway_id
-        left join bas_stock bs on bs.cargo_space_id = bcs.cargo_space_id
-        left join bas_product bp on bp.product_id = bs.product_id
-        where br.out_locked = 'N'
+        select bcs.cargo_space_id, bcs.warehouse_id, bcs.roadway_id, bcs.cargo_space_name,
+               bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.status, bcs.locked, bs.tray_code, bs.product_id,
+               bp.product_name,bs.spare6,bs.quantity,bs.spare7
+        from bas_stock bs,bas_cargo_space bcs,bas_roadway br,bas_product bp
+        where bs.cargo_space_id = bcs.cargo_space_id
+          and br.roadway_id = bcs.roadway_id
+          and bp.product_id = bs.product_id
+          and br.out_locked = 'N'
         <if test="warehouseId != null  and warehouseId != ''"> and bcs.warehouse_id = #{warehouseId}</if>
         <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
-        <if test="cargoAreaId != null  and cargoAreaId != ''"> and bcs.cargo_area_id = #{cargoAreaId}</if>
-        <if test="theType != null  and theType != ''"> and bcs.the_type = #{theType}</if>
-        <if test="theTypeName != null  and theTypeName != ''"> and bcs.the_type_name like concat('%', #{theTypeName}, '%')</if>
         <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
         <if test="thePlatoon != null "> and bcs.the_platoon = #{thePlatoon}</if>
         <if test="theColumn != null "> and bcs.the_column = #{theColumn}</if>
         <if test="theFloor != null "> and bcs.the_floor = #{theFloor}</if>
         <if test="status != null  and status != ''"> and bcs.status = #{status}</if>
         <if test="locked != null  and locked != ''"> and bcs.locked = #{locked}</if>
-        <if test="trayCode != null  and trayCode != ''"> and bcs.tray_code like concat('%', #{trayCode}, '%')</if>
-        <if test="cargoHight != null  and cargoHight != ''"> and bcs.cargo_hight = #{cargoHight}</if>
-        <if test="issDouble != null  and issDouble != ''"> and bcs.iss_double = #{issDouble}</if>
-        <if test="groupCodingNo != null  and groupCodingNo != ''"> and bcs.group_coding_no = #{groupCodingNo}</if>
-        <if test="groupCoding != null  and groupCoding != ''"> and bcs.group_coding = #{groupCoding}</if>
-        <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and bcs.cargo_space_logo = #{cargoSpaceLogo}</if>
+        <if test="trayCode != null  and trayCode != ''"> and bs.tray_code like concat('%', #{trayCode}, '%')</if>
         <if test="spare7 != null  and spare7 != ''"> and bs.spare7 = #{spare7}</if>
-        <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
+        <if test="spare6 != null  and spare6 != ''"> and bs.spare6 like concat('%', #{spare6}, '%')</if>
+        <if test="productId != null  and productId != ''"> and bs.product_id like concat('%', #{productId}, '%')</if>
+        <if test="productName != null  and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
     </select>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
index 6a16215..3568f9f 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
@@ -230,4 +230,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteCheckStockinDetailByStockinGuid">
         delete from check_stockin_detail where stock_check_guid = #{stockCheckGuid}
     </delete>
+
+    <select id="getCheckDetailById" parameterType="String" resultMap="CheckStockinDetailResult">
+        select * from check_stockin_detail where stock_check_id = #{stockCheckId}
+    </select>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
index 1ed29cc..282ffd1 100644
--- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
         {
             call proc_check_auto_allocation(
-                #{v_stock_check_id,mode=IN,jdbcType=VARCHAR},
+                #{v_stock_check_detail_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=VARCHAR},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
                  )
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
index ca6f110..ee5bf95 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
@@ -70,7 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createManId != null  and createManId != ''"> and is2.create_man_id = #{createManId}</if>
             <if test="status != null  and status != ''"> and is2.status = #{status}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
-            <if test="finishDate != null  and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
+            <if test="startDate != null  and startDate != ''"> and is2.create_date &gt;= #{startDate}</if>
+            <if test="finishDate != null  and finishDate != ''"> and is2.create_date &lt;= #{finishDate}</if>
             <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
             <if test="stockSource != null  and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
             <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
index a18cc5d..47b8788 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
@@ -113,18 +113,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
             <if test="customerId != null  and customerId != ''"> and mj.customer_id = #{customerId}</if>
             <if test="departmentId != null  and departmentId != ''"> and mj.department_id = #{departmentId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code = #{trayCode}</if>
+            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code like concat('%', #{trayCode}, '%')</if>
             <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id = #{roadwayId}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
             <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id = #{targetRoadwayId}</if>
             <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id = #{targetCargoSpaceId}</if>
-            <if test="lineId != null  and lineId != ''"> and mj.line_id = #{lineId}</if>
+            <if test="lineId != null  and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%') </if>
             <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
             <if test="priority != null "> and mj.priority = #{priority}</if>
             <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
             <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
-            <if test="startTime != null  and startTime != ''"> and mj.start_time like concat('%', #{startTime}, '%')</if>
-            <if test="finishTime != null  and finishTime != ''"> and mj.finish_time like concat('%', #{finishTime}, '%')</if>
+            <if test="startTime != null  and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
             <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id = #{entranceId}</if>
             <if test="exitId != null  and exitId != ''"> and mj.exit_id = #{exitId}</if>
             <if test="classId != null  and classId != ''"> and mj.class_id = #{classId}</if>
@@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
+            <if test="productId != null  and productId != ''"> and mj.job_id in (select job_id from mydo_job_detail where product_id like concat('%', #{productId}, '%'))</if>
             <if test = "inOutIds !=null and inOutIds.size() > 0">
                 and mj.in_or_out in
                 <foreach item="item" index="index" collection="inOutIds" separator="," open="(" close=")">
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index 8939262..4e2fe7e 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -67,18 +67,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
             <if test="customerId != null  and customerId != ''"> and mj.customer_id = #{customerId}</if>
             <if test="departmentId != null  and departmentId != ''"> and mj.department_id = #{departmentId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code = #{trayCode}</if>
+            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code like concat('%',#{trayCode},'%')</if>
             <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id = #{roadwayId}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
             <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id = #{targetRoadwayId}</if>
             <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id = #{targetCargoSpaceId}</if>
-            <if test="lineId != null  and lineId != ''"> and mj.line_id = #{lineId}</if>
+            <if test="lineId != null  and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%') </if>
             <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
             <if test="priority != null "> and mj.priority = #{priority}</if>
             <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
             <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
-            <if test="startTime != null  and startTime != ''"> and mj.start_time like concat('%', #{startTime}, '%')</if>
-            <if test="finishTime != null  and finishTime != ''"> and mj.finish_time like concat('%', #{finishTime}, '%')</if>
+            <if test="startTime != null  and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
             <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat('%',#{entranceId},'%')</if>
             <if test="exitId != null  and exitId != ''"> and mj.exit_id like concat('%', #{exitId}, '%')</if>
             <if test="classId != null  and classId != ''"> and mj.class_id = #{classId}</if>
@@ -88,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
+            <if test="productId != null  and productId != ''"> and mj.job_id in (select job_id from mydo_job_detail where product_id like concat('%', #{productId}, '%'))</if>
             <if test = "inOutIds !=null and inOutIds.size() > 0">
                 and mj.in_or_out in
                 <foreach item="item" index="index" collection="inOutIds" separator="," open="(" close=")">
@@ -236,4 +237,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
         order by mj.create_time
     </select>
+
+    <select id="getInJobBySerial" parameterType="String" resultMap="MydoJobResult">
+        select * from mydo_job where tray_code=#{trayCode}
+    </select>
 </mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
index b41a950..5a95f55 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
@@ -45,7 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewHandAllotStockVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, 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
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid,
+               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
     </sql>
 
     <select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
@@ -56,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
             <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
             <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%',  #{lotNo}, '%')</if>
             <if test="inDate != null  and inDate != ''"> and in_date like concat('%',  #{inDate}, '%')</if>
             <if test="backDate != null  and backDate != ''"> and back_date = #{backDate}</if>
             <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
@@ -75,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
             <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
             <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
             <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
@@ -85,10 +89,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="grossWeight != null "> and gross_weight = #{grossWeight}</if>
             <if test="distribution != null  and distribution != ''"> and distribution = #{distribution}</if>
             <if test="model != null  and model != ''"> and model = #{model}</if>
-            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="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="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</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>
         </where>
     </select>
     
diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
index 2bdace2..262948d 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
@@ -31,15 +31,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, spare1, spare3, spare4, spare5, spare6, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id from view_product_and_stock
     </sql>
     <sql id="selectViewProductAndStockPdVo">
-        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, spare1, spare3, spare4, spare5, spare6, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id from view_product_and_stock_pd
+        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, spare1, spare3, spare4, spare5, spare6, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7 from view_product_and_stock_pd
     </sql>
 
     <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
         <include refid="selectViewProductAndStockVo"/>
         <where>
             <if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
-            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
             <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
             <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
             <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
             <if test="power != null  and power != ''"> and power = #{power}</if>
             <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
@@ -67,11 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectViewProductAndStockPdVo"/>
         <where>
             <if test="onlyIdentity != null ">and only_identity = #{onlyIdentity}</if>
-            <if test="productId != null  and productId != ''">and product_id = #{productId}</if>
-            <if test="lotNo != null  and lotNo != ''">and lot_no = #{lotNo}</if>
-            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
-                '%')
-            </if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="quantity != null ">and quantity = #{quantity}</if>
             <if test="warehouseId != null  and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
             <if test="spare1 != null  and spare1 != ''">and spare1 = #{spare1}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index 43f585e..86b54e1 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -244,4 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by b.the_platoon,b.the_floor,b.the_column asc
     </select>
+
+    <select id="getStockBySerial" parameterType="String" resultMap="BasStockResult">
+        select * from bas_stock where tray_code = #{trayCode}
+    </select>
 </mapper>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/domain/ExtraField.java b/ruoyi-common/src/main/java/com/ruoyi/common/domain/ExtraField.java
index bbf240c..a350fc2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/domain/ExtraField.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/domain/ExtraField.java
@@ -16,11 +16,11 @@ public class ExtraField {
     @Excel(name = "子件")
     private String subItem;
 
-    @Excel(name = "物料编码")
+    @Excel(name = "品号")
     @NotEmpty(message = "物料GUID不能为空")
     private String productId;
 
-    @Excel(name = "物料描述")
+    @Excel(name = "品名")
     private String materialDesc;
 
     @Excel(name = "英文描述")
diff --git a/ruoyi-ui/src/views/bas/BasProductCode/index.vue b/ruoyi-ui/src/views/bas/BasProductCode/index.vue
index 5a0852b..1c2bd98 100644
--- a/ruoyi-ui/src/views/bas/BasProductCode/index.vue
+++ b/ruoyi-ui/src/views/bas/BasProductCode/index.vue
@@ -54,7 +54,7 @@
          <el-dialog
            title="标签预览"
            :visible.sync="showPreview"
-           width="800px"
+           width="700px"
            :close-on-click-modal="false"
            append-to-body
          >
@@ -103,7 +103,7 @@
                 <div class="qrcode-container">
                   <vue-qr
                     :text="qrCodeValue"
-                    :size="180"
+                    :size="200"
                     :margin="0"
                     :correctLevel="2"
                     error-correction-level="M"
@@ -117,19 +117,19 @@
           <!-- 打印专用区域（隐藏） -->
           <vue-easy-print style="display: none;" ref="easyPrint2">
             <div style="page-break-after:always">
-              <div class="preview-row">
+              <div class="preview-row" >
                 <span class="preview-label">MODEL:</span>
                 <span class="preview-value">{{ previewData.model }}</span>
               </div>
-              <div class="preview-row">
+              <div class="preview-row" >
                 <span class="preview-label">SERIAL:</span>
                 <span class="preview-value">{{ previewData.serial }}</span>
               </div>
-              <div class="preview-row">
+              <div class="preview-row" >
                 <span class="preview-label">COLOR:</span>
                 <span class="preview-value">{{ previewData.color }}</span>
               </div>
-              <div class="preview-row">
+              <div class="preview-row" >
                 <div class="preview-col">
                   <span class="preview-label">V:</span>
                   <span class="preview-value">{{ previewData.v }}</span>
@@ -143,7 +143,7 @@
                   <span class="preview-value">{{ previewData.ph }}</span>
                 </div>
               </div>
-              <div class="preview-row">
+              <div class="preview-row" >
                 <div class="preview-col">
                   <span class="preview-label">N.W.:</span>
                   <span class="preview-value">{{ previewData.nW }}</span>
@@ -256,19 +256,19 @@
     >
       <div class="search-container">
         <el-form :model="productQueryParams" ref="queryForm" :inline="true">
-          <el-form-item label="物料编码" prop="productId">
+          <el-form-item label="品号" prop="productId">
             <el-input
               v-model="productQueryParams.productId"
-              placeholder="请输入物料编码"
+              placeholder="请输入品号"
               clearable
               size="small"
               @keyup.enter.native="handleProductQuery"
             />
           </el-form-item>
-          <el-form-item label="物料名称" prop="productName">
+          <el-form-item label="品名" prop="productName">
             <el-input
               v-model="productQueryParams.productName"
-              placeholder="请输入物料名称"
+              placeholder="请输入品名"
               clearable
               size="small"
               @keyup.enter.native="handleProductQuery"
@@ -954,16 +954,17 @@ export default {
 }
 
 .preview-label {
-  font-weight: 240;
   margin-right: 15px;
   min-width: 10px;
-  font-size: 10px;
+  font-size: 15px;
+  font-weight: bold;
   color: #000000;
 }
 
 .preview-value {
   flex: 1;
-  font-size: 10px;
+  font-size: 15px;
+  font-weight: bold;
   color: #000000;
   word-break: break-all;
 }
diff --git a/ruoyi-ui/src/views/bas/basCustomer/index.vue b/ruoyi-ui/src/views/bas/basCustomer/index.vue
index 6f81013..1699eb2 100644
--- a/ruoyi-ui/src/views/bas/basCustomer/index.vue
+++ b/ruoyi-ui/src/views/bas/basCustomer/index.vue
@@ -2,13 +2,16 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="客户编号" prop="customerNo">
-        <el-input v-model="queryParams.customerNo" placeholder="请输入客户编号" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.customerNo" 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-input v-model="queryParams.customerName" 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-input v-model="queryParams.simpleName" placeholder="请输入简称" clearable
+                  @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="是否可用" prop="useable">
         <el-select v-model="queryParams.useable" placeholder="请选择是否可用" clearable>
@@ -29,50 +32,62 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['bas:BasCustomer:add']">新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['bas:BasCustomer:add']">新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['bas:BasCustomer:edit']">修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+                   v-hasPermi="['bas:BasCustomer:edit']">修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['bas:BasCustomer:remove']">删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+                   v-hasPermi="['bas:BasCustomer:remove']">删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['bas:BasCustomer:export']">导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                   v-hasPermi="['bas:BasCustomer:export']">导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="BasCustomerList" @selection-change="handleSelectionChange" max-height="700">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column width="120" label="客户编号" align="left" prop="customerNo" />
-<el-table-column width="120" label="客户类别" align="left" prop="customerGroupNo" />
-<el-table-column width="220" label="客户名称" align="left" prop="customerName" />
-<el-table-column width="120" label="简称" align="left" prop="simpleName" />
-<el-table-column width="120" label="是否可用" align="left" prop="useable" >
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column width="120" label="客户编号" align="left" prop="customerNo"/>
+      <el-table-column width="120" label="客户类别" align="left" prop="customerGroupNo"/>
+      <el-table-column width="220" label="客户名称" align="left" prop="customerName"/>
+      <el-table-column width="120" label="简称" align="left" prop="simpleName"/>
+      <el-table-column width="120" label="是否可用" align="left" prop="useable">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
         </template>
-        </el-table-column>
-<el-table-column width="120" label="备注" align="left" prop="remark" />
-<el-table-column width="120" label="业务部门" align="left" prop="businessDepartment" />
-<el-table-column width="120" label="业务员" align="left" prop="salesman" />
-<el-table-column width="120" label="助记码" align="left" prop="mnemonicCode" />
-<el-table-column width="120" label="客户类型" align="left" prop="type" />
-<el-table-column width="120" label="纳税人识别号" align="left" prop="taxpayerRegistrationNumber" />
-<el-table-column width="120" label="财务组织" align="left" prop="organization" />
-<el-table-column width="120" label="上级客户" align="left" prop="supCustomer" />
-<el-table-column width="120" label="个人客户" align="left" prop="retailInvestor" />
-<el-table-column width="120" label="国家/地区" align="left" prop="country" />
-<el-table-column width="120" label="时区" align="left" prop="timeZone" />
-<el-table-column width="120" label="数据格式" align="left" prop="dataFormat" />
-<el-table-column width="120" label="联系人" align="left" prop="contactName" />
-<el-table-column width="120" label="装运国家" align="left" prop="shipment" />
-<el-table-column width="120" label="税种" align="left" prop="taxCategory" />
+      </el-table-column>
+      <el-table-column width="120" label="备注" align="left" prop="remark"/>
+      <el-table-column width="120" label="业务部门" align="left" prop="businessDepartment"/>
+      <el-table-column width="120" label="业务员" align="left" prop="salesman"/>
+      <el-table-column width="120" label="助记码" align="left" prop="mnemonicCode"/>
+      <el-table-column width="120" label="客户类型" align="left" prop="type"/>
+      <el-table-column width="120" label="纳税人识别号" align="left" prop="taxpayerRegistrationNumber"/>
+      <el-table-column width="120" label="财务组织" align="left" prop="organization"/>
+      <el-table-column width="120" label="上级客户" align="left" prop="supCustomer"/>
+      <el-table-column width="120" label="个人客户" align="left" prop="retailInvestor"/>
+      <el-table-column width="120" label="国家/地区" align="left" prop="country"/>
+      <el-table-column width="120" label="时区" align="left" prop="timeZone"/>
+      <el-table-column width="120" label="数据格式" align="left" prop="dataFormat"/>
+      <el-table-column width="120" label="联系人" align="left" prop="contactName"/>
+      <el-table-column width="120" label="装运国家" align="left" prop="shipment"/>
+      <el-table-column width="120" label="税种" align="left" prop="taxCategory"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bas:BasCustomer:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bas:BasCustomer:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['bas:BasCustomer:edit']">修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['bas:BasCustomer:remove']">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -89,13 +104,13 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="客户编号" prop="customerNo">
-          <el-input v-model="form.customerNo" placeholder="请输入客户编号" />
+          <el-input v-model="form.customerNo" placeholder="请输入客户编号"/>
         </el-form-item>
         <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+          <el-input v-model="form.customerName" placeholder="请输入客户名称"/>
         </el-form-item>
         <el-form-item label="简称" prop="simpleName">
-          <el-input v-model="form.simpleName" placeholder="请输入简称" />
+          <el-input v-model="form.simpleName" placeholder="请输入简称"/>
         </el-form-item>
         <el-form-item label="是否可用" prop="useable">
           <el-select v-model="form.useable" placeholder="请选择是否可用">
@@ -108,49 +123,49 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"/>
         </el-form-item>
         <el-form-item label="业务部门" prop="businessDepartment">
-          <el-input v-model="form.businessDepartment" placeholder="请输入业务部门" />
+          <el-input v-model="form.businessDepartment" placeholder="请输入业务部门"/>
         </el-form-item>
         <el-form-item label="业务员" prop="salesman">
-          <el-input v-model="form.salesman" placeholder="请输入业务员" />
+          <el-input v-model="form.salesman" placeholder="请输入业务员"/>
         </el-form-item>
         <el-form-item label="助记码" prop="mnemonicCode">
-          <el-input v-model="form.mnemonicCode" placeholder="请输入助记码" />
+          <el-input v-model="form.mnemonicCode" placeholder="请输入助记码"/>
         </el-form-item>
         <el-form-item label="客户类型" prop="type">
-          <el-input v-model="form.type" placeholder="请输入客户类型" />
+          <el-input v-model="form.type" placeholder="请输入客户类型"/>
         </el-form-item>
         <el-form-item label="纳税人识别号" prop="taxpayerRegistrationNumber">
-          <el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人识别号" />
+          <el-input v-model="form.taxpayerRegistrationNumber" placeholder="请输入纳税人识别号"/>
         </el-form-item>
         <el-form-item label="财务组织" prop="organization">
-          <el-input v-model="form.organization" placeholder="请输入财务组织" />
+          <el-input v-model="form.organization" placeholder="请输入财务组织"/>
         </el-form-item>
         <el-form-item label="上级客户" prop="supCustomer">
-          <el-input v-model="form.supCustomer" placeholder="请输入上级客户" />
+          <el-input v-model="form.supCustomer" placeholder="请输入上级客户"/>
         </el-form-item>
         <el-form-item label="个人客户" prop="retailInvestor">
-          <el-input v-model="form.retailInvestor" placeholder="请输入个人客户" />
+          <el-input v-model="form.retailInvestor" placeholder="请输入个人客户"/>
         </el-form-item>
         <el-form-item label="国家/地区" prop="country">
-          <el-input v-model="form.country" placeholder="请输入国家/地区" />
+          <el-input v-model="form.country" placeholder="请输入国家/地区"/>
         </el-form-item>
         <el-form-item label="时区" prop="timeZone">
-          <el-input v-model="form.timeZone" placeholder="请输入时区" />
+          <el-input v-model="form.timeZone" placeholder="请输入时区"/>
         </el-form-item>
         <el-form-item label="数据格式" prop="dataFormat">
-          <el-input v-model="form.dataFormat" placeholder="请输入数据格式" />
+          <el-input v-model="form.dataFormat" placeholder="请输入数据格式"/>
         </el-form-item>
         <el-form-item label="联系人" prop="contactName">
-          <el-input v-model="form.contactName" placeholder="请输入联系人" />
+          <el-input v-model="form.contactName" placeholder="请输入联系人"/>
         </el-form-item>
         <el-form-item label="装运国家" prop="shipment">
-          <el-input v-model="form.shipment" placeholder="请输入装运国家" />
+          <el-input v-model="form.shipment" placeholder="请输入装运国家"/>
         </el-form-item>
         <el-form-item label="税种" prop="taxCategory">
-          <el-input v-model="form.taxCategory" placeholder="请输入税种" />
+          <el-input v-model="form.taxCategory" placeholder="请输入税种"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -162,11 +177,11 @@
 </template>
 
 <script>
-import { listBasCustomer, getBasCustomer, delBasCustomer, addBasCustomer, updateBasCustomer } from "@/api/bas/BasCustomer"
+import {listBasCustomer, getBasCustomer, delBasCustomer, addBasCustomer, updateBasCustomer} from "@/api/bas/BasCustomer"
 
 export default {
   name: "BasCustomer",
-  dicts:['is_available'],
+  dicts: ['is_available'],
   data() {
     return {
       // 遮罩层
@@ -216,16 +231,16 @@ export default {
       // 表单校验
       rules: {
         id: [
-          { required: true, message: "ID不能为空", trigger: "blur" }
+          {required: true, message: "ID不能为空", trigger: "blur"}
         ],
         customerNo: [
-          { required: true, message: "客户编号不能为空", trigger: "blur" }
+          {required: true, message: "客户编号不能为空", trigger: "blur"}
         ],
         customerName: [
-          { required: true, message: "客户名称不能为空", trigger: "blur" }
+          {required: true, message: "客户名称不能为空", trigger: "blur"}
         ],
         useable: [
-          { required: true, message: "是否可用不能为空", trigger: "blur" }
+          {required: true, message: "是否可用不能为空", trigger: "blur"}
         ],
       }
     }
@@ -288,7 +303,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -330,12 +345,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除客户编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除客户编号为"' + ids + '"的数据项?').then(function () {
         return delBasCustomer(ids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/bas/basProduct/index.vue b/ruoyi-ui/src/views/bas/basProduct/index.vue
index a5516fc..f3a5d40 100644
--- a/ruoyi-ui/src/views/bas/basProduct/index.vue
+++ b/ruoyi-ui/src/views/bas/basProduct/index.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="productId">
+      <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入物料编码"
+          placeholder="请输入品号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -97,10 +97,10 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -129,10 +129,10 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="电源线" prop="spare10">-->
+<!--      <el-form-item label="托盘尺寸" prop="spare10">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.spare10"-->
-<!--          placeholder="请输入电源线"-->
+<!--          placeholder="请输入托盘尺寸"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -432,7 +432,7 @@
       <el-table-column label="英文描述" align="center" prop="cargoNo" />
       <el-table-column label="图号" align="center" prop="unit" />
       <el-table-column label="电压" align="center" prop="spare5" />
-      <el-table-column label="电源线" align="center" prop="spare10" />
+      <el-table-column label="托盘尺寸" align="center" prop="spare10" />
       <el-table-column label="插头" align="center" prop="spare11" />
       <el-table-column label="接嘴" align="center" prop="spare12" />
       <el-table-column label="快捷码" align="center" prop="spare13" />
@@ -503,11 +503,11 @@
     <!-- 添加或修改物料管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="物料编码" prop="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="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="品名" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入品名" />
         </el-form-item>
 <!--        <el-form-item label="产品分类" prop="parentId">-->
 <!--          <el-input v-model="form.parentId" placeholder="请输入产品分类" />-->
@@ -555,8 +555,8 @@
         <el-form-item label="NC号" prop="spare9">
           <el-input v-model="form.spare9" placeholder="请输入NC号" />
         </el-form-item>
-        <el-form-item label="电源线" prop="spare10">
-          <el-input v-model="form.spare10" placeholder="请输入电源线" />
+        <el-form-item label="托盘尺寸" prop="spare10">
+          <el-input v-model="form.spare10" placeholder="请输入托盘尺寸" />
         </el-form-item>
         <el-form-item label="插头" prop="spare11">
           <el-input v-model="form.spare11" placeholder="请输入插头" />
@@ -735,10 +735,10 @@ export default {
       // 表单校验
       rules: {
         productId: [
-          { required: true, message: "物料编码不能为空", trigger: "blur" }
+          { required: true, message: "品号不能为空", trigger: "blur" }
         ],
         productName: [
-          { required: true, message: "物料名称不能为空", trigger: "blur" }
+          { required: true, message: "品名不能为空", trigger: "blur" }
         ],
       }
     }
diff --git a/ruoyi-ui/src/views/bas/basstandPosition/index.vue b/ruoyi-ui/src/views/bas/basstandPosition/index.vue
index 01d845f..8bcde29 100644
--- a/ruoyi-ui/src/views/bas/basstandPosition/index.vue
+++ b/ruoyi-ui/src/views/bas/basstandPosition/index.vue
@@ -237,7 +237,7 @@
                     class="detail-table"
                   >
                     <el-table-column prop="productId" label="物料编号" width="120" align="center" />
-                    <el-table-column prop="productName" label="物料名称" min-width="150" />
+                    <el-table-column prop="productName" label="品名" min-width="150" />
                     <el-table-column prop="quantity" label="数量" width="100" align="center">
                       <template slot-scope="scope">
                         <el-tag type="warning" size="mini">{{ scope.row.quantity }}</el-tag>
@@ -305,8 +305,8 @@ title="选择交付目标"
                    >
                    </el-option>
                  </el-select>
-                   
-                   
+
+
                </el-form-item>
                <el-form-item>
                  <el-button type="primary" @click="handleSearch" size="small">
diff --git a/ruoyi-ui/src/views/bas/cargoSpace/index.vue b/ruoyi-ui/src/views/bas/cargoSpace/index.vue
index 3758c5e..3cd6006 100644
--- a/ruoyi-ui/src/views/bas/cargoSpace/index.vue
+++ b/ruoyi-ui/src/views/bas/cargoSpace/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="labelWidthForSearch">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+             :label-width="labelWidthForSearch">
       <!-- 货位ID -->
       <el-form-item label="货位编号" prop="cargoSpaceId">
         <el-input
@@ -10,52 +11,34 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- 仓库ID -->
-<!--      <el-form-item label="仓库名称" prop="warehouseId">&lt;!&ndash; 仓库id &ndash;&gt;-->
-<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">-->
-<!--          <el-option-->
-<!--            v-for="item in warehouseOptions"-->
-<!--            :key="item.warehouseId"-->
-<!--            :label="item.warehouseName"-->
-<!--            :value="item.warehouseId"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-       <el-form-item label="货位名称" prop="cargoSpaceName">
+
+      <!-- 排 -->
+      <el-form-item label="货位-排" prop="thePlatoon">
         <el-input
-          v-model="queryParams.cargoSpaceName"
-          placeholder="请输入货位名称"
+          v-model="queryParams.thePlatoon"
+          placeholder="请输入货位-排"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- 排 -->
-      <!-- <el-form-item :label="$t('cargoSpace.platoon')" prop="thePlatoon">
-        <el-input
-          v-model="queryParams.thePlatoon"
-          :placeholder="$t('cargoSpace.platoon')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <!-- 列 -->
-      <!-- <el-form-item :label="$t('cargoSpace.column')" prop="theColumn">
+      <el-form-item label="货位-列" prop="theColumn">
         <el-input
           v-model="queryParams.theColumn"
-          :placeholder="$t('cargoSpace.column')"
+          placeholder="请输入货位-列"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
       <!-- 层 -->
-      <!-- <el-form-item :label="$t('cargoSpace.floor')" prop="theFloor">
+      <el-form-item label="货位-层" prop="theFloor">
         <el-input
           v-model="queryParams.theFloor"
-          :placeholder="$t('cargoSpace.floor')"
+          placeholder="请输入货位-层"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
       <!-- 货位状态 -->
       <el-form-item label="货位状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择货位状态" clearable>
@@ -79,10 +62,10 @@
         </el-select>
       </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"
         />
@@ -104,17 +87,17 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        &lt;!&ndash; 【新增】按钮 &ndash;&gt;-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['bas:cargoSpace:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        &lt;!&ndash; 【新增】按钮 &ndash;&gt;-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['bas:cargoSpace:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <!-- 【修改】按钮 -->
         <el-button
@@ -125,20 +108,21 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['bas:cargoSpace:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        &lt;!&ndash; 【删除】按钮 &ndash;&gt;-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['bas:cargoSpace:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        &lt;!&ndash; 【删除】按钮 &ndash;&gt;-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['bas:cargoSpace:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <!-- 【导入】按钮 -->
         <el-button
@@ -148,42 +132,43 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['bas:cargoSpace:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="cargoSpaceList" @selection-change="handleSelectionChange" max-height="650">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <!-- 货位ID -->
-      <el-table-column label="货位编号" align="left" prop="cargoSpaceId" />
+      <el-table-column label="货位编号" align="left" prop="cargoSpaceId"/>
       <!-- 仓库名称 -->
       <!--      <el-table-column label="仓库名称" align="left" prop="warehouseName" />-->
-            <el-table-column label="巷道ID" align="left" prop="roadwayId" />
+      <el-table-column label="巷道ID" align="left" prop="roadwayId"/>
       <!-- 货位名称 -->
-      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName"/>
       <!-- 排 -->
-       <el-table-column label="排" align="left" prop="thePlatoon" />
+      <el-table-column label="排" align="left" prop="thePlatoon"/>
       <!-- 列 -->
-       <el-table-column label="列" align="left" prop="theColumn" />
+      <el-table-column label="列" align="left" prop="theColumn"/>
       <!-- 层 -->
-       <el-table-column label="层" align="left" prop="theFloor" />
-       <!-- 货位编码 -->
-      <el-table-column label="货位状态" align="left" prop="status" >
+      <el-table-column label="层" align="left" prop="theFloor"/>
+      <!-- 货位编码 -->
+      <el-table-column label="货位状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <!-- 是否锁定 -->
-      <el-table-column label="锁定状态" align="left" prop="locked" >
+      <el-table-column label="锁定状态" align="left" prop="locked">
         <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="trayCode" />
+      <el-table-column label="序列号" align="left" prop="trayCode"/>
       <!-- 货物高度 -->
-<!--      <el-table-column label="货物高度" align="right" prop="cargoHight" />-->
+      <!--      <el-table-column label="货物高度" align="right" prop="cargoHight" />-->
       <!-- 人工操作 -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -194,15 +179,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['bas:cargoSpace:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <!-- 人工操作---【删除】按钮 -->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['bas:cargoSpace:remove']"-->
-<!--          >删除</el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-delete"-->
+          <!--            @click="handleDelete(scope.row)"-->
+          <!--            v-hasPermi="['bas:cargoSpace:remove']"-->
+          <!--          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -223,44 +209,44 @@
           <el-input v-model="form.cargoSpaceId" placeholder="请输入货位编号" disabled/>
         </el-form-item>
         <!-- 仓库 -->
-<!--        <el-form-item label="仓库名称" prop="warehouseId">-->
-<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">-->
-<!--          <el-option-->
-<!--            v-for="item in warehouseOptions"-->
-<!--            :key="item.warehouseId"-->
-<!--            :label="item.warehouseName"-->
-<!--            :value="item.warehouseId"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+        <!--        <el-form-item label="仓库名称" prop="warehouseId">-->
+        <!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库名称">-->
+        <!--          <el-option-->
+        <!--            v-for="item in warehouseOptions"-->
+        <!--            :key="item.warehouseId"-->
+        <!--            :label="item.warehouseName"-->
+        <!--            :value="item.warehouseId"-->
+        <!--          />-->
+        <!--        </el-select>-->
+        <!--      </el-form-item>-->
         <!-- 巷道号 -->
         <el-form-item label="巷道编号" prop="roadwayId">
           <el-input v-model="form.roadwayId" placeholder="请输入巷道编号" disabled/>
         </el-form-item>
         <!-- 货区编码 -->
-<!--        <el-form-item label="货区编号" prop="cargoAreaId">-->
-<!--          <el-input v-model="form.cargoAreaId" placeholder="请输入货区编号" disabled/>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="货区编号" prop="cargoAreaId">-->
+        <!--          <el-input v-model="form.cargoAreaId" placeholder="请输入货区编号" disabled/>-->
+        <!--        </el-form-item>-->
         <!-- 货位类型 -->
-<!--        <el-form-item label="货位类型" prop="theTypeName">-->
-<!--          <el-input v-model="form.theTypeName" placeholder="请输入货位类型" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="货位类型" prop="theTypeName">-->
+        <!--          <el-input v-model="form.theTypeName" placeholder="请输入货位类型" />-->
+        <!--        </el-form-item>-->
         <!-- 货位名称 -->
         <el-form-item label="货位名称" prop="cargoSpaceName">
           <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" disabled/>
         </el-form-item>
         <!-- 排 -->
-<!--        <el-form-item label="排" prop="thePlatoon">-->
-<!--          <el-input v-model="form.thePlatoon" placeholder="请输入排号" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="排" prop="thePlatoon">-->
+        <!--          <el-input v-model="form.thePlatoon" placeholder="请输入排号" />-->
+        <!--        </el-form-item>-->
         <!-- 列 -->
-<!--        <el-form-item label="列" prop="theColumn">-->
-<!--          <el-input v-model="form.theColumn" placeholder="请输入列号" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="列" prop="theColumn">-->
+        <!--          <el-input v-model="form.theColumn" placeholder="请输入列号" />-->
+        <!--        </el-form-item>-->
         <!-- 层 -->
-<!--        <el-form-item label="层" prop="theFloor">-->
-<!--          <el-input v-model="form.theFloor" placeholder="请输入层号" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="层" prop="theFloor">-->
+        <!--          <el-input v-model="form.theFloor" placeholder="请输入层号" />-->
+        <!--        </el-form-item>-->
         <!-- 货位状态 -->
         <el-form-item label="货位状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择货位状态">
@@ -284,13 +270,13 @@
           </el-select>
         </el-form-item>
         <!-- 托盘编码 -->
-        <el-form-item label="托盘编号" prop="trayCode">
-          <el-input v-model="form.trayCode" placeholder="请输入托盘编号" />
+        <el-form-item label="序列号" prop="trayCode">
+          <el-input v-model="form.trayCode" placeholder="请输入序列号"/>
         </el-form-item>
         <!-- 货位高度 -->
-<!--        <el-form-item label="货物高度" prop="cargoHight">-->
-<!--          <el-input v-model="form.cargoHight" placeholder="请输入货物高度" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="货物高度" prop="cargoHight">-->
+        <!--          <el-input v-model="form.cargoHight" placeholder="请输入货物高度" />-->
+        <!--        </el-form-item>-->
 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -304,12 +290,12 @@
 </template>
 
 <script>
-import { listCargoSpace, getCargoSpace, delCargoSpace, addCargoSpace, updateCargoSpace } from "@/api/bas/cargoSpace"
+import {listCargoSpace, getCargoSpace, delCargoSpace, addCargoSpace, updateCargoSpace} from "@/api/bas/cargoSpace"
 import {listWarehouse} from "@/api/bas/warehouse"
 
 export default {
   name: "CargoSpace",
-  dicts:['cargo_space_status','cargo_space_lock_status'],
+  dicts: ['cargo_space_status', 'cargo_space_lock_status'],
   data() {
     return {
       // 遮罩层
@@ -326,7 +312,7 @@ export default {
       total: 0,
       // 库存信息表格数据
       cargoSpaceList: [],
-      warehouseOptions:[],
+      warehouseOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -361,35 +347,35 @@ export default {
       rules: {
         cargoSpaceId: [
           //  校验---货位ID是否为空
-          { required: true, message: "请输入货位编号", trigger: "blur" }
+          {required: true, message: "请输入货位编号", trigger: "blur"}
         ],
         warehouseId: [
           //  校验---仓库是否为空
-          { required: true, message: "请选择仓库", trigger: "change" }
+          {required: true, message: "请选择仓库", trigger: "change"}
         ],
         cargoSpaceName: [
           // 校验---货位名称是否为空
-          { required: true, message: "请输入货位名称", trigger: "blur" }
+          {required: true, message: "请输入货位名称", trigger: "blur"}
         ],
         thePlatoon: [
           // 校验---排是否为空
-          { required: true, message: "请输入排号", trigger: "blur" }
+          {required: true, message: "请输入排号", trigger: "blur"}
         ],
         theColumn: [
           // 校验---列是否为空
-          { required: true, message: "请输入列号", trigger: "blur" }
+          {required: true, message: "请输入列号", trigger: "blur"}
         ],
         theFloor: [
           // 校验---层是否为空
-          { required: true, message: "请输入层号", trigger: "blur" }
+          {required: true, message: "请输入层号", trigger: "blur"}
         ],
         status: [
           // 校验---货位状态是否为空
-          { required: true, message: "请选择货位状态", trigger: "change" }
+          {required: true, message: "请选择货位状态", trigger: "change"}
         ],
         locked: [
           // 校验---锁定状态是否为空
-          { required: true, message: "请选择锁定状态", trigger: "change" }
+          {required: true, message: "请选择锁定状态", trigger: "change"}
         ],
       }
     }
@@ -457,7 +443,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.cargoSpaceId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -522,12 +508,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const cargoSpaceIds = row.cargoSpaceId || this.ids
-      this.$modal.confirm('确认要删除货位编号为 "' + cargoSpaceIds + '" 的货位吗？').then(function() {
+      this.$modal.confirm('确认要删除货位编号为 "' + cargoSpaceIds + '" 的货位吗？').then(function () {
         return delCargoSpace(cargoSpaceIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -538,12 +525,12 @@ export default {
   },
   computed: {
     labelWidthForSearch() {
-        const lang = this.$i18n.locale;
-        return lang.startsWith('en') ? '84px' : '68px';
+      const lang = this.$i18n.locale;
+      return lang.startsWith('en') ? '84px' : '68px';
     },
     labelWidthForFunction() {
-        const lang = this.$i18n.locale;
-        return lang.startsWith('en') ? '150px' : '120px';
+      const lang = this.$i18n.locale;
+      return lang.startsWith('en') ? '150px' : '120px';
     }
   },
 }
diff --git a/ruoyi-ui/src/views/bas/containerDetails/index.vue b/ruoyi-ui/src/views/bas/containerDetails/index.vue
index 9748738..f3ed73d 100644
--- a/ruoyi-ui/src/views/bas/containerDetails/index.vue
+++ b/ruoyi-ui/src/views/bas/containerDetails/index.vue
@@ -20,10 +20,10 @@
         />
       </el-form-item>
       <!-- Product Name -->
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -145,7 +145,7 @@
       <!-- Product ID -->
       <el-table-column width="120" label="物料编号" align="left" prop="productId" />
       <!-- Product Name -->
-      <el-table-column width="120" label="物料名称" align="left" prop="productName" />
+      <el-table-column width="120" label="品名" align="left" prop="productName" />
       <!-- Quantity -->
       <el-table-column width="120" label="数量" align="right" prop="quantity" />
       <!-- Unit -->
@@ -172,7 +172,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -193,8 +193,8 @@
           <el-input v-model="form.productId" placeholder="请输入物料编号" />
         </el-form-item>
         <!-- Product Name -->
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="品名" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入品名" />
         </el-form-item>
         <!-- Quantity -->
         <el-form-item label="数量" prop="quantity">
diff --git a/ruoyi-ui/src/views/bas/port/index.vue b/ruoyi-ui/src/views/bas/port/index.vue
index dd10fc9..d17e837 100644
--- a/ruoyi-ui/src/views/bas/port/index.vue
+++ b/ruoyi-ui/src/views/bas/port/index.vue
@@ -157,18 +157,18 @@
     <!-- 选择物料对话框 -->
     <el-dialog title="选择物料" :visible.sync="productSelectVisible" width="1300px" append-to-body>
       <el-form :model="queryProductParams" :inline="true" label-width="80px">
-        <el-form-item label="物料编码" prop="productId">
+        <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryProductParams.productId"
-          placeholder="请输入物料编码"
+          placeholder="请输入品号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryProductParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -217,8 +217,8 @@
 
         <el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column label="物料编码" align="left" prop="productId" />
-          <el-table-column label="物料名称" align="left" prop="productName" />
+          <el-table-column label="品号" align="left" prop="productId" />
+          <el-table-column label="品名" align="left" prop="productName" />
           <el-table-column label="英文描述" align="left" prop="spare1"/>
           <el-table-column label="单位" align="left" prop="unit" />
           <el-table-column label="净重" align="right" prop="spare2" />
diff --git a/ruoyi-ui/src/views/bas/roadway/index.vue b/ruoyi-ui/src/views/bas/roadway/index.vue
index 6c1686e..0393090 100644
--- a/ruoyi-ui/src/views/bas/roadway/index.vue
+++ b/ruoyi-ui/src/views/bas/roadway/index.vue
@@ -9,70 +9,7 @@
           @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="巷道名称" prop="roadwayName">
-        <el-input
-          v-model="queryParams.roadwayName"
-          placeholder="请输入巷道名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="设备id" prop="deviceId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.deviceId"-->
-<!--          placeholder="请输入设备id"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="一层入库锁" prop="inLocked">
-        <el-select v-model="queryParams.inLocked" placeholder="请选择一层入库锁" clearable>
-          <el-option
-            v-for="dict in dict.type.roadway_lock"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="一层出库锁" prop="outLocked">
-        <el-select v-model="queryParams.outLocked" placeholder="请选择一层出库锁" clearable>
-          <el-option
-            v-for="dict in dict.type.roadway_lock"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="二层入库锁" prop="inLocked2">
-        <el-select v-model="queryParams.inLocked2" placeholder="请选择二层入库锁" clearable>
-          <el-option
-            v-for="dict in dict.type.roadway_lock"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="二层出库锁" prop="outLocked2">
-        <el-select v-model="queryParams.outLocked2" placeholder="请选择二层出库锁" clearable>
-          <el-option
-            v-for="dict in dict.type.roadway_lock"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -80,16 +17,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['bas:roadway:add']"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['bas:roadway:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -101,27 +38,27 @@
           v-hasPermi="['bas:roadway:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['bas:roadway:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['bas:roadway:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['bas:roadway:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['bas:roadway:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -131,22 +68,22 @@
 <!--      <el-table-column label="仓库id" align="center" prop="warehouseId" />-->
       <el-table-column label="巷道名称" align="center" prop="roadwayName" />
 <!--      <el-table-column label="设备id" align="center" prop="deviceId" />-->
-      <el-table-column label="一层入库锁" align="center" prop="inLocked">
+      <el-table-column label="一层入库" align="center" prop="inLocked">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.roadway_lock" :value="scope.row.inLocked"/>
         </template>
       </el-table-column>
-      <el-table-column label="一层出库锁" align="center" prop="outLocked">
+      <el-table-column label="一层出库" align="center" prop="outLocked">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.roadway_lock" :value="scope.row.outLocked"/>
         </template>
       </el-table-column>
-      <el-table-column label="二层入库锁" align="center" prop="inLocked2">
+      <el-table-column label="二层入库" align="center" prop="inLocked2">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.roadway_lock" :value="scope.row.inLocked2"/>
         </template>
       </el-table-column>
-      <el-table-column label="二层出库锁" align="center" prop="outLocked2">
+      <el-table-column label="二层出库" align="center" prop="outLocked2">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.roadway_lock" :value="scope.row.outLocked2"/>
         </template>
@@ -194,7 +131,7 @@
         <el-form-item label="设备id" prop="deviceId">
           <el-input v-model="form.deviceId" placeholder="请输入设备id" />
         </el-form-item>
-        <el-form-item label="一层入库锁" prop="inLocked">
+        <el-form-item label="一层入库" prop="inLocked">
           <el-select v-model="form.inLocked" placeholder="请选择一层入库锁">
             <el-option
               v-for="dict in dict.type.roadway_lock"
@@ -204,7 +141,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="一层出库锁" prop="outLocked">
+        <el-form-item label="一层出库" prop="outLocked">
           <el-select v-model="form.outLocked" placeholder="请选择一层出库锁">
             <el-option
               v-for="dict in dict.type.roadway_lock"
@@ -214,7 +151,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二层入库锁" prop="inLocked2">
+        <el-form-item label="二层入库" prop="inLocked2">
           <el-select v-model="form.inLocked2" placeholder="请选择二层入库锁">
             <el-option
               v-for="dict in dict.type.roadway_lock"
@@ -224,7 +161,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二层出库锁" prop="outLocked2">
+        <el-form-item label="二层出库" prop="outLocked2">
           <el-select v-model="form.outLocked2" placeholder="请选择二层出库锁">
             <el-option
               v-for="dict in dict.type.roadway_lock"
@@ -414,3 +351,10 @@ export default {
   }
 }
 </script>
+<style scoped>
+/* 统一表单控件宽度 */
+.el-select,
+.el-input {
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue
index 1d8df4b..65830f6 100644
--- a/ruoyi-ui/src/views/check/create/index.vue
+++ b/ruoyi-ui/src/views/check/create/index.vue
@@ -1,21 +1,88 @@
 <template>
-    <div class="app-container">
-      <!-- 主表信息录入 -->
-      <el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
-<!--       <el-form-item label="仓库" prop="warehouseId" required>-->
-<!--          <el-select v-model="formData.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="checkType" required>
-          <el-select v-model="formData.checkType" placeholder="请选择单据类型" clearable @change="handleCheckTypeChange">
+  <div class="app-container">
+    <!-- 主表信息录入 -->
+    <el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
+      <!--       <el-form-item label="仓库" prop="warehouseId" required>-->
+      <!--          <el-select v-model="formData.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="checkType" required>
+        <el-select v-model="formData.checkType" placeholder="请选择盘点类型" clearable @change="handleCheckTypeChange">
+          <el-option
+            v-for="dict in dict.type.check_stock_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">重置</el-button>
+        <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave"
+                   v-hasPermi="['check:stockCheck:saveBill']">保存单据
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <div class="mb8">
+      <el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['check:productAndStock:list']"
+                 @click="handleSelectMaterials">选择物资
+      </el-button>
+      <el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">重新建单</el-button>
+    </div>
+
+    <!-- 物资明细表格 -->
+    <el-table v-loading="loading" :data="materialList">
+      <el-table-column label="物资编号" align="left" prop="productId"/>
+      <el-table-column label="品名" align="left" prop="productName"/>
+      <el-table-column label="批号" align="left" prop="lotNo"/>
+      <el-table-column label="数量" align="right" prop="quantity"/>
+      <el-table-column label="仓库编号" align="left" prop="warehouseId"/>
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 选择物料物资弹窗 -->
+    <el-dialog title="选择物资" :visible.sync="materialDialogByProduct" width="800px" append-to-body>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="品号" prop="productId">
+          <el-input
+            v-model="queryParams.productId"
+            placeholder="请输入品号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="品名" prop="productName">
+          <el-input
+            v-model="queryParams.productName"
+            placeholder="请输入品名"
+            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="spare7">
+          <el-select v-model="queryParams.spare7" placeholder="请选择盘点状态" clearable>
             <el-option
-              v-for="dict in dict.type.check_stock_type"
+              v-for="dict in dict.type.check_status"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -23,602 +90,595 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">重置</el-button>
-          <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['check:stockCheck:saveBill']" >保存单据</el-button>
+          <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>
+          <el-button icon="info" size="mini" @click="resetPdRecordButton"
+                     v-hasPermi="['stock:management:resetPdRecord']">重置盘点记录
+          </el-button>
+
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="盘点状态" align="center" prop="spare7">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.check_status" :value="scope.row.spare7"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="品号" align="center" prop="productId"/>
+        <el-table-column label="NC号" align="center" prop="spare9"/>
+        <el-table-column label="品名" align="center" prop="productName"/>
+        <el-table-column label="数量" align="center" prop="quantity"/>
+        <el-table-column label="规格" align="center" prop="spec"/>
+        <el-table-column label="品号描述" align="center" prop="price"/>
+        <el-table-column label="英文描述" align="center" prop="cargoNo"/>
+        <el-table-column label="图号" align="center" prop="unit"/>
+        <el-table-column label="电压" align="center" prop="spare5"/>
+        <el-table-column label="电源线" align="center" prop="spare10"/>
+        <el-table-column label="插头" align="center" prop="spare11"/>
+        <el-table-column label="接嘴" align="center" prop="spare12"/>
+        <el-table-column label="快捷码" align="center" prop="spare13"/>
+        <el-table-column label="库存单位编号" align="center" prop="spare14"/>
+        <el-table-column label="库存单位名称" align="center" prop="spare15"/>
+        <el-table-column label="品号群组" align="center" prop="spare16"/>
+        <el-table-column label="归类品" align="center" prop="spare17"/>
+        <el-table-column label="计量体系" align="center" prop="spare18"/>
+        <el-table-column label="群组名称" align="center" prop="spare19"/>
+        <el-table-column label="批号管理" align="center" prop="spare20"/>
+        <el-table-column label="状态" align="center" prop="spare21"/>
+        <el-table-column label="产品大类" align="center" prop="spare22"/>
+        <el-table-column label="产品二类" align="center" prop="spare23"/>
+        <el-table-column label="产品线/产品系列" align="center" prop="spare24"/>
+        <el-table-column label="BOM状态" align="center" prop="spare25"/>
+        <el-table-column label="产品定位" align="center" prop="spare26"/>
+        <el-table-column label="电脑板型号" align="center" prop="spare27"/>
+        <el-table-column label="非标要求" align="center" prop="spare28"/>
+        <el-table-column label="品牌" align="center" prop="spare29"/>
+        <el-table-column label="非标颜色" align="center" prop="spare30"/>
+        <el-table-column label="主颜色" align="center" prop="spare31"/>
+        <el-table-column label="辅助颜色" align="center" prop="spare32"/>
+        <el-table-column label="是否标准款" align="center" prop="spare33"/>
+        <el-table-column label="包装方式" align="center" prop="spare34"/>
+        <el-table-column label="主要包装方式" align="center" prop="spare35"/>
+        <el-table-column label="描述" align="center" prop="remark"/>
+        <el-table-column label="长" align="center" prop="spare36"/>
+        <el-table-column label="宽" align="center" prop="spare37"/>
+        <el-table-column label="高" align="center" prop="spare38"/>
+        <el-table-column label="包装材积" align="center" prop="spare39"/>
+      </el-table>
+
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getMaterialList"
+      />
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelectMaterials">确定</el-button>
+        <el-button @click="cancelSelectMaterials">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 选择托盘弹窗 -->
+    <el-dialog title="选择货位" :visible.sync="materialDialogByTrayCode" width="800px" append-to-body>
+      <el-form :model="trayQueryParams" ref="trayQueryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="品号" prop="productId">
+          <el-input
+            v-model="trayQueryParams.productId"
+            placeholder="请输入品号"
+            clearable
+            @keyup.enter.native="handleTrayQuery"
+          />
+        </el-form-item>
+        <el-form-item label="序列号" prop="trayCode">
+          <el-input
+            v-model="trayQueryParams.trayCode"
+            placeholder="请输入序列号"
+            clearable
+            @keyup.enter.native="handleTrayQuery"
+          />
+        </el-form-item>
+        <el-form-item label="货位-排" prop="thePlatoon">
+          <el-input
+            v-model="trayQueryParams.thePlatoon"
+            placeholder="请输入货位-排"
+            clearable
+            @keyup.enter.native="handleTrayQuery"
+          />
+        </el-form-item>
+        <el-form-item label="货位-列" prop="theColumn">
+          <el-input
+            v-model="trayQueryParams.theColumn"
+            placeholder="请输入货位-列"
+            clearable
+            @keyup.enter.native="handleTrayQuery"
+          />
+        </el-form-item>
+        <el-form-item label="货位-层" prop="theFloor">
+          <el-input
+            v-model="trayQueryParams.theFloor"
+            placeholder="请输入货位-层"
+            clearable
+            @keyup.enter.native="handleTrayQuery"
+          />
+        </el-form-item>
+        <el-form-item label="盘点状态" prop="spare7">
+          <el-select v-model="queryParams.spare7" placeholder="请选择盘点状态" clearable>
+            <el-option
+              v-for="dict in dict.type.check_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleTrayQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetTrayQuery">重置</el-button>
+          <el-button icon="info" size="mini" @click="resetPdRecordButton"
+                     v-hasPermi="['stock:management:resetPdRecord']">重置盘点记录
+          </el-button>
+
         </el-form-item>
       </el-form>
 
-      <div class="mb8">
-        <el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['check:productAndStock:list']" @click="handleSelectMaterials"  >选择物资</el-button>
-        <el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">重新建单</el-button>
-      </div>
-
-      <!-- 物资明细表格 -->
-      <el-table v-loading="loading" :data="materialList">
-        <el-table-column label="物资编号" align="left" prop="productId" />
-        <el-table-column label="物资名称" align="left" prop="productName" />
-        <el-table-column label="批号" align="left" prop="lotNo"/>
-        <el-table-column label="数量" align="right" prop="quantity" />
-        <el-table-column label="仓库名称" align="left" prop="warehouseName" />
-        <el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table v-loading="trayLoading" :data="trayOptions" @selection-change="handleTraySelectionChange"
+                @row-click="handleRowClick">
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="盘点状态" align="center" prop="spare7">
           <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">删除</el-button>
+            <dict-tag :options="dict.type.check_status" :value="scope.row.spare7"/>
           </template>
         </el-table-column>
+        <el-table-column label="品号" align="left" prop="productId"/>
+        <el-table-column label="品名" align="left" prop="productName"/>
+        <el-table-column label="批号" align="left" prop="lotNo"/>
+        <el-table-column label="序列号" align="left" prop="spare6"/>
+        <el-table-column label="托盘编码" align="left" prop="trayCode"/>
+        <el-table-column label="货位名称" align="left" prop="cargoSpaceName"/>
+        <el-table-column label="数量" align="left" prop="quantity"/>
+        <el-table-column label="仓库" align="left" prop="warehouseId"/>
       </el-table>
 
-      <!-- 选择物料物资弹窗 -->
-      <el-dialog title="选择物资" :visible.sync="materialDialogByProduct" width="800px" append-to-body>
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-          <el-form-item label="物资编码" prop="productId">
-            <el-input
-              v-model="queryParams.productId"
-              placeholder="请输入物资编码"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="物资名称" prop="productName">
-            <el-input
-              v-model="queryParams.productName"
-              placeholder="请输入物资名称"
-              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>
-            <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>
-            <el-button icon="info" size="mini" @click="resetPdRecordButton" v-hasPermi="['stock:management:resetPdRecord']">重置盘点记录</el-button>
+      <pagination
+        v-show="trayTotal > 0"
+        :total="trayTotal"
+        :page.sync="trayQueryParams.pageNum"
+        :limit.sync="trayQueryParams.pageSize"
+        @pagination="getMaterialByTrayCodeList"
+      />
 
-          </el-form-item>
-        </el-form>
-
-        <el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="品号" align="center" prop="productId" />
-          <el-table-column label="NC号" align="center" prop="spare9" />
-          <el-table-column label="品名" align="center" prop="productName" />
-          <el-table-column label="数量" align="center" prop="quantity" />
-
-          <el-table-column label="规格" align="center" prop="spec" />
-          <el-table-column label="品号描述" align="center" prop="price" />
-          <el-table-column label="英文描述" align="center" prop="cargoNo" />
-          <el-table-column label="图号" align="center" prop="unit" />
-          <el-table-column label="电压" align="center" prop="spare5" />
-          <el-table-column label="电源线" align="center" prop="spare10" />
-          <el-table-column label="插头" align="center" prop="spare11" />
-          <el-table-column label="接嘴" align="center" prop="spare12" />
-          <el-table-column label="快捷码" align="center" prop="spare13" />
-          <el-table-column label="库存单位编号" align="center" prop="spare14" />
-          <el-table-column label="库存单位名称" align="center" prop="spare15" />
-          <el-table-column label="品号群组" align="center" prop="spare16" />
-          <el-table-column label="归类品" align="center" prop="spare17" />
-          <el-table-column label="计量体系" align="center" prop="spare18" />
-          <el-table-column label="群组名称" align="center" prop="spare19" />
-          <el-table-column label="批号管理" align="center" prop="spare20" />
-          <el-table-column label="状态" align="center" prop="spare21" />
-          <el-table-column label="产品大类" align="center" prop="spare22" />
-          <el-table-column label="产品二类" align="center" prop="spare23" />
-          <el-table-column label="产品线/产品系列" align="center" prop="spare24" />
-          <el-table-column label="BOM状态" align="center" prop="spare25" />
-          <el-table-column label="产品定位" align="center" prop="spare26" />
-          <el-table-column label="电脑板型号" align="center" prop="spare27" />
-          <el-table-column label="非标要求" align="center" prop="spare28" />
-          <el-table-column label="品牌" align="center" prop="spare29" />
-          <el-table-column label="非标颜色" align="center" prop="spare30" />
-          <el-table-column label="主颜色" align="center" prop="spare31" />
-          <el-table-column label="辅助颜色" align="center" prop="spare32" />
-          <el-table-column label="是否标准款" align="center" prop="spare33" />
-          <el-table-column label="包装方式" align="center" prop="spare34" />
-          <el-table-column label="主要包装方式" align="center" prop="spare35" />
-          <el-table-column label="描述" align="center" prop="remark" />
-          <el-table-column label="长" align="center" prop="spare36" />
-          <el-table-column label="宽" align="center" prop="spare37" />
-          <el-table-column label="高" align="center" prop="spare38" />
-          <el-table-column label="包装材积" align="center" prop="spare39" />
+      <!-- 托盘详情弹窗 -->
+      <el-dialog
+        title="托盘详情"
+        :visible.sync="trayDetailVisible"
+        width="600px"
+        append-to-body
+      >
+        <el-table :data="trayDetailList">
+          <el-table-column label="品号" align="center" prop="productId"/>
+          <el-table-column label="NC号" align="center" prop="spare9"/>
+          <el-table-column label="品名" align="center" prop="productName"/>
+          <el-table-column label="数量" align="center" prop="quantity"/>
+          <el-table-column label="规格" align="center" prop="spec"/>
+          <el-table-column label="品号描述" align="center" prop="price"/>
+          <el-table-column label="英文描述" align="center" prop="cargoNo"/>
+          <el-table-column label="图号" align="center" prop="unit"/>
+          <el-table-column label="电压" align="center" prop="spare5"/>
+          <el-table-column label="电源线" align="center" prop="spare10"/>
+          <el-table-column label="插头" align="center" prop="spare11"/>
+          <el-table-column label="接嘴" align="center" prop="spare12"/>
+          <el-table-column label="快捷码" align="center" prop="spare13"/>
+          <el-table-column label="库存单位编号" align="center" prop="spare14"/>
+          <el-table-column label="库存单位名称" align="center" prop="spare15"/>
+          <el-table-column label="品号群组" align="center" prop="spare16"/>
+          <el-table-column label="归类品" align="center" prop="spare17"/>
+          <el-table-column label="计量体系" align="center" prop="spare18"/>
+          <el-table-column label="群组名称" align="center" prop="spare19"/>
+          <el-table-column label="批号管理" align="center" prop="spare20"/>
+          <el-table-column label="状态" align="center" prop="spare21"/>
+          <el-table-column label="产品大类" align="center" prop="spare22"/>
+          <el-table-column label="产品二类" align="center" prop="spare23"/>
+          <el-table-column label="产品线/产品系列" align="center" prop="spare24"/>
+          <el-table-column label="BOM状态" align="center" prop="spare25"/>
+          <el-table-column label="产品定位" align="center" prop="spare26"/>
+          <el-table-column label="电脑板型号" align="center" prop="spare27"/>
+          <el-table-column label="非标要求" align="center" prop="spare28"/>
+          <el-table-column label="品牌" align="center" prop="spare29"/>
+          <el-table-column label="非标颜色" align="center" prop="spare30"/>
+          <el-table-column label="主颜色" align="center" prop="spare31"/>
+          <el-table-column label="辅助颜色" align="center" prop="spare32"/>
+          <el-table-column label="是否标准款" align="center" prop="spare33"/>
+          <el-table-column label="包装方式" align="center" prop="spare34"/>
+          <el-table-column label="主要包装方式" align="center" prop="spare35"/>
+          <el-table-column label="描述" align="center" prop="remark"/>
+          <el-table-column label="长" align="center" prop="spare36"/>
+          <el-table-column label="宽" align="center" prop="spare37"/>
+          <el-table-column label="高" align="center" prop="spare38"/>
+          <el-table-column label="包装材积" align="center" prop="spare39"/>
         </el-table>
-
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getMaterialList"
-        />
-
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="confirmSelectMaterials">确定</el-button>
-          <el-button @click="cancelSelectMaterials">取消</el-button>
+          <el-button @click="trayDetailVisible = false">关闭</el-button>
         </div>
       </el-dialog>
 
-      <!-- 选择托盘弹窗 -->
-      <el-dialog title="选择货位" :visible.sync="materialDialogByTrayCode" width="800px" append-to-body>
-        <el-form :model="trayQueryParams" ref="trayQueryForm" size="small" :inline="true" label-width="68px">
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelectMaterials">确定</el-button>
+        <el-button @click="cancelSelectMaterials">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
 
-          <el-form-item label="货位名称" prop="cargoSpaceName">
-            <el-input
-              v-model="trayQueryParams.cargoSpaceName"
-              placeholder="请输入货位名称"
-              clearable
-              @keyup.enter.native="handleTrayQuery"
-            />
-          </el-form-item>
-          <el-form-item label="托盘编码" prop="trayCode">
-            <el-input
-              v-model="trayQueryParams.trayCode"
-              placeholder="请输入托盘编码"
-              clearable
-              @keyup.enter.native="handleTrayQuery"
-            />
-          </el-form-item>
+<script>
+import {listWarehouse} from "@/api/bas/warehouse";
+import {saveCheckStock} from "@/api/check/stockCheck";
+import {listManagement, listProductAndStockPd, resetPdRecord} from "@/api/stock/management"
+import {listCargoSpaceByRoadway} from "@/api/bas/cargoSpace"
 
-          <el-form-item label="物资名称" prop="productName">
-            <el-input
-              v-model="trayQueryParams.productName"
-              placeholder="请输入物资名称"
-              clearable
-              @keyup.enter.native="handleTrayQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleTrayQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetTrayQuery">重置</el-button>
-            <el-button icon="info" size="mini" @click="resetPdRecordButton" v-hasPermi="['stock:management:resetPdRecord']">重置盘点记录</el-button>
-
-          </el-form-item>
-        </el-form>
-
-        <el-table v-loading="trayLoading" :data="trayOptions" @selection-change="handleTraySelectionChange" @row-click="handleRowClick">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="托盘编码" align="left" prop="trayCode" />
-          <el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
-          <el-table-column label="仓库" align="left" prop="warehouseName" />
-        </el-table>
-
-        <pagination
-          v-show="trayTotal > 0"
-          :total="trayTotal"
-          :page.sync="trayQueryParams.pageNum"
-          :limit.sync="trayQueryParams.pageSize"
-          @pagination="getMaterialByTrayCodeList"
-        />
-
-        <!-- 托盘详情弹窗 -->
-        <el-dialog
-          title="托盘详情"
-          :visible.sync="trayDetailVisible"
-          width="600px"
-          append-to-body
-        >
-          <el-table :data="trayDetailList">
-            <el-table-column label="品号" align="center" prop="productId" />
-            <el-table-column label="NC号" align="center" prop="spare9" />
-            <el-table-column label="品名" align="center" prop="productName" />
-            <el-table-column label="数量" align="center" prop="quantity" />
-
-            <el-table-column label="规格" align="center" prop="spec" />
-            <el-table-column label="品号描述" align="center" prop="price" />
-            <el-table-column label="英文描述" align="center" prop="cargoNo" />
-            <el-table-column label="图号" align="center" prop="unit" />
-            <el-table-column label="电压" align="center" prop="spare5" />
-            <el-table-column label="电源线" align="center" prop="spare10" />
-            <el-table-column label="插头" align="center" prop="spare11" />
-            <el-table-column label="接嘴" align="center" prop="spare12" />
-            <el-table-column label="快捷码" align="center" prop="spare13" />
-            <el-table-column label="库存单位编号" align="center" prop="spare14" />
-            <el-table-column label="库存单位名称" align="center" prop="spare15" />
-            <el-table-column label="品号群组" align="center" prop="spare16" />
-            <el-table-column label="归类品" align="center" prop="spare17" />
-            <el-table-column label="计量体系" align="center" prop="spare18" />
-            <el-table-column label="群组名称" align="center" prop="spare19" />
-            <el-table-column label="批号管理" align="center" prop="spare20" />
-            <el-table-column label="状态" align="center" prop="spare21" />
-            <el-table-column label="产品大类" align="center" prop="spare22" />
-            <el-table-column label="产品二类" align="center" prop="spare23" />
-            <el-table-column label="产品线/产品系列" align="center" prop="spare24" />
-            <el-table-column label="BOM状态" align="center" prop="spare25" />
-            <el-table-column label="产品定位" align="center" prop="spare26" />
-            <el-table-column label="电脑板型号" align="center" prop="spare27" />
-            <el-table-column label="非标要求" align="center" prop="spare28" />
-            <el-table-column label="品牌" align="center" prop="spare29" />
-            <el-table-column label="非标颜色" align="center" prop="spare30" />
-            <el-table-column label="主颜色" align="center" prop="spare31" />
-            <el-table-column label="辅助颜色" align="center" prop="spare32" />
-            <el-table-column label="是否标准款" align="center" prop="spare33" />
-            <el-table-column label="包装方式" align="center" prop="spare34" />
-            <el-table-column label="主要包装方式" align="center" prop="spare35" />
-            <el-table-column label="描述" align="center" prop="remark" />
-            <el-table-column label="长" align="center" prop="spare36" />
-            <el-table-column label="宽" align="center" prop="spare37" />
-            <el-table-column label="高" align="center" prop="spare38" />
-            <el-table-column label="包装材积" align="center" prop="spare39" />
-          </el-table>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="trayDetailVisible = false">关闭</el-button>
-          </div>
-        </el-dialog>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="confirmSelectMaterials">确定</el-button>
-          <el-button @click="cancelSelectMaterials">取消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </template>
-
-  <script>
-  import {listWarehouse} from "@/api/bas/warehouse";
-  import {saveCheckStock} from "@/api/check/stockCheck";
-  import {listManagement,listProductAndStockPd,resetPdRecord} from "@/api/stock/management"
-  import {listCargoSpaceByRoadway} from "@/api/bas/cargoSpace"
-
-  export default {
-    name: "AddOutStock",
-    dicts: ['check_stock_type', 'bill_status'],
-    data() {
-      return {
-        // 上一次选择的单据类型
-        oldCheckType: null,
-        // 遮罩层
-        loading: false,
-        materialLoading: false,
-        trayLoading: false,
-        // 总条数
-        total: 0,
-        // 托盘总条数
-        trayTotal: 0,
-        // 表单验证规则
-        rules: {
-          warehouseId: [
-            { required: true, message: '请选择仓库', trigger: "change" }
-          ],
-          checkType: [
-            { required: true, message: '请选择单据类型', trigger: "change" }
-          ]
-        },
-        // 主表数据
-        formData: {
-          warehouseId: "01",
-          customerNo: null,
-          checkType: null
-        },
-        // 仓库选项
-        warehouseOptions: [],
-        // 物资明细列表
-        materialList: [],
-        // 选择物资弹窗
-        materialDialogByProduct: false,
-        materialDialogByTrayCode: false,
-        // 物资选择列表
-        materialOptions: [],
-        // 托盘选择列表
-        trayOptions: [],
-        // 已选择的物资
-        selectedMaterials: [],
-        // 已选择的托盘
-        selectedTrays: [],
-        // 物资查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          onlyIdentity: null,
-          productId: null,
-          lotNo: null,
-          productName: null,
-          quantity: null,
-          warehouseId: null,
-          spare7: 0
-        },
-        // 托盘查询参数
-        trayQueryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          trayCode: null,
-          productName: null,
-          cargoSpaceName: null,
-          warehouseId: null,
-          status: null,
-          locked:null
-        },
-        // 托盘详情弹窗显示状态
-        trayDetailVisible: false,
-        // 托盘详情列表
-        trayDetailList: []
-        }
-    },
-    created() {
-      this.getWarehouseOptions();
-    },
-    methods: {
-      /** 获取仓库选项 */
-      getWarehouseOptions() {
-        var param = {
-          pageNum:1,
-          pageSize:99,
-          typeData:['1','2']
-        }
-        listWarehouse(param).then(response => {
-          this.warehouseOptions = response.rows;
-        });
+export default {
+  name: "AddOutStock",
+  dicts: ['check_stock_type', 'bill_status', 'check_status'],
+  data() {
+    return {
+      // 上一次选择的单据类型
+      oldCheckType: null,
+      // 遮罩层
+      loading: false,
+      materialLoading: false,
+      trayLoading: false,
+      // 总条数
+      total: 0,
+      // 托盘总条数
+      trayTotal: 0,
+      // 表单验证规则
+      rules: {
+        warehouseId: [
+          {required: true, message: '请选择仓库', trigger: "change"}
+        ],
+        checkType: [
+          {required: true, message: '请选择单据类型', trigger: "change"}
+        ]
       },
-      /** 打开选择物资弹窗 */
-      handleSelectMaterials() {
-        // if (!this.formData.warehouseId) {
-        //   this.$modal.msgError('请选择仓库');
-        //   return;
-        // }
-        if (!this.formData.checkType){
-          this.$modal.msgError('请选择单据类型');
-          return;
-        }
-        if (this.formData.checkType==='1'){
-          this.materialDialogByProduct = true;
-          // 设置查询参数中的仓库ID为主表选择的仓库
-          this.queryParams.warehouseId = "01";
-          this.getMaterialList();
-        }else if (this.formData.checkType==='2'){
-          this.materialDialogByTrayCode = true;
-          // 设置查询参数中的仓库ID为主表选择的仓库
-          this.queryParams.warehouseId = "01";
-          this.getMaterialByTrayCodeList();
-        }
+      // 主表数据
+      formData: {
+        warehouseId: "01",
+        customerNo: null,
+        checkType: null
       },
-      /** 获取物资列表 */
-      getMaterialList() {
-        this.materialLoading = true;
-        if (this.formData.checkType==='1'){
-          listProductAndStockPd(this.queryParams).then(response => {
-            this.materialOptions = response.rows;
-            this.total = response.total;
-            this.materialLoading = false;
-          });
-        }
+      // 仓库选项
+      warehouseOptions: [],
+      // 物资明细列表
+      materialList: [],
+      // 选择物资弹窗
+      materialDialogByProduct: false,
+      materialDialogByTrayCode: false,
+      // 物资选择列表
+      materialOptions: [],
+      // 托盘选择列表
+      trayOptions: [],
+      // 已选择的物资
+      selectedMaterials: [],
+      // 已选择的托盘
+      selectedTrays: [],
+      // 物资查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        onlyIdentity: null,
+        productId: null,
+        lotNo: null,
+        productName: null,
+        quantity: null,
+        warehouseId: null,
+        spare7: null,
       },
-      /* 获取托盘物资列表*/
-      getMaterialByTrayCodeList(){
-        this.trayLoading = true;
-        if (this.formData.checkType==='2'){
-          this.trayQueryParams.warehouseId = "01";
-          this.trayQueryParams.status = 2;
-          this.trayQueryParams.locked='N';
-          this.trayQueryParams.spare7='0';
-          this.trayQueryParams.stockStatus = 1;
-
-          listCargoSpaceByRoadway(this.trayQueryParams).then(response => {
-            this.trayOptions = response.rows;
-            this.trayTotal = response.total;
-            this.trayLoading = false;
-          });
-        }
-      },
-      /** 物资选择变更 */
-      handleSelectionChange(selection) {
-        this.selectedMaterials = selection;
-      },
-      /** 托盘选择变更 */
-      handleTraySelectionChange(selection) {
-        this.selectedTrays = selection;
-      },
-      /** 托盘行点击事件 */
-      handleRowClick(row) {
-        if (this.formData.checkType === '2' && row.trayCode) {
-          const params = {
-            pageNum: 1,
-            pageSize: 10,
-            trayCode: row.trayCode,
-            warehouseId: this.formData.warehouseId
-          };
-          listManagement(params).then(response => {
-            this.trayDetailList = response.rows;
-            this.trayDetailVisible = true;
-          });
-        }
-      },
-      /** 确认选择物资 */
-      confirmSelectMaterials() {
-        if (this.formData.checkType === '1') {
-          this.confirmSelectMaterialsByProduct();
-        } else if (this.formData.checkType === '2') {
-          this.confirmSelectMaterialsByTray();
-        }
-      },
-      /** 确认选择物料物资 */
-      confirmSelectMaterialsByProduct() {
-        if (this.selectedMaterials.length === 0) {
-          this.$modal.msgError('请选择物资');
-          return;
-        }
-        // 过滤掉已经存在的物资
-        const newMaterials = this.selectedMaterials.filter(item => {
-          return !this.materialList.some(existing => existing.onlyIdentity === item.onlyIdentity);
-        });
-
-        if (newMaterials.length === 0) {
-          this.$modal.msgWarning('选择的物资已存在');
-          return;
-        }
-
-        this.materialList = this.materialList.concat(
-          newMaterials.map(item => ({
-            productId: item.productId,
-            productGuId: item.productGuid,
-            productName: item.productName,
-            quantity: item.quantity,
-            lotNo: item.lotNo,
-            onlyIdentity: item.onlyIdentity,
-            warehouseId: item.warehouseId,
-            warehouseName: item.warehouseName,
-            cargoSpaceId: item.cargoSpaceId,
-            cargoSpaceName: item.cargoSpaceName,
-            spec: item.spare1,
-            // spare3: item.spare3,
-            spare1: item.spare4,
-            spare3: item.spare5,
-            spare4: item.spare6,
-            spare5: item.voltage,
-            spare6: item.power,
-            spare7: item.phase,
-            spare2: item.netWeight,
-            spare8: item.grossWeight,
-            spare9: item.distribution,
-            unit: item.model,
-            orderId: item.orderId
-          }))
-        );
-        this.materialDialogByProduct = false;
-        this.selectedMaterials = [];
-      },
-      /** 确认选择托盘物资 */
-      confirmSelectMaterialsByTray() {
-        if (this.selectedTrays.length === 0) {
-          this.$modal.msgError('请选择托盘');
-          return;
-        }
-        // 过滤掉已经存在的托盘
-        const newTrays = this.selectedTrays.filter(item => {
-          return !this.materialList.some(existing => existing.trayCode === item.trayCode);
-        });
-
-        if (newTrays.length === 0) {
-          this.$modal.msgWarning('选择的托盘已存在');
-          return;
-        }
-
-        this.materialList = this.materialList.concat(
-          newTrays.map(item => ({
-            trayCode: item.trayCode,
-            warehouseId: item.warehouseId,
-            warehouseName: item.warehouseName,
-            cargoSpaceId: item.cargoSpaceId,
-            cargoSpaceName: item.cargoSpaceName,
-            spec: item.spare1,
-            // spare3: item.spare3,
-            spare1: item.spare4,
-            spare3: item.spare5,
-            spare4: item.spare6,
-            spare5: item.voltage,
-            spare6: item.power,
-            spare7: item.phase,
-            spare2: item.netWeight,
-            spare8: item.grossWeight,
-            spare9: item.distribution,
-            unit: item.model,
-            // orderId: item.orderId
-          }))
-        );
-        this.materialDialogByTrayCode = false;
-        this.selectedTrays = [];
-      },
-      /** 取消选择物资 */
-      cancelSelectMaterials() {
-        if (this.formData.checkType === '1') {
-          this.cancelSelectMaterialsByProduct();
-        } else if (this.formData.checkType === '2') {
-          this.cancelSelectMaterialsByTray();
-        }
-      },
-      /** 取消选择物料物资 */
-      cancelSelectMaterialsByProduct() {
-        this.selectedMaterials = [];
-        this.materialDialogByProduct = false;
-      },
-      /** 取消选择托盘物资 */
-      cancelSelectMaterialsByTray() {
-        this.selectedTrays = [];
-        this.materialDialogByTrayCode = false;
-      },
-      /** 物资搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getMaterialList();
-      },
-      /** 物资重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      /** 托盘搜索按钮操作 */
-      handleTrayQuery() {
-        this.trayQueryParams.pageNum = 1;
-        this.getMaterialByTrayCodeList();
-      },
-      /** 托盘重置按钮操作 */
-      resetTrayQuery() {
-        this.resetForm("trayQueryForm");
-        this.handleTrayQuery();
-      },
-      /** 重置重置按钮操作 */
-      resetPdRecordButton() {
-        resetPdRecord().then(response => {
-          this.$modal.msgSuccess('重置成功');
-          this.handleQuery();
-        })
-      },
-      /** 删除物资 */
-      handleDelete(index) {
-        this.materialList.splice(index, 1);
-      },
-      /** 保存单据 */
-      handleSave() {
-        this.$refs.formRef.validate(valid => {
-          if (valid) {
-            if (this.materialList.length === 0) {
-              this.$modal.msgError('请选择物资');
-              return;
-            }
-            const data = {
-              checkStockin: this.formData,
-              detailList: this.materialList
-            };
-            console.log(data)
-            // 这里需要调用保存接口
-            saveCheckStock(data).then(response => {
-
-              this.$modal.msgSuccess('保存成功：' + response.msg);
-              this.$tab.refreshPage(this.$route);
-              // this.reset();
-            });
-          }
-        });
-      },
-      /** 单据类型变更处理 */
-      handleCheckTypeChange(value) {
-        if (this.materialList.length > 0) {
-          this.$modal.msgWarning('已添加物资，不能更改单据类型');
-          this.$nextTick(() => {
-            this.formData.checkType = this.oldCheckType;
-          });
-          return;
-        }
-        this.oldCheckType = value;
-      },
-      /** 重置数据 */
-      reset() {
-        this.formData = {
-          warehouseId: null,
-          customerNo: null,
-          outType: null
-        };
-        this.materialList = [];
-      },
-      /** 重新建单 */
-      handleReload() {
-        this.$tab.refreshPage(this.$route);
+      // 托盘查询参数
+      trayQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        trayCode: null,
+        productId: null,
+        thePlatoon: null,
+        theColumn: null,
+        theFloor: null,
+        warehouseId: null,
+        status: null,
+        locked: null,
+        spare7: null
       },
+      // 托盘详情弹窗显示状态
+      trayDetailVisible: false,
+      // 托盘详情列表
+      trayDetailList: []
     }
-  };
-  </script>
+  },
+  created() {
+    this.getWarehouseOptions();
+  },
+  methods: {
+    /** 获取仓库选项 */
+    getWarehouseOptions() {
+      var param = {
+        pageNum: 1,
+        pageSize: 99,
+        typeData: ['1', '2']
+      }
+      listWarehouse(param).then(response => {
+        this.warehouseOptions = response.rows;
+      });
+    },
+    /** 打开选择物资弹窗 */
+    handleSelectMaterials() {
+      // if (!this.formData.warehouseId) {
+      //   this.$modal.msgError('请选择仓库');
+      //   return;
+      // }
+      if (!this.formData.checkType) {
+        this.$modal.msgError('请选择单据类型');
+        return;
+      }
+      if (this.formData.checkType === '1') {
+        this.materialDialogByProduct = true;
+        // 设置查询参数中的仓库ID为主表选择的仓库
+        this.queryParams.warehouseId = "01";
+        this.getMaterialList();
+      } else if (this.formData.checkType === '2') {
+        this.materialDialogByTrayCode = true;
+        // 设置查询参数中的仓库ID为主表选择的仓库
+        this.queryParams.warehouseId = "01";
+        this.getMaterialByTrayCodeList();
+      }
+    },
+    /** 获取物资列表 */
+    getMaterialList() {
+      this.materialLoading = true;
+      if (this.formData.checkType === '1') {
+        listProductAndStockPd(this.queryParams).then(response => {
+          this.materialOptions = response.rows;
+          this.total = response.total;
+          this.materialLoading = false;
+        });
+      }
+    },
+    /* 获取托盘物资列表*/
+    getMaterialByTrayCodeList() {
+      this.trayLoading = true;
+      if (this.formData.checkType === '2') {
+        this.trayQueryParams.warehouseId = "01";
+        this.trayQueryParams.status = 2;
+        this.trayQueryParams.locked = 'N';
+
+        listCargoSpaceByRoadway(this.trayQueryParams).then(response => {
+          this.trayOptions = response.rows;
+          this.trayTotal = response.total;
+          this.trayLoading = false;
+        });
+      }
+    },
+    /** 物资选择变更 */
+    handleSelectionChange(selection) {
+      this.selectedMaterials = selection;
+    },
+    /** 托盘选择变更 */
+    handleTraySelectionChange(selection) {
+      this.selectedTrays = selection;
+    },
+    /** 托盘行点击事件 */
+    handleRowClick(row) {
+      if (this.formData.checkType === '2' && row.trayCode) {
+        const params = {
+          pageNum: 1,
+          pageSize: 10,
+          trayCode: row.trayCode,
+          warehouseId: this.formData.warehouseId
+        };
+        listManagement(params).then(response => {
+          this.trayDetailList = response.rows;
+          this.trayDetailVisible = true;
+        });
+      }
+    },
+    /** 确认选择物资 */
+    confirmSelectMaterials() {
+      if (this.formData.checkType === '1') {
+        this.confirmSelectMaterialsByProduct();
+      } else if (this.formData.checkType === '2') {
+        this.confirmSelectMaterialsByTray();
+      }
+    },
+    /** 确认选择物料物资 */
+    confirmSelectMaterialsByProduct() {
+      if (this.selectedMaterials.length === 0) {
+        this.$modal.msgError('请选择物资');
+        return;
+      }
+      // 过滤掉已经存在的物资
+      const newMaterials = this.selectedMaterials.filter(item => {
+        return !this.materialList.some(existing => existing.onlyIdentity === item.onlyIdentity);
+      });
+
+      if (newMaterials.length === 0) {
+        this.$modal.msgWarning('选择的物资已存在');
+        return;
+      }
+
+      this.materialList = this.materialList.concat(
+        newMaterials.map(item => ({
+          productId: item.productId,
+          productGuId: item.productGuid,
+          productName: item.productName,
+          quantity: item.quantity,
+          lotNo: item.lotNo,
+          onlyIdentity: item.onlyIdentity,
+          warehouseId: item.warehouseId,
+          cargoSpaceId: item.cargoSpaceId,
+          cargoSpaceName: item.cargoSpaceName,
+          spec: item.spare1,
+          // spare3: item.spare3,
+          spare1: item.spare4,
+          spare3: item.spare5,
+          spare4: item.spare6,
+          spare5: item.voltage,
+          spare6: item.power,
+          spare7: item.phase,
+          spare2: item.netWeight,
+          spare8: item.grossWeight,
+          spare9: item.distribution,
+          unit: item.model,
+          orderId: item.orderId
+        }))
+      );
+      this.materialDialogByProduct = false;
+      this.selectedMaterials = [];
+    },
+    /** 确认选择托盘物资 */
+    confirmSelectMaterialsByTray() {
+      if (this.selectedTrays.length === 0) {
+        this.$modal.msgError('请选择托盘');
+        return;
+      }
+      // 过滤掉已经存在的托盘
+      const newTrays = this.selectedTrays.filter(item => {
+        return !this.materialList.some(existing => existing.trayCode === item.trayCode);
+      });
+
+      if (newTrays.length === 0) {
+        this.$modal.msgWarning('选择的托盘已存在');
+        return;
+      }
+
+      this.materialList = this.materialList.concat(
+        newTrays.map(item => ({
+          productId: item.productId,
+          productGuId: item.productGuid,
+          productName: item.productName,
+          quantity: item.quantity,
+          lotNo: item.lotNo,
+          trayCode: item.trayCode,
+          warehouseId: item.warehouseId,
+          cargoSpaceId: item.cargoSpaceId,
+          cargoSpaceName: item.cargoSpaceName,
+          spec: item.spare1,
+          spare1: item.spare4,
+          spare3: item.spare5,
+          spare4: item.spare6,
+          spare5: item.voltage,
+          spare6: item.power,
+          spare7: item.phase,
+          spare2: item.netWeight,
+          spare8: item.grossWeight,
+          spare9: item.distribution,
+          unit: item.model,
+          // orderId: item.orderId
+        }))
+      );
+      this.materialDialogByTrayCode = false;
+      this.selectedTrays = [];
+    },
+    /** 取消选择物资 */
+    cancelSelectMaterials() {
+      if (this.formData.checkType === '1') {
+        this.cancelSelectMaterialsByProduct();
+      } else if (this.formData.checkType === '2') {
+        this.cancelSelectMaterialsByTray();
+      }
+    },
+    /** 取消选择物料物资 */
+    cancelSelectMaterialsByProduct() {
+      this.selectedMaterials = [];
+      this.materialDialogByProduct = false;
+    },
+    /** 取消选择托盘物资 */
+    cancelSelectMaterialsByTray() {
+      this.selectedTrays = [];
+      this.materialDialogByTrayCode = false;
+    },
+    /** 物资搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getMaterialList();
+    },
+    /** 物资重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 托盘搜索按钮操作 */
+    handleTrayQuery() {
+      this.trayQueryParams.pageNum = 1;
+      this.getMaterialByTrayCodeList();
+    },
+    /** 托盘重置按钮操作 */
+    resetTrayQuery() {
+      this.resetForm("trayQueryForm");
+      this.handleTrayQuery();
+    },
+    /** 重置重置按钮操作 */
+    resetPdRecordButton() {
+      resetPdRecord().then(response => {
+        this.$modal.msgSuccess('重置成功');
+        this.handleQuery();
+      })
+    },
+    /** 删除物资 */
+    handleDelete(index) {
+      this.materialList.splice(index, 1);
+    },
+    /** 保存单据 */
+    handleSave() {
+      this.$refs.formRef.validate(valid => {
+        if (valid) {
+          if (this.materialList.length === 0) {
+            this.$modal.msgError('请选择物资');
+            return;
+          }
+          const data = {
+            checkStockin: this.formData,
+            detailList: this.materialList
+          };
+          console.log(data)
+          // 这里需要调用保存接口
+          saveCheckStock(data).then(response => {
+
+            this.$modal.msgSuccess('保存成功：' + response.msg);
+            this.$tab.refreshPage(this.$route);
+            // this.reset();
+          });
+        }
+      });
+    },
+    /** 单据类型变更处理 */
+    handleCheckTypeChange(value) {
+      if (this.materialList.length > 0) {
+        this.$modal.msgWarning('已添加物资，不能更改单据类型');
+        this.$nextTick(() => {
+          this.formData.checkType = this.oldCheckType;
+        });
+        return;
+      }
+      this.oldCheckType = value;
+    },
+    /** 重置数据 */
+    reset() {
+      this.formData = {
+        warehouseId: null,
+        customerNo: null,
+        outType: null
+      };
+      this.materialList = [];
+    },
+    /** 重新建单 */
+    handleReload() {
+      this.$tab.refreshPage(this.$route);
+    },
+  }
+};
+</script>
 <style scoped>
 .el-form-item >>> .el-form-item__label {
   white-space: nowrap;
diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue
index b53e9bf..3f0d532 100644
--- a/ruoyi-ui/src/views/check/difference/index.vue
+++ b/ruoyi-ui/src/views/check/difference/index.vue
@@ -116,7 +116,7 @@
       <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="extraField.materialDesc"/>
+      <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" />
       <el-table-column label="新值" align="right" prop="newQuantity" />
diff --git a/ruoyi-ui/src/views/check/flat/index.vue b/ruoyi-ui/src/views/check/flat/index.vue
index 29ca584..5738c27 100644
--- a/ruoyi-ui/src/views/check/flat/index.vue
+++ b/ruoyi-ui/src/views/check/flat/index.vue
@@ -44,10 +44,10 @@
         />
       </el-form-item>
 
-      <el-form-item label="物料描述" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料描述"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -135,7 +135,7 @@
         </template>
       </el-table-column>
       <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.materialDesc" />
       <el-table-column label="英文描述" align="left" prop="extraField.englishDesc" />
       <el-table-column label="净重" align="right" prop="extraField.netWeight" />
       <el-table-column label="长" align="right" prop="extraField.length" />
@@ -188,8 +188,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="物料名称" prop="materialDesc">
-          <el-select v-model="addForm.extraField.productId" placeholder="请选择物料名称" clearable filterable>
+        <el-form-item label="品名" prop="materialDesc">
+          <el-select v-model="addForm.extraField.productId" placeholder="请选择品名" clearable filterable>
             <el-option
               v-for="item in productOptions"
               :key="item.productId"
@@ -217,8 +217,8 @@
         <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 />
+        <el-form-item label="品名" prop="materialDesc">
+          <el-input v-model="editForm.extraField.materialDesc" placeholder="请输入品名" disabled />
         </el-form-item>
         <el-form-item label="英文描述" prop="englishDesc">
           <el-input v-model="editForm.extraField.englishDesc" placeholder="请输入英文描述" disabled />
diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue
index 58799a8..f6e6ece 100644
--- a/ruoyi-ui/src/views/check/job/in/index.vue
+++ b/ruoyi-ui/src/views/check/job/in/index.vue
@@ -10,7 +10,7 @@
         />
       </el-form-item>-->
       <el-form-item label="任务状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择任务状态" >
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
           <el-option
             v-for="dict in dict.type.mydo_job_status"
             :key="dict.value"
@@ -27,75 +27,38 @@
           @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="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 label="订单号" prop="lineId">
+        <el-input
+          v-model="queryParams.lineId"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </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.check_in_job_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
+                        v-model="queryParams.startTime"
+                        type="datetime" style="width: 206px"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择开始时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结束时间" prop="finishTime">
         <el-date-picker clearable
-          v-model="queryParams.finishTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
+                        v-model="queryParams.finishTime"
+                        type="datetime" style="width: 206px"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="入口" prop="entranceId">
-        <el-input
-          v-model="queryParams.entranceId"
-          placeholder="请输入入口ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-<!--      <el-form-item label="仓库" prop="warehouseId">
-        <el-select
-          v-model="queryParams.warehouseId"
-          placeholder="请选择仓库"
-          clearable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in warehouseOptions"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId"
-          />
-        </el-select>
-      </el-form-item>-->
       <el-form-item>
         <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>
@@ -103,17 +66,6 @@
     </el-form>
 
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleCompletedManually({type: 'invalid'})"
-            v-hasPermi="['job:mydoJob:manualInvalidation']"
-          >手动作废</el-button>
-        </el-col>
         <el-col :span="1.5">
           <el-button
             type="success"
@@ -125,6 +77,17 @@
             v-hasPermi="['job:mydoJob:manualCompleted']"
           >手动完成</el-button>
         </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleCompletedManually({type: 'invalid'})"
+            v-hasPermi="['job:mydoJob:manualInvalidation']"
+          >手动作废</el-button>
+        </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
@@ -150,7 +113,7 @@
       </el-table-column>
 <!--      <el-table-column label="供应商" align="left" prop="supplierName" key="supplierId" value="supplierName" />-->
 <!--      <el-table-column label="部门" align="left" prop="departmentName" />-->
-<!--      <el-table-column label="托盘码" align="left" prop="trayCode" />-->
+      <el-table-column label="序列号" align="left" prop="trayCode" />
       <el-table-column label="货位" align="left" prop="cargoSpaceName"  width="160"/>
       <el-table-column label="订单号" align="left" prop="lineId" />
       <el-table-column label="入口" align="left" prop="entranceId" />
@@ -183,8 +146,8 @@
       <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
       <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
       <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
-      <el-table-column label="物料编码" align="left" prop="productId" />
-      <el-table-column label="物料名称" align="left" prop="productName" width="160"/>
+      <el-table-column label="品号" align="left" prop="productId" />
+      <el-table-column label="品名" align="left" prop="productName" width="160"/>
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -259,7 +222,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        status: '1',
+        status: null,
         onLineType: null,
         taskNo: null,
         supplierId: null,
diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue
index 0d470ca..fffd2f4 100644
--- a/ruoyi-ui/src/views/check/job/out/index.vue
+++ b/ruoyi-ui/src/views/check/job/out/index.vue
@@ -1,16 +1,16 @@
 <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>-->
+      <!--      <el-form-item label="任务ID" prop="jobId">
+              <el-input
+                v-model="queryParams.jobId"
+                placeholder="请输入任务ID"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>-->
       <el-form-item label="任务状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择任务状态">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
           <el-option
             v-for="dict in dict.type.mydo_job_status"
             :key="dict.value"
@@ -27,74 +27,38 @@
           @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="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 label="订单号" prop="lineId">
+        <el-input
+          v-model="queryParams.lineId"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </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.check_out_job_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
+                        v-model="queryParams.startTime"
+                        type="datetime" style="width: 206px"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择开始时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结束时间" prop="finishTime">
         <el-date-picker clearable
-          v-model="queryParams.finishTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
+                        v-model="queryParams.finishTime"
+                        type="datetime" style="width: 206px"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择结束时间">
         </el-date-picker>
       </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="仓库" prop="warehouseId">
-        <el-select
-          v-model="queryParams.warehouseId"
-          placeholder="请选择仓库"
-          clearable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in warehouseOptions"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId"
-          />
-        </el-select>
-      </el-form-item>-->
       <el-form-item>
         <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>
@@ -102,33 +66,34 @@
     </el-form>
 
 
-  <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          @click="handleCompletedManually({type: 'invalid'})"
-          v-hasPermi="['job:checkMydoJob:OuthandFinish']"
-        >{{$t('checkJobOut.manualInvalid')}}</el-button> &lt;!&ndash; 手动作废 &ndash;&gt;
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          @click="handleCompletedManually({type: 'completed'})"
-          v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
-        >{{$t('checkJobOut.manualFinish')}}</el-button> &lt;!&ndash; 手动完成 &ndash;&gt;
-      </el-col>-->
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">
+              <el-button
+                type="danger"
+                plain
+                icon="el-icon-edit"
+                size="mini"
+                @click="handleCompletedManually({type: 'invalid'})"
+                v-hasPermi="['job:checkMydoJob:OuthandFinish']"
+              >{{$t('checkJobOut.manualInvalid')}}</el-button> &lt;!&ndash; 手动作废 &ndash;&gt;
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="success"
+                plain
+                icon="el-icon-edit"
+                size="mini"
+                @click="handleCompletedManually({type: 'completed'})"
+                v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
+              >{{$t('checkJobOut.manualFinish')}}</el-button> &lt;!&ndash; 手动完成 &ndash;&gt;
+            </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务ID" align="left" prop="jobId" />
+    <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange"
+              @row-click="handleRowClick" max-height="400">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="任务ID" align="left" prop="jobId"/>
       <el-table-column label="任务状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -136,28 +101,27 @@
       </el-table-column>
 
 
-      <el-table-column label="任务号" align="left" prop="taskNo" />
+      <el-table-column label="任务号" align="left" prop="taskNo"/>
       <el-table-column label="任务类型" align="left" prop="inOrOut">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.check_out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="部门" align="left" prop="departmentName" />-->
-<!--      <el-table-column label="托盘码" align="left" prop="trayCode" />-->
-      <el-table-column label="货位" align="left" prop="cargoSpaceName" />
-      <el-table-column label="订单号" align="right" prop="lineId" />
-<!--      <el-table-column label="执行阶段" align="left" 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="left" prop="exitId" />
-
+      <!--      <el-table-column label="部门" align="left" prop="departmentName" />-->
+      <el-table-column label="序列号" align="left" prop="trayCode"/>
+      <el-table-column label="货位" align="left" prop="cargoSpaceName"/>
+      <el-table-column label="订单号" align="right" prop="lineId"/>
+      <!--      <el-table-column label="执行阶段" align="left" 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="left" prop="exitId"/>
       <el-table-column label="创建时间" align="left" prop="createTime" width="180">
       </el-table-column>
       <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="warehouseName" />-->
+      <!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
 
     </el-table>
 
@@ -170,14 +134,14 @@
     />
 
     <el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
-      <el-table-column label="任务ID" align="left" prop="jobId" width="160" />
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160" />
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
-      <el-table-column label="库存ID" align="left" prop="stockId" width="160" />
-      <el-table-column label="物料编码" align="left" prop="productId" />
-      <el-table-column label="物料名称" align="left" prop="productName" width="160" />
-      <el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
+      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160"/>
+      <el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
+      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
+      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
+      <el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
+      <el-table-column label="品号" align="left" prop="productId"/>
+      <el-table-column label="品名" align="left" prop="productName" width="160"/>
+      <el-table-column label="出库数量" align="right" prop="outQuantity"/> <!-- 出库数量 -->
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
       <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
@@ -204,8 +168,8 @@
 </template>
 
 <script>
-import { listMydoJobOut } from "@/api/job/OutmydoJob"
-import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
+import {listMydoJobOut} from "@/api/job/OutmydoJob"
+import {listMydoJobDetail} from "@/api/job/mydoJobDetail"
 import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
@@ -213,10 +177,10 @@ export default {
   dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status'],
   data() {
     return {
-      warehouseOptions:[],
+      warehouseOptions: [],
       // 遮罩层
       loading: true,
-      detailLoading:false,
+      detailLoading: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -231,9 +195,9 @@ export default {
       // 任务表表格数据
       mydoJobList: [],
       // 子任务表表格数据
-      mydoJobDetailList:[],
+      mydoJobDetailList: [],
       // 当前选中行
-      currentRow:null,
+      currentRow: null,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -243,7 +207,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        status: '1',
+        status: null,
         onLineType: null,
         taskNo: null,
         supplierId: null,
@@ -269,7 +233,7 @@ export default {
         faultFlag: null,
         inOut: '4'
       },
-      queryDetailParams:{
+      queryDetailParams: {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
@@ -280,13 +244,13 @@ export default {
       // 表单校验
       rules: {
         jobId: [
-          { required: true, message: '请输入任务ID', trigger: 'blur' }
+          {required: true, message: '请输入任务ID', trigger: 'blur'}
         ],
         status: [
-          { required: true, message: '请选择任务状态', trigger: 'change' }
+          {required: true, message: '请选择任务状态', trigger: 'change'}
         ],
         taskNo: [
-          { required: true, message: '请输入任务号', trigger: 'blur' }
+          {required: true, message: '请输入任务号', trigger: 'blur'}
         ],
       }
     }
@@ -316,7 +280,7 @@ export default {
         // 如果有数据，自动选中第一行
         if (this.mydoJobList.length > 0) {
           this.handleRowClick(this.mydoJobList[0]);
-        }else {
+        } else {
           this.mydoJobDetailList = []
           this.detailLoading = false
         }
@@ -388,7 +352,7 @@ export default {
         return;
       }
       this.ids = selection.map(item => item.jobId);
-      this.single = selection.length!==1;
+      this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
 
@@ -399,9 +363,9 @@ export default {
         this.$modal.msgError('请选择要操作的数据');
         return;
       }
-      if (row.type === 'invalid'){
+      if (row.type === 'invalid') {
         //手动作废
-      }else if (row.type === 'completed'){
+      } else if (row.type === 'completed') {
         //手动完成
       }
     },
@@ -444,12 +408,13 @@ export default {
         this.$modal.msgError('请选择要操作的数据');
         return;
       }
-      this.$modal.confirm('是否确认完成任务编号为"' + jobIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认完成任务编号为"' + jobIds + '"的数据项？').then(function () {
         return manualFinish(jobIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess('手动完成成功');
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 手动作废按钮操作 */
     handleManualInvalid(row) {
@@ -458,12 +423,13 @@ export default {
         this.$modal.msgError('请选择要操作的数据');
         return;
       }
-      this.$modal.confirm('是否确认作废任务编号为"' + jobIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认作废任务编号为"' + jobIds + '"的数据项？').then(function () {
         return manualInvalid(jobIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess('手动作废成功');
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
   }
 }
diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue
index f8e8beb..3f54530 100644
--- a/ruoyi-ui/src/views/check/stockCheck/index.vue
+++ b/ruoyi-ui/src/views/check/stockCheck/index.vue
@@ -4,13 +4,13 @@
       <el-form-item label="盘点单据" prop="stockCheckId">
         <el-input
           v-model="queryParams.stockCheckId"
-          placeholder="请输入盘点单据"
+          placeholder="请输入盘点单据号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="盘库类型" prop="checkType">
-        <el-select v-model="queryParams.checkType" placeholder="请选择盘库类型" clearable>
+      <el-form-item label="盘点类型" prop="checkType">
+        <el-select v-model="queryParams.checkType" placeholder="请选择盘点类型" clearable>
           <el-option
             v-for="dict in dict.type.check_stock_type"
             :key="dict.value"
@@ -19,8 +19,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态">
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
           <el-option
             v-for="dict in dict.type.check_bill_status"
             :key="dict.value"
@@ -46,17 +46,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleInvalidated"
-          v-hasPermi="['check:stockCheck:edit']"
-        >作废</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -90,7 +79,17 @@
           v-hasPermi="['check:stockCheck:edit']"
         >确认</el-button>
       </el-col>
-
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleInvalidated"
+          v-hasPermi="['check:stockCheck:edit']"
+        >作废</el-button>
+      </el-col>
 
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -99,7 +98,7 @@
     <el-table v-loading="loading" :data="stockCheckList" @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="stockCheckId" />
-      <el-table-column label="盘库类型" align="left" prop="checkType">
+      <el-table-column label="盘点类型" align="left" prop="checkType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.check_stock_type" :value="scope.row.checkType"/>
         </template>
@@ -113,9 +112,9 @@
 <!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
       <el-table-column label="部门" align="left" prop="departmentName" />
       <el-table-column label="创建人" align="left" prop="createManId" />
-      <el-table-column label="盘点位置" align="left" prop="spare1" />
-      <el-table-column label="建立时间" align="left" prop="createDate" />
-      <el-table-column label="完成日期" align="left" prop="finishDate" />
+<!--      <el-table-column label="盘点位置" align="left" prop="spare1" />-->
+      <el-table-column label="创建时间" align="left" prop="createDate" />
+      <el-table-column label="完成时间" align="left" prop="finishDate" />
     </el-table>
 
     <pagination
@@ -130,8 +129,8 @@
       <el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160" />
       <el-table-column label="主单ID" align="left" prop="stockCheckId" width="160" />
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName"  width="160"/>
-      <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
-      <el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
+      <el-table-column label="品号" align="left" prop="productId"/><!--品号-->
+      <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"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -236,8 +235,8 @@ export default {
       // 所有出口数据（按仓库ID分组）
       allExitOptions: {
         '01': [
-          { exitId: "L2013", exitName: 'L2013' },
-          { exitId: 'L2012', exitName: 'L2012' },
+          { exitId: "L2004", exitName: 'L2004' },
+          { exitId: 'L2006', exitName: 'L2006' },
         ]
       },
       // 当前审核的单据
@@ -257,7 +256,7 @@ export default {
         checkType: null,
         createDate: null,
         createManId: null,
-        status: '1',
+        status: null,
         warehouseId: null,
         finishDate: null,
         erpBill: null,
@@ -280,7 +279,7 @@ export default {
           { required: true, message: "请输入盘点单据ID", trigger: "blur" }
         ],
         checkType: [
-          { required: true, message: "请选择盘库类型", trigger: "change" }
+          { required: true, message: "请选择盘点类型", trigger: "change" }
         ],
         createDate: [
           { required: true, message: "请选择创建日期", trigger: "blur" }
@@ -422,7 +421,7 @@ export default {
     /** 作废按钮操作 */
     handleInvalidated(row) {
       let stockCheck = this.stockCheckList.find(item => item.stockGuid === (row.stockGuid || this.ids[0]));
-      if (stockCheck.status === "1") {
+      if (stockCheck.status === "1" || stockCheck.status === "2") {
         let data = {
           "stockGuid": stockCheck.stockGuid,
           "status": "5"
@@ -432,7 +431,7 @@ export default {
           this.getList()
         })
       } else {
-        this.$modal.msgError('只有未审核的单据可以作废')
+        this.$modal.msgError('只有未执行的单据可以作废')
       }
     },
     /** 审核按钮操作 */
@@ -443,13 +442,14 @@ export default {
         return
       }
       if (stockCheck.status === "1") {
-        // 保存当前审核的单据
-        this.currentAuditStock = stockCheck
-        // 根据单据的仓库ID设置出口选项
-        this.setExitOptionsByWarehouse(stockCheck.warehouseId)
-        // 显示审核弹窗
-        this.auditDialogVisible = true
-        this.auditForm.exitId = null
+        const data = {
+          "stockGuid": stockCheck.stockGuid,
+          "status": "2"
+        }
+        updateStockCheck(data).then(response => {
+          this.$modal.msgSuccess('审核成功')
+          this.getList()
+        })
       } else {
         this.$modal.msgError('只有未审核的单据可以审核')
       }
@@ -480,7 +480,7 @@ export default {
         "stockGuid": this.ids[0]
       }
       autoAllocation(stockCheckData).then(response => {
-        this.$modal.msgSuccess('自动分配成功')
+        this.$modal.msgSuccess(response.msg)
         this.getList()
       })
     },
@@ -526,10 +526,8 @@ export default {
         if (valid) {
           const data = {
             "stockGuid": this.currentAuditStock.stockGuid,
-            "status": "2",
-            "spare1": this.auditForm.exitId  // 将选择的出口数据放入spare1字段
+            "status": "2"
           }
-          console.log('审核数据（含出口信息）：', data)
 
           updateStockCheck(data).then(response => {
             this.$modal.msgSuccess('审核成功')
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index 917c3fb..f23a492 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -1,16 +1,9 @@
 <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>-->
+
       <el-form-item label="任务状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择任务状态" >
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
           <el-option
             v-for="dict in dict.type.mydo_job_status"
             :key="dict.value"
@@ -19,6 +12,16 @@
           />
         </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-select>
+      </el-form-item>
       <el-form-item label="任务号" prop="taskNo">
         <el-input
           v-model="queryParams.taskNo"
@@ -27,50 +30,37 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="托盘码" prop="trayCode">
+      <el-form-item label="巷道" prop="roadwayId">
         <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘码"
+          v-model="queryParams.roadwayId"
+          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-select>
-      </el-form-item>-->
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-                        placeholder="请选择开始时间">
-        </el-date-picker>
       </el-form-item>
-      <el-form-item label="结束时间" prop="finishTime">
-        <el-date-picker clearable
-          v-model="queryParams.finishTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-                        placeholder="请选择结束时间">
-        </el-date-picker>
+      <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="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入品号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单号" prop="lineId">
+        <el-input
+          v-model="queryParams.lineId"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="入口" prop="entranceId">
         <el-input
@@ -80,6 +70,23 @@
           @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="请选择开始时间">
+        </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="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+
 <!--      <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
 <!--        <el-select-->
 <!--          v-model="queryParams.warehouseId"-->
@@ -145,7 +152,7 @@
         </template>
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" />
-<!--      <el-table-column label="托盘码" align="left" prop="trayCode" width="140" />-->
+      <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="priority" />-->
 <!--      <el-table-column label="执行阶段" align="left" prop="executionPhase">-->
@@ -177,8 +184,8 @@
       <el-table-column label="任务ID" align="left" prop="jobId" width="140" />
       <el-table-column label="单据ID" align="left" prop="inOrOutId" width="150" />
       <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
-      <el-table-column label="物料编码" align="left" prop="productId" width="140" />
-      <el-table-column label="物料名称" align="left" prop="productName" />
+      <el-table-column label="品号" align="left" prop="productId" width="140" />
+      <el-table-column label="品名" align="left" prop="productName" />
       <el-table-column label="批号" align="left" prop="lotNo" />
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
@@ -201,8 +208,6 @@
       :limit.sync="queryDetailParams.pageSize"
       @pagination="getDetailList"
     />
-
-
   </div>
 </template>
 
@@ -270,6 +275,7 @@ export default {
         classId: null,
         warehouseId: null,
         faultFlag: null,
+        productId: null,
         inOut:"1"
       },
       queryDetailParams:{
diff --git a/ruoyi-ui/src/views/in/receive/add/index.vue b/ruoyi-ui/src/views/in/receive/add/index.vue
index 31d6e4e..16f2b74 100644
--- a/ruoyi-ui/src/views/in/receive/add/index.vue
+++ b/ruoyi-ui/src/views/in/receive/add/index.vue
@@ -20,8 +20,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="供应商" prop="supplierId">
-              <el-input 
-                 v-model="form.supplierName" 
+              <el-input
+                 v-model="form.supplierName"
                  placeholder="请选择供应商"
                  @click.native="openSupplierSelector"
                  readonly
@@ -60,8 +60,8 @@
       <el-table :data="productList" border style="width: 100%">
         <el-table-column type="index" label="序号" width="50" align="center"/>
         <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
-        <el-table-column fixed label="物料编码" align="left" prop="productId"  /><!--物料编码-->
-        <el-table-column fixed label="物料名称" align="left" prop="productName" /><!--物料名称-->
+        <el-table-column fixed label="品号" align="left" prop="productId"  /><!--品号-->
+        <el-table-column fixed label="品名" align="left" prop="productName" /><!--品名-->
         <el-table-column fixed label="英文描述" align="left" prop="spare1"/><!--英文描述-->
         <el-table-column label="单位" align="left" prop="unit" /><!--单位-->
         <el-table-column label="单件净重KG" align="right" prop="spare2" width="120px"/><!--单件净重KG-->
@@ -155,8 +155,8 @@
       <el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
         <el-table-column type="selection" width="55"/>
         <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
-        <el-table-column label="物料编码" align="left" width="120px" prop="productId" /><!--物料编码-->
-        <el-table-column label="物料名称" align="left" prop="productName" /><!--物料名称-->
+        <el-table-column label="品号" align="left" width="120px" prop="productId" /><!--品号-->
+        <el-table-column label="品名" align="left" prop="productName" /><!--品名-->
         <el-table-column label="英文描述" align="left" prop="spare1"/><!--英文描述-->
         <el-table-column label="单位" align="left" prop="unit" /><!--单位-->
         <el-table-column label="单件净重KG" align="right" prop="spare2" /><!--单件净重KG-->
@@ -200,7 +200,7 @@
         <el-button @click="upload.open = false">取消</el-button>
       </div>
     </el-dialog>
-    
+
     <!-- 供应商选择对话框 -->
     <el-dialog title="选择供应商" :visible.sync="supplierDialog" width="800px" append-to-body>
       <el-form :model="supplierQueryParams" ref="supplierQueryForm" :inline="true">
@@ -227,7 +227,7 @@
           <el-button icon="el-icon-refresh" size="mini" @click="resetSupplierQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      
+
       <el-table
         ref="supplierTable"
         v-loading="supplierLoading"
@@ -247,7 +247,7 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <pagination
         v-show="supplierTotal > 0"
         :total="supplierTotal"
@@ -255,7 +255,7 @@
         :limit.sync="supplierQueryParams.pageSize"
         @pagination="getSupplierList"
       />
-      
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="confirmSelectSupplier">确定</el-button>
         <el-button @click="cancelSelectSupplier">取消</el-button>
@@ -321,7 +321,7 @@ export default {
         pageSize: 10,
         supplierNo: null,
         supplierName: null
-      
+
       },
       // 物料列表
       productList: [],
@@ -395,13 +395,13 @@ export default {
         this.supplierOptions = response.rows;
       });
     },
-    
+
     /** 打开供应商选择对话框 */
     openSupplierSelector() {
       this.getSupplierListForDialog();
       this.supplierDialog = true;
     },
-    
+
     /** 获取供应商列表（对话框数据） */
     getSupplierListForDialog() {
       this.supplierLoading = true;
@@ -411,26 +411,26 @@ export default {
         this.supplierLoading = false;
       });
     },
-    
+
     /** 供应商查询 */
     handleSupplierQuery() {
       this.supplierQueryParams.pageNum = 1;
       this.getSupplierListForDialog();
     },
-    
+
     /** 重置供应商查询 */
     resetSupplierQuery() {
       this.resetForm("supplierQueryForm");
       // this.supplierQueryParams.useable = "0";
       this.handleSupplierQuery();
     },
-    
+
     /** 供应商行点击事件 */
     handleSupplierRowClick(row) {
       this.selectedSupplier = row;
       this.$refs.supplierTable.setCurrentRow(row);
     },
-    
+
     /** 确认选择供应商 */
     confirmSelectSupplier() {
       if (!this.selectedSupplier) {
@@ -441,7 +441,7 @@ export default {
       this.form.supplierName = this.selectedSupplier.supplierName;
       this.supplierDialog = false;
     },
-    
+
     /** 取消选择供应商 */
     cancelSelectSupplier() {
       this.selectedSupplier = null;
diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue
index 5ee9bf3..e7cccc9 100644
--- a/ruoyi-ui/src/views/in/receive/index.vue
+++ b/ruoyi-ui/src/views/in/receive/index.vue
@@ -9,10 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料描述" prop="materialDesc"><!--物料描述-->
+      <el-form-item label="品名" prop="materialDesc"><!--品名-->
         <el-input
           v-model="queryParams.materialDesc"
-          placeholder="请输入物料描述"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -190,8 +190,8 @@
       <el-table-column label="主单ID" align="left" prop="stockinId"/>
 <!--      <el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/>&lt;!&ndash;批次号&ndash;&gt;-->
 <!--      <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
-      <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
-      <el-table-column label="物料描述" align="left" prop="extraField.materialDesc"/><!--物料描述-->
+      <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="left" prop="extraField.cartonNo"/><!--箱号-->
       <el-table-column label="包装方式" align="left" prop="extraField.packingMethod"/><!--包装方式-->
diff --git a/ruoyi-ui/src/views/in/stockIn/add/index_new.vue b/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
index b50ccd0..4e62125 100644
--- a/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
+++ b/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
@@ -62,8 +62,8 @@
       <el-table :data="productList" border style="width: 100%">
         <el-table-column type="index" label="序号" width="50" align="center"/>
         <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
-        <el-table-column fixed label="物料编码" align="left" prop="productId"  />
-        <el-table-column fixed label="物料名称" align="left" prop="productName" />
+        <el-table-column fixed label="品号" align="left" prop="productId"  />
+        <el-table-column fixed label="品名" align="left" prop="productName" />
         <el-table-column  label="型号" align="left">
           <template slot-scope="scope">
             <el-input
@@ -187,8 +187,32 @@
     </div>
 
     <!-- 选择物料对话框 -->
-    <el-dialog title="选择物料" :visible.sync="productSelectVisible" width="1300px" append-to-body>
-      <el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
+    <el-dialog title="选择物料" :visible.sync="productDialog" width="1300px" append-to-body>
+      <el-form :model="queryParamsPro" ref="queryParamsPro" size="small" :inline="true" label-width="68px">
+
+        <el-form-item label="品号" prop="productId"><!--品号-->
+          <el-input
+            v-model="queryParamsPro.productId"
+            :placeholder="'请输入品号'"
+            clearable
+            @keyup.enter.native="handleQueryPro"
+          />
+        </el-form-item>
+        <el-form-item label="品名" prop="productName"><!--品名-->
+          <el-input
+            v-model="queryParamsPro.productName"
+            :placeholder="'请输入品名'"
+            clearable
+            @keyup.enter.native="handleQueryPro"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryPro">{{'搜索'}}<!--搜索--></el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQueryPro">重置<!--重置--></el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table ref="productTable" v-loading="productLoading" :data="productOptions" border @selection-change="handleProductSelectionChange">
         <el-table-column type="selection" width="55"/>
         <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
         <el-table-column label="品号" align="center" prop="productId" />
@@ -234,14 +258,14 @@
       <pagination
         v-show="productTotal>0"
         :total="productTotal"
-        :page.sync="queryProductParams.pageNum"
-        :limit.sync="queryProductParams.pageSize"
+        :page.sync="queryParamsPro.pageNum"
+        :limit.sync="queryParamsPro.pageSize"
         @pagination="getProductList"
       />
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="confirmSelectProduct">确定</el-button>
-        <el-button @click="productSelectVisible = false">取消</el-button>
+        <el-button @click="cancelSelectproduct">取消</el-button>
       </div>
     </el-dialog>
 
@@ -388,14 +412,18 @@ export default {
         supplierName: null
 
       },
+      // 物料选项
+      productOptions: [],
+      // 物料选择对话框
+      productDialog: false,
       // 物料列表
       productList: [],
-      // 物料选择对话框
-      productSelectVisible: false,
-      // 物料选项，
-      productOptions: [],
       // 已选物料
       selectedProducts: [],
+      // 供应商总数
+      productTotal: 0,
+      // 供应商加载状态
+      productLoading: false,
       // 总数量
       totalQuantity: 0,
       // 总金额
@@ -403,20 +431,18 @@ export default {
       totalNetWeight:0,
       netWeight:0,
       grossWeight:0,
-      //物料总数
-      productTotal: 0,
       //物料查询参数
-      queryProductParams: {
+      queryParamsPro: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        productId: null,
+        productName: null
       },
        //仓库查询参数
       queryWarehouseParams: {
         pageNum: 1,
         pageSize: 99
       },
-      //物料遮盖
-      productLoading: true,
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -437,7 +463,7 @@ export default {
   created() {
     this.getWarehouseList();
     this.getSupplierList();
-    console.log(this.supplierOptions)
+    this.getProductList();
   },
   methods: {
     /** 获取仓库列表 */
@@ -446,14 +472,6 @@ export default {
         this.warehouseOptions = response.rows;
       });
     },
-    /** 获取物料列表 */
-    getProductList() {
-      listBasProduct(this.queryProductParams).then(response => {
-        this.productOptions = response.rows;
-        this.productTotal = response.total;
-        this.productLoading = false;
-      });
-    },
     /** 获取供应商列表（下拉框选项） */
     getSupplierList() {
       listBasSupplier().then(response => {
@@ -513,13 +531,42 @@ export default {
       this.supplierDialog = false;
     },
 
+    /** 获取物料列表 */
+    getProductList() {
+      listBasProduct().then(response => {
+        this.productOptions = response.rows;
+      });
+    },
+
     /** 添加物料按钮操作 */
     handleAddProduct() {
-      this.getProductList();
-      this.productSelectVisible = true;
+      this.getProductListForDialog();
+      this.productDialog = true;
     },
     handleExportProduct() {
     },
+
+    /** 获取供应商列表（对话框数据） */
+    getProductListForDialog() {
+      this.productLoading = true;
+      listBasProduct(this.queryParamsPro).then(response => {
+        this.productOptions = response.rows;
+        this.productTotal = response.total;
+        this.productLoading = false;
+      });
+    },
+
+    /** 物料查询 */
+    handleQueryPro() {
+      this.queryParamsPro.pageNum = 1;
+      this.getProductListForDialog();
+    },
+    /** 重置按钮操作 */
+    resetQueryPro() {
+      this.resetForm("queryParamsPro");
+      this.handleQueryPro();
+    },
+
     /** 物料选择变更 */
     handleProductSelectionChange(selection) {
       this.selectedProducts = selection;
@@ -562,12 +609,16 @@ export default {
         grossWeight: 0
       }));
       this.productList.push(...newProducts);
-      this.productSelectVisible = false;
+      this.productDialog = false;
     },
     /** 删除物料 */
     handleDeleteProduct(index) {
       this.productList.splice(index, 1);
     },
+    cancelSelectproduct() {
+      this.selectedProduct = null;
+      this.productDialog = false;
+    },
     cancelPri(){
       // 重置表单数据
       this.form = {
@@ -601,51 +652,51 @@ export default {
           for (let i = 0; i < this.productList.length; i++) {
             const item = this.productList[i];
             if (!item.spare1) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的型号未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的型号未填写`);
               return;
             }
             if (!item.spare2) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的净重未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的净重未填写`);
               return;
             }
             if (!item.spare3) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的颜色未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的颜色未填写`);
               return;
             }
             if (!item.spare4) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的序列号未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的序列号未填写`);
               return;
             }
             if (!item.spare5) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的电压未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的电压未填写`);
               return;
             }
             if (!item.spare6) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的功率未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的功率未填写`);
               return;
             }
             if (!item.spare7) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的相位未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的相位未填写`);
               return;
             }
             if (!item.spare8) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的毛重未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的毛重未填写`);
               return;
             }
             if (!item.quantity) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的数量未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的数量未填写`);
               return;
             }
             if (!item.lotNo) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的批次号未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的批次号未填写`);
               return;
             }
             if (!item.unit) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的机型未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的机型未填写`);
               return;
             }
             if (!item.spare9) {
-              this.$modal.msgError(`物料编码 ${item.productId} 的分销未填写`);
+              this.$modal.msgError(`品号 ${item.productId} 的分销未填写`);
               return;
             }
           }
@@ -718,8 +769,6 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit()
     },
-
-
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index 9cf92f6..a2d8c54 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -1,23 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单号" prop="erpBill"><!--入库订单ID-->
-        <el-input
-          v-model="queryParams.erpBill"
-          placeholder="请输入订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料描述" prop="materialDesc"><!--物料描述-->
-        <el-input
-          v-model="queryParams.materialDesc"
-          placeholder="请输入物料描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
       <el-form-item label="入库类型" prop="inType"><!--入库类型-->
         <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
           <el-option
@@ -29,7 +12,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="单据状态" prop="status"><!--单据状态-->
-        <el-select v-model="queryParams.status" placeholder="请选择单据状态" >
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
           <el-option
             v-for="dict in dict.type.in_bill_status"
             :key="dict.value"
@@ -39,7 +22,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="单据来源" prop="stockSource"><!--单据来源-->
-        <el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" >
+        <el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>
           <el-option
             v-for="dict in dict.type.bill_resource"
             :key="dict.value"
@@ -48,29 +31,59 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
-<!--        <el-select-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请选择仓库"-->
-<!--          clearable-->
-<!--          @change="handleQuery"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in warehouseOptions"-->
-<!--            :key="item.warehouseId"-->
-<!--            :label="item.warehouseName"-->
-<!--            :value="item.warehouseId"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="供应商编码" prop="supplierNo">&lt;!&ndash;供应商编码&ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.supplierNo"-->
-<!--          placeholder="请输入供应商编码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="订单号" prop="erpBill"><!--入库订单ID-->
+        <el-input
+          v-model="queryParams.erpBill"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品名" prop="materialDesc"><!--品名-->
+        <el-input
+          v-model="queryParams.materialDesc"
+          placeholder="请输入品名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+      <el-form-item :label="'创建时间'" prop="dateRange">
+        <el-date-picker
+          v-model="dateRange"
+          type="datetimerange"
+          range-separator="---"
+          :start-placeholder="'起始时间'"
+          :end-placeholder="'结束时间'"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :default-time="['00:00:00', '23:59:59']"
+        />
+      </el-form-item>
+
+      <!--      <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
+      <!--        <el-select-->
+      <!--          v-model="queryParams.warehouseId"-->
+      <!--          placeholder="请选择仓库"-->
+      <!--          clearable-->
+      <!--          @change="handleQuery"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in warehouseOptions"-->
+      <!--            :key="item.warehouseId"-->
+      <!--            :label="item.warehouseName"-->
+      <!--            :value="item.warehouseId"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="供应商编码" prop="supplierNo">&lt;!&ndash;供应商编码&ndash;&gt;-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.supplierNo"-->
+      <!--          placeholder="请输入供应商编码"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!--搜索-->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button><!--重置-->
@@ -114,18 +127,18 @@
         >单据确认<!--单据确认-->
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="info"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :disabled="detailMultiple"-->
-<!--          @click="handleBarcodePrinting"-->
-<!--          v-hasPermi="['in:stockIn:barcodePrinting']"-->
-<!--        >打印条码&lt;!&ndash;打印条码&ndash;&gt;-->
-<!--        </el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="info"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          :disabled="detailMultiple"-->
+      <!--          @click="handleBarcodePrinting"-->
+      <!--          v-hasPermi="['in:stockIn:barcodePrinting']"-->
+      <!--        >打印条码&lt;!&ndash;打印条码&ndash;&gt;-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -134,7 +147,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
       <el-table-column label="入库订单" align="left" prop="stockinId" width="150"/><!--入库订单-->
-      <el-table-column label="订单号" align="left" prop="erpBill"  width="150"/><!--入库订单-->
+      <el-table-column label="订单号" align="left" prop="erpBill" width="150"/><!--入库订单-->
       <el-table-column label="入库类型" align="left" prop="inType"><!--入库类型-->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -167,11 +180,11 @@
     />
 
     <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <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="productName" width="160"/><!--物料编码-->
+      <el-table-column label="品号" align="left" prop="productId"/><!--品号-->
+      <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"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -199,7 +212,8 @@
 
     <!-- 打印模板 -->
     <vue-easy-print v-show="true" ref="easyPrint2">
-      <div v-for="item  in printData" :key="item.stockinDetailId" style="page-break-after:always" class="vue-easy-print">
+      <div v-for="item  in printData" :key="item.stockinDetailId" style="page-break-after:always"
+           class="vue-easy-print">
         <vue-qr :text='item.stockinDetailId' :size="150" :margin="10" :align-item="center" :correctLevel="2"></vue-qr>
         <div>
           <span class="num">{{ item.stockinDetailId }}</span>
@@ -227,10 +241,9 @@ import vueEasyPrint from 'vue-easy-print'
 import VueQr from 'vue-qr'
 
 
-
 export default {
   name: "StockIn",
-  dicts: ['bill_resource', 'in_bill_status', 'in_bill_type','bill_resource'],
+  dicts: ['bill_resource', 'in_bill_status', 'in_bill_type', 'bill_resource'],
   components: {
     vueEasyPrint,
     VueQr
@@ -240,14 +253,14 @@ export default {
       // 遮罩层
       loading: true,
       detailLoading: true,
-      warehouseOptions:[],
+      warehouseOptions: [],
       // 选中数组
       ids: [],
       detailIds: [],
       // 主表选中的数据
       stockInListSelected: [],
       stockInDetailListSelected: [],
-      printData:[],
+      printData: [],
       // 非单个禁用
       single: true,
       detailSingle: true,
@@ -267,6 +280,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 日期范围
+      dateRange: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -277,6 +292,7 @@ export default {
         createManId: null,
         status: null,
         warehouseId: null,
+        startDate: null,
         finishDate: null,
         erpBill: null,
         stockSource: null,
@@ -295,7 +311,7 @@ export default {
         pageSize: 10,
         stockinId: null
       },
-      queryWarehouseParams:{
+      queryWarehouseParams: {
         pageNum: 1,
         pageSize: 99
       },
@@ -351,6 +367,7 @@ export default {
         createManId: null,
         status: null,
         warehouseId: null,
+        startDate: null,
         finishDate: null,
         erpBill: null,
         stockSource: null,
@@ -369,10 +386,19 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
+      // 处理日期范围
+      if (this.dateRange && this.dateRange.length > 0) {
+        this.queryParams.startDate = this.dateRange[0]
+        this.queryParams.finishDate = this.dateRange[1]
+      } else {
+        this.queryParams.startDate = null
+        this.queryParams.finishDate = null
+      }
       this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = []
       this.resetForm("queryForm")
       this.handleQuery()
     },
@@ -383,32 +409,32 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    handleDetailSelectionChange(selection){
+    handleDetailSelectionChange(selection) {
       this.detailIds = selection.map(item => item.stockinDetailId)
       this.stockInDetailListSelected = selection
       this.detailSingle = selection.length !== 1
       this.detailMultiple = !selection.length
     },
     /** 作废单据按钮操作 */
-    handleInvalidated(row){
+    handleInvalidated(row) {
       let stockIn = this.stockInListSelected[0];
       if (stockIn.status === "1") {
         console.log(1)
         let data = {
-          "stockinGuid":  stockIn.stockinGuid,
-          "status":"5"
+          "stockinGuid": stockIn.stockinGuid,
+          "status": "5"
         }
         invalidatedStockIn(data).then(response => {
           this.$modal.msgSuccess('作废成功')
           this.getList()
         })
-      }else {
+      } else {
         this.$modal.msgError('只有未审核的单据可以作废')
       }
 
     },
     /** 审核单据按钮操作 */
-    handleReview(row){
+    handleReview(row) {
       let stockIn = this.stockInListSelected[0];
       if (stockIn.status !== "1") {
         this.$modal.msgError('单据已审核')
@@ -416,8 +442,8 @@ export default {
       }
       if (stockIn.status === "1") {
         let data = {
-          "stockinGuid":  stockIn.stockinGuid,
-          "status":"2"
+          "stockinGuid": stockIn.stockinGuid,
+          "status": "2"
         }
         reviewStockIn(data).then(response => {
           this.$modal.msgSuccess('审核成功')
@@ -426,23 +452,23 @@ export default {
       }
     },
     /**确认单据按钮操作 */
-    handleConfirmation(row){
+    handleConfirmation(row) {
       let stockIn = this.stockInListSelected[0];
-      if (stockIn.status === "3"){
+      if (stockIn.status === "3") {
         let data = {
-          "stockinGuid":  stockIn.stockinGuid,
-          "status":"4"
+          "stockinGuid": stockIn.stockinGuid,
+          "status": "4"
         }
         confirmationStockIn(data).then(response => {
           this.$modal.msgSuccess('确认成功')
           this.getList()
         })
-      }else {
+      } else {
         this.$modal.msgError('只有执行中的单据可以确认')
       }
     },
     /** 打印条码按钮操作 */
-    handleBarcodePrinting(row){
+    handleBarcodePrinting(row) {
       this.printData = this.stockInDetailListSelected
       if (this.printData.length === 0) {
         this.$modal.msgWarning('请选择要打印的数据')
@@ -483,6 +509,7 @@ export default {
   width: auto;
   min-width: fit-content;
 }
+
 /* 打印样式 */
 .vue-easy-print {
   text-align: center;
diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue
index 4d24d76..6ecc424 100644
--- a/ruoyi-ui/src/views/job/outJobManagement.vue
+++ b/ruoyi-ui/src/views/job/outJobManagement.vue
@@ -1,8 +1,8 @@
 <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="status"> <!-- 状态 -->
-        <el-select v-model="queryParams.status" placeholder="请选择状态" >
+      <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"
@@ -11,6 +11,16 @@
           />
         </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="任务号" prop="taskNo"> <!-- 任务号 -->
         <el-input
@@ -20,42 +30,61 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-<!--      <el-form-item label="托盘条码" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
-<!--        <el-input-->
-<!--          v-model="queryParams.trayCode"-->
-<!--          placeholder="请输入托盘条码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-
-<!--      <el-form-item label="作业类型" prop="inOrOut"> &lt;!&ndash; 作业类型 &ndash;&gt;-->
-<!--        <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="巷道" 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="productId"> <!-- 托盘条码 -->
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入品号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单号" prop="lineId"> <!-- 托盘条码 -->
+        <el-input
+          v-model="queryParams.lineId"
+          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="开始时间" prop="startTime"> <!-- 开始时间 -->
         <el-date-picker clearable
           v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
+          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="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="请选择结束时间" style="width: 206px">
         </el-date-picker>
       </el-form-item>
 
@@ -125,17 +154,9 @@
       <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="$t('outJobManagement.roadwayId')" align="left" prop="roadwayId" /> &lt;!&ndash; 巷道ID &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="priority" /> &lt;!&ndash; 优先级 &ndash;&gt;-->
-<!--      <el-table-column label="执行阶段" align="left" prop="executionPhase"> &lt;!&ndash; 执行阶段 &ndash;&gt;-->
-<!--        <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="left" prop="exitId"/> <!-- 出口ID -->
       <el-table-column label="创建时间" align="left" prop="createTime" width="180"/> <!-- 创建时间 -->
       <el-table-column label="开始时间" align="left" prop="startTime" width="180"/> <!-- 开始时间 -->
@@ -157,8 +178,8 @@
       <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" /> <!-- 子任务ID -->
       <el-table-column label="库存ID" align="left" prop="stockId" width="160" /> <!-- 库存ID -->
       <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" /> <!-- 子单据ID -->
-      <el-table-column label="物料编码" align="left" prop="productId" />
-      <el-table-column label="物料名称" align="left" prop="productName" />
+      <el-table-column label="品号" align="left" prop="productId" />
+      <el-table-column label="品名" align="left" prop="productName" />
       <el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
       <el-table-column label="批次号" align="left" prop="lotNo" />
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
@@ -225,7 +246,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         // jobId: null,
-        status: '1',
+        status: null,
         onLineType: null,
         taskNo: null,
         supplierId: null,
@@ -249,7 +270,8 @@ export default {
         classId: null,
         warehouseId: null,
         faultFlag: null,
-        inOut:'2'
+        inOut:'2',
+        productId: null
       },
       queryDetailParams:{
         pageNum: 1,
@@ -441,4 +463,9 @@ export default {
 .el-table >>> .current-row {
   background-color: #f0f9eb;
 }
+.el-select,
+.el-date-picker,
+.el-input {
+  width: 100%;
+}
 </style>
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index 34d7f01..5036b0a 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.vue
@@ -45,8 +45,8 @@
 
     <!-- 物资明细表格 -->
     <el-table v-loading="loading" :data="materialList">
-      <el-table-column label="物料编码" align="center" prop="productId" /><!--物资编号-->
-      <el-table-column label="物料名称" align="center" prop="productName" /><!--物资名称-->
+      <el-table-column label="品号" align="center" prop="productId" /><!--物资编号-->
+      <el-table-column label="品名" align="center" prop="productName" /><!--品名-->
       <el-table-column label="批次号" align="center" prop="lotNo" />
       <el-table-column label="订单号" align="center" prop="orderId" />
       <el-table-column label="序列号" align="center" prop="printDate" />
@@ -79,18 +79,18 @@
     <el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="800px" append-to-body><!--选择物资-->
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
 
-        <el-form-item label="物料编码" prop="productId"><!--物资编码-->
+        <el-form-item label="品号" prop="productId"><!--品号-->
           <el-input
             v-model="queryParams.productId"
-            :placeholder="'请输入物料编码'"
+            :placeholder="'请输入品号'"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName"><!--物资名称-->
+        <el-form-item label="品名" prop="productName"><!--品名-->
           <el-input
             v-model="queryParams.productName"
-            :placeholder="'请输入物料名称'"
+            :placeholder="'请输入品名'"
             clearable
             @keyup.enter.native="handleQuery"
           />
@@ -132,9 +132,9 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" prop="onlyIdentity" />
         <el-table-column label="订单号" align="center" prop="orderId" />
-        <el-table-column label="物料编码" align="center" prop="productId" />
+        <el-table-column label="品号" align="center" prop="productId" />
         <el-table-column label="批次号" align="center" prop="lotNo" />
-        <el-table-column label="物料名称" align="center" prop="productName" />
+        <el-table-column label="品名" align="center" prop="productName" />
         <el-table-column label="数量" align="center" prop="quantity" />
 <!--        <el-table-column label="仓库" align="center" prop="warehouseId" />-->
         <el-table-column label="规格" align="center" prop="spare1" />
diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue
index dd1c77e..4ab3165 100644
--- a/ruoyi-ui/src/views/out/outStockoutManage.vue
+++ b/ruoyi-ui/src/views/out/outStockoutManage.vue
@@ -21,7 +21,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="'单据状态'" prop="status"> <!-- 单据状态 -->
-        <el-select v-model="queryParams.status" :placeholder="'请选择单据状态'">
+        <el-select v-model="queryParams.status" :placeholder="'请选择单据状态'" clearable>
           <el-option
             v-for="dict in dict.type.out_bill_status"
             :key="dict.value"
@@ -38,10 +38,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="'物料名称'" prop="productName">
+      <el-form-item :label="'品名'" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          :placeholder="'请输入物料名称'"
+          :placeholder="'请输入品名'"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -168,8 +168,8 @@
     <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="productName" />
+      <el-table-column :label="'品号'" align="center" prop="productId" /> <!-- 品号 -->
+      <el-table-column :label="'品名'" align="center" prop="productName" />
       <el-table-column :label="'批次号'" align="center" prop="lotNo"/><!--英文描述-->
       <el-table-column :label="'序列号'" align="center"  prop="printDate" /> <!--序列号-->
       <el-table-column label="订单号" align="center" prop="orderId"  width="160" />
@@ -275,8 +275,8 @@
         <el-table-column label="库存编码" align="center" prop="stockId" />
         <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
         <el-table-column label="批次号" align="center" prop="lotNo" />
-        <el-table-column label="物料编码" align="center" prop="productId" />
-        <el-table-column label="物料名称" align="center" prop="productName" />
+        <el-table-column label="品号" align="center" prop="productId" />
+        <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="spare1" />
         <el-table-column label="单位" align="center" prop="spare3" />
@@ -380,7 +380,7 @@ export default {
         productName: null,
         startDate: null,
         finishDate: null,
-        status: '1'
+        status: null
       },
       // 子表分页参数
       detailQueryParams: {
diff --git a/ruoyi-ui/src/views/out/productAndStock.vue b/ruoyi-ui/src/views/out/productAndStock.vue
index 7e917d1..dd776cc 100644
--- a/ruoyi-ui/src/views/out/productAndStock.vue
+++ b/ruoyi-ui/src/views/out/productAndStock.vue
@@ -9,10 +9,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"
         />
@@ -25,22 +25,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="'物料名称'" prop="productName"> <!-- 物资名称 -->
+      <el-form-item :label="'品名'" prop="productName"> <!-- 品名 -->
         <el-input
           v-model="queryParams.productName"
-          :placeholder="'请输入物料名称'"
+          :placeholder="'请输入品名'"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item :label="'仓库'" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;
-        <el-input
-          v-model="queryParams.warehouseId"
-          :placeholder="'请输入仓库'"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{'搜索'}}</el-button> <!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <!-- 重置 -->
@@ -63,9 +56,9 @@
 
     <el-table v-loading="loading" :data="productAndStockList">
       <el-table-column :label="'序号'" align="left" prop="onlyIdentity" /> <!-- 序号 -->
-      <el-table-column :label="'物料编码'" align="left" prop="productId" /> <!-- 物资编码 -->
+      <el-table-column :label="'品号'" align="left" prop="productId" /> <!-- 品号 -->
       <el-table-column :label="'批号'" align="left" prop="lotNo" /> <!-- 批号 -->
-      <el-table-column :label="'物料名称'" align="left" prop="productName" /> <!-- 物资名称 -->
+      <el-table-column :label="'品名'" align="left" prop="productName" /> <!-- 品名 -->
       <el-table-column :label="'数量'" align="right" prop="quantity" /> <!-- 数量 -->
       <el-table-column :label="'仓库'" align="left" prop="warehouseId" /> <!-- 仓库 -->
     </el-table>
diff --git a/ruoyi-ui/src/views/search/StockSummary/index.vue b/ruoyi-ui/src/views/search/StockSummary/index.vue
index 8417993..ac95b92 100644
--- a/ruoyi-ui/src/views/search/StockSummary/index.vue
+++ b/ruoyi-ui/src/views/search/StockSummary/index.vue
@@ -5,7 +5,7 @@
         <el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
           <el-checkbox label="orderId">订单号</el-checkbox>
           <el-checkbox label="productId">物料编号</el-checkbox>
-          <el-checkbox label="productName">物料名称</el-checkbox>
+          <el-checkbox label="productName">品名</el-checkbox>
           <el-checkbox label="lotNo">批号</el-checkbox>
           <!-- <el-checkbox label="unit">单位</el-checkbox> -->
           <!-- <el-checkbox label="warehouseId">仓库</el-checkbox> -->
@@ -83,18 +83,18 @@
           @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"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
+          placeholder="请输入品名关键字"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -143,8 +143,8 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="订单号" align="center" prop="orderId" width="160" v-if="queryParams.groupFields.includes('orderId')" />
-      <el-table-column label="物料编码" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
-      <el-table-column label="物料名称" align="center" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
+      <el-table-column label="品号" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
+      <el-table-column label="品名" align="center" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
       <el-table-column label="批号" align="center" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />
       <!-- <el-table-column label="单位" align="center" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" /> -->
 <!--      <el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />-->
diff --git a/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue b/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue
index 258218d..dad155b 100644
--- a/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue
@@ -67,10 +67,10 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
+          placeholder="请输入品名关键字"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -166,7 +166,7 @@
       <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="productName" />
+      <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" />
       <el-table-column label="长度(mm)" width="120" align="right" prop="spare5" />
@@ -226,8 +226,8 @@
         <el-form-item label="是否可用" prop="isCurrent">
           <el-input v-model="form.isCurrent" placeholder="请选择是否可用" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="品名" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入品名" />
         </el-form-item>
         <el-form-item label="规格型号" prop="spec">
           <el-input v-model="form.spec" placeholder="请输入规格型号" />
diff --git a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue
index d00c9c0..bb47186 100644
--- a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue
@@ -19,10 +19,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称关键字"
+          placeholder="请输入品名关键字"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -52,7 +52,7 @@
       <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="productName" />
+      <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" />
       <el-table-column label="长度(mm)" width="120" align="right" prop="spare5" />
@@ -105,8 +105,8 @@
         <el-form-item label="是否可用" prop="isCurrent">
           <el-input v-model="form.isCurrent" placeholder="请选择是否可用" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="品名" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入品名" />
         </el-form-item>
         <el-form-item label="规格型号" prop="spec">
           <el-input v-model="form.spec" placeholder="请输入规格型号" />
diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
index 99ff118..33f7ee4 100644
--- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
@@ -223,10 +223,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -659,7 +659,7 @@
       <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="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" />-->
diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
index 3d51d1e..fb9391e 100644
--- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
@@ -231,18 +231,18 @@
           @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"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -679,8 +679,8 @@
       </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="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" />-->
diff --git a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
index cf9b361..a6e4e91 100644
--- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue
@@ -37,18 +37,18 @@
         />
       </el-form-item> -->
 
-      <el-form-item label="物料编码" prop="productId">
+      <el-form-item label="品号" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入物料编码"
+          placeholder="请输入品号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -139,7 +139,7 @@
       <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="productName" width="160"/>
+      <el-table-column label="品名" align="left" prop="productName" 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"/>
@@ -294,8 +294,8 @@
         <el-form-item label="物料ID" prop="productId">
           <el-input v-model="form.productId" placeholder="请输入物料ID" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="品名" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入品名" />
         </el-form-item>
         <el-form-item label="规格" prop="spec">
           <el-input v-model="form.spec" placeholder="请输入规格" />
diff --git a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
index 8894feb..d7f6313 100644
--- a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
@@ -255,10 +255,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"
         />
@@ -359,10 +359,10 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -706,8 +706,8 @@
 <!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
 <!--      <el-table-column label="完成时间" align="center" prop="finishDate" />-->
       <el-table-column label="订单号" align="left" prop="erpBill" width="160"/>
-      <el-table-column label="物料编码" align="left" prop="productId" width="160"/>
-      <el-table-column label="物料名称" align="left" prop="productName" width="160"/>
+      <el-table-column label="品号" align="left" prop="productId" width="160"/>
+      <el-table-column label="品名" align="left" prop="productName" width="160"/>
 <!--      <el-table-column label="单据来源" align="center" prop="stockSource" />-->
 <!--      <el-table-column label="部门编码" align="center" prop="departmentNo" />-->
 <!--      <el-table-column label="班组编码" align="center" prop="classNo" />-->
@@ -933,8 +933,8 @@
         <el-form-item label="物料主键" prop="productGuid">
           <el-input v-model="form.productGuid" 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="parentId">
           <el-input v-model="form.parentId" placeholder="请输入产品分类" />
@@ -972,8 +972,8 @@
         <el-form-item label="功率" prop="spare6">
           <el-input v-model="form.spare6" placeholder="请输入功率" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="品名" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入品名" />
         </el-form-item>
         <el-form-item label="相位" prop="spare7">
           <el-input v-model="form.spare7" placeholder="请输入相位" />
diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
index a420706..b4b685b 100644
--- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
@@ -141,10 +141,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"
         />
@@ -245,10 +245,10 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="物料名称" prop="productName">
+      <el-form-item label="品名" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -582,8 +582,8 @@
       <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 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">
@@ -739,8 +739,8 @@
         <el-form-item label="物料主键" prop="productGuid">
           <el-input v-model="form.productGuid" 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="parentId">
           <el-input v-model="form.parentId" placeholder="请输入产品分类" />
@@ -778,8 +778,8 @@
         <el-form-item label="功率" prop="spare6">
           <el-input v-model="form.spare6" placeholder="请输入功率" />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        <el-form-item label="品名" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入品名" />
         </el-form-item>
         <el-form-item label="相位" prop="spare7">
           <el-input v-model="form.spare7" placeholder="请输入相位" />
diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue
index e08cf78..2351eff 100644
--- a/ruoyi-ui/src/views/stock/management/index.vue
+++ b/ruoyi-ui/src/views/stock/management/index.vue
@@ -46,10 +46,10 @@
       </el-form-item>-->
 
 
-      <el-form-item label="物料名称" prop="productName"><!-- 物料描述 -->
+      <el-form-item label="品名" prop="productName"><!-- 品名 -->
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -107,8 +107,8 @@
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="物料编码" align="center" prop="productId" />
-      <el-table-column label="物料名称" align="center" prop="productName" width="160"/>
+      <el-table-column label="品号" align="center" prop="productId" />
+      <el-table-column label="品名" align="center" prop="productName" width="160"/>
       <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="inDate" width="160"/>
@@ -222,18 +222,18 @@
     <!-- 物料选择对话框 -->
     <el-dialog title="选择物料" :visible.sync="productSelectVisible" width="800px" append-to-body>
       <el-form :model="productQueryParams" ref="productQueryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="物料编码" prop="productId">
+        <el-form-item label="品号" prop="productId">
           <el-input
             v-model="productQueryParams.productId"
-            placeholder="请输入物料编码"
+            placeholder="请输入品号"
             clearable
             @keyup.enter.native="getProductList"
           />
         </el-form-item>
-        <el-form-item label="物料名称" prop="productName">
+        <el-form-item label="品名" prop="productName">
           <el-input
             v-model="productQueryParams.productName"
-            placeholder="请输入物料名称"
+            placeholder="请输入品名"
             clearable
             @keyup.enter.native="getProductList"
           />
@@ -250,8 +250,8 @@
         @row-click="handleProductRowClick"
         highlight-current-row
         max-height="400">
-        <el-table-column label="物料编码" align="center" prop="productId" />
-        <el-table-column label="物料名称" align="center" prop="productName" />
+        <el-table-column label="品号" align="center" prop="productId" />
+        <el-table-column label="品名" align="center" prop="productName" />
         <el-table-column label="规格" align="center" prop="spec" />
         <el-table-column label="型号" align="center" prop="spare1" />
         <el-table-column label="单位" align="center" prop="unit" />
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index 05ade45..eec4256 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -1,33 +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="stockId"><!-- 库存id -->
-        <el-input
-          v-model="queryParams.stockId"
-          placeholder="请输入库存编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="货位名称" prop="cargoSpaceName"><!-- 货位id -->
-        <el-input
-          v-model="queryParams.cargoSpaceName"
-          placeholder="请输入货位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单号" prop="orderId"><!-- 货位id -->
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入订单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-
-      <el-form-item label="品名" prop="productName"><!-- 物料描述 -->
+      <el-form-item label="品名" prop="productName"><!-- 品名 -->
         <el-input
           v-model="queryParams.productName"
           placeholder="请输入品名"
@@ -35,8 +9,54 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-
+      <el-form-item label="订单号" prop="序列号"><!-- 库存id -->
+        <el-input
+          v-model="queryParams.序列号"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="序列号" prop="spare6"><!-- 库存id -->
+        <el-input
+          v-model="queryParams.spare6"
+          placeholder="请输入序列号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="批次" prop="lotNo"><!-- 库存id -->
+        <el-input
+          v-model="queryParams.lotNo"
+          placeholder="请输入批次"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位-排" prop="thePlatoon"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.thePlatoon"
+          placeholder="请输入货位-排"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位-列" prop="theColumn"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.theColumn"
+          placeholder="请输入货位-列"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位-层" prop="theFloor"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.theFloor"
+          placeholder="请输入货位-层"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button><!-- 重置 -->
@@ -58,26 +78,26 @@
     </el-row>
 
     <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 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="lotNo" />
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
+      <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="productName" />
-      <el-table-column label="数量" align="center" prop="quantity" width="80" />
-      <el-table-column label="规格" align="center" prop="spare1" />
-      <el-table-column label="单位" align="center" prop="spare3" />
-      <el-table-column label="型号" align="center" prop="spare4" />
-      <el-table-column label="颜色" align="center" prop="spare5" />
-      <el-table-column label="序列号" align="center" prop="spare6" />
-      <el-table-column label="电压" align="center" prop="voltage" />
-      <el-table-column label="功率" align="center" prop="power" />
-      <el-table-column label="相位" align="center" prop="phase" />
-      <el-table-column label="净重" align="center" prop="netWeight" />
-      <el-table-column label="毛重" align="center" prop="grossWeight" />
-      <el-table-column label="分销" align="center" prop="distribution" />
-      <el-table-column label="机型" align="center" prop="model" />
+      <el-table-column label="品号" align="center" prop="productId"/>
+      <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="spare1"/>
+      <el-table-column label="单位" align="center" prop="spare3"/>
+      <el-table-column label="型号" align="center" prop="spare4"/>
+      <el-table-column label="颜色" align="center" prop="spare5"/>
+      <el-table-column label="序列号" align="center" prop="spare6"/>
+      <el-table-column label="电压" align="center" prop="voltage"/>
+      <el-table-column label="功率" align="center" prop="power"/>
+      <el-table-column label="相位" align="center" prop="phase"/>
+      <el-table-column label="净重" align="center" prop="netWeight"/>
+      <el-table-column label="毛重" align="center" prop="grossWeight"/>
+      <el-table-column label="分销" align="center" prop="distribution"/>
+      <el-table-column label="机型" align="center" prop="model"/>
 
     </el-table>
 
@@ -93,10 +113,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="库存ID" prop="stockId"> <!-- 库存id -->
-          <el-input v-model="form.stockId" placeholder="请输入库存ID" />
+          <el-input v-model="form.stockId" placeholder="请输入库存ID"/>
         </el-form-item>
         <el-form-item label="货位ID" prop="cargoSpaceId"> <!-- 货位id -->
-          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
+          <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID"/>
         </el-form-item>
         <el-form-item label="库存状态" prop="stockStatus"> <!-- 库存状态 -->
           <el-select v-model="form.stockStatus" placeholder="请选择库存状态">
@@ -110,7 +130,7 @@
         </el-form-item>
 
         <el-form-item label="库存数量" prop="quantity"> <!-- 库存数量 -->
-          <el-input v-model="form.quantity" placeholder="请输入库存数量" />
+          <el-input v-model="form.quantity" placeholder="请输入库存数量"/>
         </el-form-item>
 
       </el-form>
@@ -143,12 +163,13 @@
 </template>
 
 <script>
-import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
+import {listManagement, getManagement, delManagement, addManagement, updateManagement} from "@/api/stock/management"
 import {listWarehouse} from "@/api/bas/warehouse"
 import {pointOut} from "@/api/job/OutmydoJob"
+
 export default {
   name: "Management",
-  dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
+  dicts: ['product_status', 'stock_status', 'cargo_space_status', 'cargo_space_lock_status'],
   data() {
     return {
       // 遮罩层
@@ -176,7 +197,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         stockId: null,
-        cargoSpaceStockStatus:'2',
+        cargoSpaceStockStatus: '2',
         cargoSpaceName: null,
         stockStatus: null,
         productStatus: null,
@@ -218,13 +239,13 @@ export default {
       // 出口表单验证规则
       exitRules: {
         exitId: [
-          { required: true, message: "请选择出口", trigger: 'change' }
+          {required: true, message: "请选择出口", trigger: 'change'}
         ]
       },
       // 出口选项
       exitOptions: [
-        { exitId: '1', exitName: '一楼'},
-        { exitId: '2', exitName: '二楼'},
+        {exitId: '1', exitName: '一楼'},
+        {exitId: '2', exitName: '二楼'},
 
       ],
 
@@ -301,7 +322,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.stockId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -343,12 +364,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockIds = row.stockId || this.ids
-      this.$modal.confirm("是否确认删除库存信息编号为" + stockIds + "？").then(function() {
+      this.$modal.confirm("是否确认删除库存信息编号为" + stockIds + "？").then(function () {
         return delManagement(stockIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 指定货位出库按钮操作 */
     pointOut() {
@@ -362,7 +384,6 @@ export default {
       this.selectedStockData = selectedData;
 
 
-
       // 显示出口选择弹窗
       this.exitDialogVisible = true;
       this.exitForm.exitId = null;
diff --git a/ruoyi-ui/src/views/stock/record/index.vue b/ruoyi-ui/src/views/stock/record/index.vue
index bdd5ec5..6a069ef 100644
--- a/ruoyi-ui/src/views/stock/record/index.vue
+++ b/ruoyi-ui/src/views/stock/record/index.vue
@@ -25,10 +25,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="productName"> <!-- 物品名称 -->
+      <el-form-item label="品名" prop="productName"> <!-- 物品名称 -->
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />