Merge remote-tracking branch 'origin/main'

bin/serve-start.bat

@@ -0,0 +1,109 @@
+@echo off
+chcp 65001 >nul
+title 服务启动脚本（Nginx+Redis+Jar）
+setlocal enabledelayedexpansion
+
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: 请根据实际路径修改以下配置项
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: Nginx安装目录（nginx.exe所在路径）
+set "NGINX_PATH=D:\project\nginx"
+:: Redis安装目录（redis-server.exe所在路径）
+set "REDIS_PATH=D:\redis"
+:: Redis配置文件路径（可选，默认使用redis.windows.conf）
+set "REDIS_CONF=%REDIS_PATH%\redis.windows.conf"
+:: Jar包路径及名称
+set "JAR_PATH=D:\project\ft541\wms\wms.jar"
+:: Java启动参数（可根据需要调整内存、端口等）
+set "JAVA_OPTS=-Xms512m -Xmx1024m -Dserver.port=8080"
+:: Jar包启动后的窗口标题
+set "JAR_WINDOW_TITLE=业务应用服务"
+
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: 启动Nginx
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+echo.
+echo ==================================================
+echo 正在启动Nginx...
+echo ==================================================
+if not exist "%NGINX_PATH%\nginx.exe" (
+    echo [错误] Nginx可执行文件不存在：%NGINX_PATH%\nginx.exe
+    pause
+    exit /b 1
+)
+
+cd /d "%NGINX_PATH%"
+start "" nginx.exe
+:: 简单延迟检查是否启动成功
+timeout /t 2 /nobreak >nul
+tasklist | findstr /i "nginx.exe" >nul
+if %errorlevel% equ 0 (
+    echo [成功] Nginx已启动
+) else (
+    echo [失败] Nginx启动失败，请检查路径或配置
+)
+
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: 启动Redis
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+echo.
+echo ==================================================
+echo 正在启动Redis...
+echo ==================================================
+if not exist "%REDIS_PATH%\redis-server.exe" (
+    echo [错误] Redis可执行文件不存在：%REDIS_PATH%\redis-server.exe
+    pause
+    exit /b 1
+)
+if not exist "%REDIS_CONF%" (
+    echo [警告] Redis配置文件不存在：%REDIS_CONF%，将使用默认配置启动
+)
+
+cd /d "%REDIS_PATH%"
+start "Redis服务" redis-server.exe "%REDIS_CONF%"
+timeout /t 2 /nobreak >nul
+tasklist | findstr /i "redis-server.exe" >nul
+if %errorlevel% equ 0 (
+    echo [成功] Redis已启动
+) else (
+    echo [失败] Redis启动失败，请检查路径或配置
+)
+
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: 启动Jar包
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+echo.
+echo ==================================================
+echo 正在启动Jar包应用...
+echo ==================================================
+if not exist "%JAR_PATH%" (
+    echo [错误] Jar包文件不存在：%JAR_PATH%
+    pause
+    exit /b 1
+)
+
+:: 检查Java环境
+java -version >nul 2>&1
+if %errorlevel% neq 0 (
+    echo [错误] 未检测到Java环境，请确保已配置JAVA_HOME或添加java到环境变量
+    pause
+    exit /b 1
+)
+
+:: 启动Jar包（使用start命令单独打开窗口，避免阻塞）
+start "%JAR_WINDOW_TITLE%" java %JAVA_OPTS% -jar "%JAR_PATH%"
+echo [信息] Jar包启动命令已执行，应用启动可能需要几秒时间...
+echo [提示] 应用窗口标题：%JAR_WINDOW_TITLE%
+
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: 启动完成提示
+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+echo.
+echo ==================================================
+echo 所有服务启动指令已执行完成！
+echo 请检查各服务是否正常运行：
+echo - Nginx：访问 http://localhost 测试
+echo - Redis：使用客户端连接 localhost:6379 测试
+echo - Jar应用：访问 http://localhost:8080 测试（端口请根据实际配置调整）
+echo ==================================================
+pause

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

@@ -29,10 +29,10 @@ public class StockScreenServiceImpl implements IStockScreenService {
         List<BasStock> list = basStockService.selectBasStockListApi(new BasStock());
         BigDecimal total = BigDecimal.ZERO;
         for (BasStock s : list) {
-            String q = s.getQuantity();
+            BigDecimal quantity = s.getQuantity();
-            if (q != null && !q.trim().isEmpty()) {
+            if (quantity != null && quantity.doubleValue()!=0) {
                 try {
-                    total = total.add(new BigDecimal(q.trim()));
+                    total = total.add(quantity);
                 } catch (Exception ignored) {
                 }
             }

ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java

@@ -91,4 +91,6 @@ public interface BasCargoSpaceMapper extends BaseMapper<BasCargoSpace>
      * @return 库存信息集合
      */
     public List<BasCargoSpace> selectBasCargoSpaceListByRoadway(BasCargoSpace basCargoSpace);
+
+    void lockedCargoSpace(BasCargoSpace basCargoSpace);
 }

ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java

@@ -78,8 +78,14 @@ public class BasCargoSpaceServiceImpl extends ServiceImpl<BasCargoSpaceMapper,Ba
      * @return 结果
      */
     @Override
-    public int updateBasCargoSpace(BasCargoSpace basCargoSpace)
+    public int updateBasCargoSpace(BasCargoSpace basCargoSpace) {
-    {
+
+        BasCargoSpace oldBasCargoSpace = basCargoSpaceMapper.selectBasCargoSpaceByCargoSpaceId(basCargoSpace.getCargoSpaceId());
+        if (!oldBasCargoSpace.getLocked().equals(basCargoSpace.getLocked())){
+            //修改同一通道货位锁
+            basCargoSpaceMapper.lockedCargoSpace(basCargoSpace);
+        }
+        //修改货位信息
         return basCargoSpaceMapper.updateBasCargoSpace(basCargoSpace);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java

@@ -29,6 +29,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -196,7 +197,7 @@ public class CheckDifferenceRecordController extends BaseController {
                 newStock.setStockStatus("1"); // 设置库存状态为正常
                 newStock.setWarehouseId(record.getWarehouseId());
                 newStock.setInType("");
-                newStock.setOutQuantity("0");
+                newStock.setOutQuantity(BigDecimal.ZERO);
                 newStock.setInDate(DateUtil.formatDateTime(DateUtil.date()));
                 //供应商
                 newStock.setPhase(checkDifferenceRecordAddInfo.getSpare3());

ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java

@@ -6,6 +6,8 @@ import com.ruoyi.common.domain.ExtraField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.math.BigDecimal;
+
 /**
  * 盘点差异对象 check_difference_record
  *
@@ -55,11 +57,11 @@ public class CheckDifferenceRecord extends BaseEntity
 
     /** 原值 */
     @Excel(name = "原值")
-    private String oldQuantity;
+    private BigDecimal oldQuantity;
 
     /** 新值 */
     @Excel(name = "新值")
-    private String newQuantity;
+    private BigDecimal newQuantity;
 
     /** 操作方式 */
     @Excel(name = "操作方式")
@@ -210,22 +212,22 @@ public class CheckDifferenceRecord extends BaseEntity
         return customer;
     }
 
-    public void setOldQuantity(String oldQuantity)
+    public void setOldQuantity(BigDecimal oldQuantity)
     {
         this.oldQuantity = oldQuantity;
     }
 
-    public String getOldQuantity()
+    public BigDecimal getOldQuantity()
     {
         return oldQuantity;
     }
 
-    public void setNewQuantity(String newQuantity)
+    public void setNewQuantity(BigDecimal newQuantity)
     {
         this.newQuantity = newQuantity;
     }
 
-    public String getNewQuantity()
+    public BigDecimal getNewQuantity()
     {
         return newQuantity;
     }

ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -112,7 +113,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
                 return AjaxResult.error(MessageUtils.message("error.message9"));
             }
             checkDifferenceRecord.setCargoSpaceId(cargoSpaces.get(0).getCargoSpaceId());
-            checkDifferenceRecord.setOldQuantity("0");
+            checkDifferenceRecord.setOldQuantity(new BigDecimal(0));
         }else if (checkDifferenceRecord.getRecordType()==3){
             BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId());
             if (!"1".equals(basStock.getProductStatus())){
@@ -121,7 +122,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
             }
             basStock.setProductStatus("2");
             basStockService.updateBasStock(basStock);
-            checkDifferenceRecord.setNewQuantity("0");
+            checkDifferenceRecord.setNewQuantity(new BigDecimal(0));
             checkDifferenceRecord.setCargoSpaceId(basStock.getCargoSpaceId());
             checkDifferenceRecord.setTrayCode(basStock.getTrayCode());
             checkDifferenceRecord.setProductId(basStock.getProductId());

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @RestController
@@ -69,9 +70,9 @@ public class OutMydoJobController extends BaseController {
     @PreAuthorize("@ss.hasPermi('job:outmydoJob:pointOut')")
     @Log(title = "指定货位出库", businessType = BusinessType.INSERT)
     @RequestMapping("/pointOut")
-    public AjaxResult pointOut(@RequestParam("stockIds")String[] stockIds,@RequestParam("exitId")String exitId)
+    public AjaxResult pointOut(@RequestParam("groupCodingNo")String groupCodingNo, @RequestParam("outQuantity")String quantity)
     {
-        return mydoJobService.pointOut(stockIds,exitId);
+        return mydoJobService.pointOut(groupCodingNo,quantity);
     }
 
 

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

@@ -93,11 +93,11 @@ public interface IMydoJobService
 
     /**
      * 指定出库
-     * @param stockIds
+     * @param groupCodingNo
-     * @param exitId
+     * @param quantity
      * @return
      */
-    AjaxResult pointOut(String [] stockIds,String exitId);
+    AjaxResult pointOut(String groupCodingNo,String quantity);
 
     /**
      * 通过托盘码查询

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

@@ -402,12 +402,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
         stock.setStockId(basJobIdService.getJobId("KC"));
         stock.setCargoSpaceId(mydoJob.getCargoSpaceId());
         stock.setStockStatus("1");
-        stock.setOutQuantity("0");
+        stock.setOutQuantity(BigDecimal.ZERO);
         stock.setProductStatus(productStatus);
         stock.setLotNo(mydoJobDetail.getLotNo());
         stock.setInDate(DateUtil.formatDateTime(new Date()));
         stock.setProductGuid(mydoJobDetail.getProductGuid());
-        stock.setQuantity(mydoJobDetail.getInQuantity());
+        stock.setQuantity(Convert.toBigDecimal(mydoJobDetail.getInQuantity()));
         stock.setJobId(mydoJob.getJobId());
         stock.setTrayCode(mydoJob.getTrayCode());
         stock.setWarehouseId(mydoJob.getWarehouseId());
@@ -471,7 +471,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
                     if (basStock != null) {
                         BigDecimal outQuantity = Convert.toBigDecimal(basStock.getOutQuantity());
                         BigDecimal substract = outQuantity.subtract(Convert.toBigDecimal(detail.getOutQuantity()));
-                        basStock.setOutQuantity(String.valueOf(substract));
+                        basStock.setOutQuantity(substract);
                         basStockMapper.updateBasStock(basStock);
                     }
                     //修改单据数量
@@ -504,20 +504,18 @@ public class MydoJobServiceImpl implements IMydoJobService {
     }
 
     @Override
-    public AjaxResult pointOut(String[] stockIds, String exitId) {
+    public AjaxResult pointOut(String groupCodingNo, String quantity) {
         HashMap<String, Object> map = new HashMap<>();
         String msg = "";
         String Stringbuilder = "";
-        for (String stockId : stockIds) {
+        map.put("v_group_coding_no", groupCodingNo);
-            map.put("v_stock_id", stockId);
+        map.put("v_jh_quantity", quantity);
-            map.put("v_exit_id", exitId);
+        mydoJobMapper.pointOut(map);
-            mydoJobMapper.pointOut(map);
+        iToWcsService.pushOutMydoJob();
-            iToWcsService.pushOutMydoJob();
+        String result = map.get("v_result").toString();
-            String result = map.get("v_result").toString();
+        msg = map.get("v_resultmsg").toString();
-            msg=map.get("v_resultmsg").toString();
+        if (!"10".equals(result)) {
-            if (!"10".equals(result)) {
+            Stringbuilder += groupCodingNo + msg + "<br/>";
-                Stringbuilder += stockId + msg + "<br/>";
-            }
         }
         if (!StrUtil.isEmpty(Stringbuilder)) {
             return AjaxResult.warn(Stringbuilder);
@@ -563,7 +561,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
             if (basStock != null) {
                 BigDecimal outQuantity = Convert.toBigDecimal(basStock.getOutQuantity());
                 BigDecimal substract = outQuantity.subtract(Convert.toBigDecimal(mydoJobDetail.getOutQuantity()));
-                basStock.setOutQuantity(String.valueOf(substract));
+                basStock.setOutQuantity(substract);
                 basStockService.updateBasStock(basStock);
             }
 

ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/controller/ViewHandAllotStockController.java

@@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 手动分配库存Controller
+ * 指定出库Controller
  * 
  * @author ruoyi
- * @date 2025-09-16
+ * @date 2025-12-09
  */
 @RestController
 @RequestMapping("/out/handAllotStock")
@@ -35,7 +35,7 @@ public class ViewHandAllotStockController extends BaseController
     private IViewHandAllotStockService viewHandAllotStockService;
 
     /**
-     * 查询手动分配库存列表
+     * 查询指定出库列表
      */
     @PreAuthorize("@ss.hasPermi('out:handAllotStock:list')")
     @GetMapping("/list")
@@ -47,33 +47,33 @@ public class ViewHandAllotStockController extends BaseController
     }
 
     /**
-     * 导出手动分配库存列表
+     * 导出指定出库列表
      */
     @PreAuthorize("@ss.hasPermi('out:handAllotStock:export')")
-    @Log(title = "手动分配库存", businessType = BusinessType.EXPORT)
+    @Log(title = "指定出库", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ViewHandAllotStock viewHandAllotStock)
     {
         List<ViewHandAllotStock> list = viewHandAllotStockService.selectViewHandAllotStockList(viewHandAllotStock);
         ExcelUtil<ViewHandAllotStock> util = new ExcelUtil<ViewHandAllotStock>(ViewHandAllotStock.class);
-        util.exportExcel(response, list, "手动分配库存数据");
+        util.exportExcel(response, list, "指定出库数据");
     }
 
     /**
-     * 获取手动分配库存详细信息
+     * 获取指定出库详细信息
      */
     @PreAuthorize("@ss.hasPermi('out:handAllotStock:query')")
-    @GetMapping(value = "/{stockId}")
+    @GetMapping(value = "/{onlyIdentity}")
-    public AjaxResult getInfo(@PathVariable("stockId") String stockId)
+    public AjaxResult getInfo(@PathVariable("onlyIdentity") Long onlyIdentity)
     {
-        return success(viewHandAllotStockService.selectViewHandAllotStockByStockId(stockId));
+        return success(viewHandAllotStockService.selectViewHandAllotStockByOnlyIdentity(onlyIdentity));
     }
 
     /**
-     * 新增手动分配库存
+     * 新增指定出库
      */
     @PreAuthorize("@ss.hasPermi('out:handAllotStock:add')")
-    @Log(title = "手动分配库存", businessType = BusinessType.INSERT)
+    @Log(title = "指定出库", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ViewHandAllotStock viewHandAllotStock)
     {
@@ -81,10 +81,10 @@ public class ViewHandAllotStockController extends BaseController
     }
 
     /**
-     * 修改手动分配库存
+     * 修改指定出库
      */
     @PreAuthorize("@ss.hasPermi('out:handAllotStock:edit')")
-    @Log(title = "手动分配库存", businessType = BusinessType.UPDATE)
+    @Log(title = "指定出库", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ViewHandAllotStock viewHandAllotStock)
     {
@@ -92,13 +92,13 @@ public class ViewHandAllotStockController extends BaseController
     }
 
     /**
-     * 删除手动分配库存
+     * 删除指定出库
      */
     @PreAuthorize("@ss.hasPermi('out:handAllotStock:remove')")
-    @Log(title = "手动分配库存", businessType = BusinessType.DELETE)
+    @Log(title = "指定出库", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{stockIds}")
+	@DeleteMapping("/{onlyIdentitys}")
-    public AjaxResult remove(@PathVariable String[] stockIds)
+    public AjaxResult remove(@PathVariable Long[] onlyIdentitys)
     {
-        return toAjax(viewHandAllotStockService.deleteViewHandAllotStockByStockIds(stockIds));
+        return toAjax(viewHandAllotStockService.deleteViewHandAllotStockByOnlyIdentitys(onlyIdentitys));
     }
 }

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

@@ -1,407 +1,76 @@
 package com.ruoyi.out.handAllotStock.domain;
 
-import java.math.BigDecimal;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 手动分配库存对象 view_hand_allot_stock
+ * 指定出库对象 view_hand_allot_stock
  * 
  * @author ruoyi
- * @date 2025-09-16
+ * @date 2025-12-09
  */
 public class ViewHandAllotStock extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 库存编码 */
+    /** 唯一id */
-    @Excel(name = "库存编码")
+    @Excel(name = "唯一id")
-    private String stockId;
+    private Long onlyIdentity;
 
-    /** 货位编码 */
+    /** 列数 */
-    @Excel(name = "货位编码")
+    @Excel(name = "列数")
-    private String cargoSpaceId;
+    private Long theColumn;
 
-    /** 库存状态 */
+    /** 层数 */
-    @Excel(name = "库存状态")
+    @Excel(name = "层数")
-    private String stockStatus;
+    private Long theFloor;
 
-    /** 物品状态 */
+    /** 产品编码 */
-    @Excel(name = "物品状态")
+    @Excel(name = "产品编码")
-    private String productStatus;
-
-    /** 批次号 */
-    @Excel(name = "批次号")
-    private String lotNo;
-
-    /** 入库时间 */
-    @Excel(name = "入库时间")
-    private String inDate;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String backDate;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String productGuid;
-
-    /** 数量 */
-    @Excel(name = "数量")
-    private BigDecimal quantity;
-
-    /** 作业编码 */
-    @Excel(name = "作业编码")
-    private String jobId;
-
-    /** 托盘条码 */
-    @Excel(name = "托盘条码")
-    private String trayCode;
-
-    /** 出库数量 */
-    @Excel(name = "出库数量")
-    private String outQuantity;
-
-    /** 入库子单号 */
-    @Excel(name = "入库子单号")
-    private String stockinDetailId;
-
-    /** 入库单号 */
-    @Excel(name = "入库单号")
-    private String stockinId;
-
-    /** 入库类型 */
-    @Excel(name = "入库类型")
-    private String inType;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String inClassId;
-
-    /** 仓库编码 */
-    @Excel(name = "仓库编码")
-    private String warehouseId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String stackingId;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spare1;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare2;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String spare3;
-
-    /** 型号 */
-    @Excel(name = "型号")
-    private String spare4;
-
-    /** 颜色 */
-    @Excel(name = "颜色")
-    private String spare5;
-
-    /** 序列号 */
-    @Excel(name = "序列号")
-    private String spare6;
-
-    /** 品号 */
-    @Excel(name = "品号")
     private String productId;
 
-    /** 品名 */
+    /** 产品名称 */
-    @Excel(name = "品名")
+    @Excel(name = "产品名称")
     private String productName;
 
-    /** 电压 */
+    /** 通道组编码 */
-    @Excel(name = "电压")
+    @Excel(name = "通道组编码")
-    private String voltage;
+    private String groupCodingNo;
 
-    /** 功率 */
+    /** 库存数量 */
-    @Excel(name = "功率")
+    @Excel(name = "库存数量")
-    private String power;
+    private String quantity;
 
-    /** 相位 */
+    public void setOnlyIdentity(Long onlyIdentity) 
-    @Excel(name = "相位")
-    private String phase;
-
-    /** 净重 */
-    @Excel(name = "净重")
-    private String netWeight;
-
-    /** 毛重 */
-    @Excel(name = "毛重")
-    private String grossWeight;
-
-    /** 分销 */
-    @Excel(name = "分销")
-    private String distribution;
-
-    /** 机型 */
-    @Excel(name = "机型")
-    private String model;
-
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String orderId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare7;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String spare8;
-
-    /** 货位名称 */
-    @Excel(name = "货位名称")
-    private String cargoSpaceName;
-
-    public void setStockId(String stockId)
     {
-        this.stockId = stockId;
+        this.onlyIdentity = onlyIdentity;
     }
 
-    public String getStockId()
+    public Long getOnlyIdentity() 
     {
-        return stockId;
+        return onlyIdentity;
     }
 
-    public void setCargoSpaceId(String cargoSpaceId)
+    public void setTheColumn(Long theColumn) 
     {
-        this.cargoSpaceId = cargoSpaceId;
+        this.theColumn = theColumn;
     }
 
-    public String getCargoSpaceId()
+    public Long getTheColumn() 
     {
-        return cargoSpaceId;
+        return theColumn;
     }
 
-    public void setStockStatus(String stockStatus)
+    public void setTheFloor(Long theFloor) 
     {
-        this.stockStatus = stockStatus;
+        this.theFloor = theFloor;
     }
 
-    public String getStockStatus()
+    public Long getTheFloor() 
     {
-        return stockStatus;
+        return theFloor;
-    }
-
-    public void setProductStatus(String productStatus)
-    {
-        this.productStatus = productStatus;
-    }
-
-    public String getProductStatus()
-    {
-        return productStatus;
-    }
-
-    public void setLotNo(String lotNo)
-    {
-        this.lotNo = lotNo;
-    }
-
-    public String getLotNo()
-    {
-        return lotNo;
-    }
-
-    public void setInDate(String inDate)
-    {
-        this.inDate = inDate;
-    }
-
-    public String getInDate()
-    {
-        return inDate;
-    }
-
-    public void setBackDate(String backDate)
-    {
-        this.backDate = backDate;
-    }
-
-    public String getBackDate()
-    {
-        return backDate;
-    }
-
-    public void setProductGuid(String productGuid)
-    {
-        this.productGuid = productGuid;
-    }
-
-    public String getProductGuid()
-    {
-        return productGuid;
-    }
-
-    public void setQuantity(BigDecimal quantity)
-    {
-        this.quantity = quantity;
-    }
-
-    public BigDecimal getQuantity()
-    {
-        return quantity;
-    }
-
-    public void setJobId(String jobId)
-    {
-        this.jobId = jobId;
-    }
-
-    public String getJobId()
-    {
-        return jobId;
-    }
-
-    public void setTrayCode(String trayCode)
-    {
-        this.trayCode = trayCode;
-    }
-
-    public String getTrayCode()
-    {
-        return trayCode;
-    }
-
-    public void setOutQuantity(String outQuantity)
-    {
-        this.outQuantity = outQuantity;
-    }
-
-    public String getOutQuantity()
-    {
-        return outQuantity;
-    }
-
-    public void setStockinDetailId(String stockinDetailId)
-    {
-        this.stockinDetailId = stockinDetailId;
-    }
-
-    public String getStockinDetailId()
-    {
-        return stockinDetailId;
-    }
-
-    public void setStockinId(String stockinId)
-    {
-        this.stockinId = stockinId;
-    }
-
-    public String getStockinId()
-    {
-        return stockinId;
-    }
-
-    public void setInType(String inType)
-    {
-        this.inType = inType;
-    }
-
-    public String getInType()
-    {
-        return inType;
-    }
-
-    public void setInClassId(String inClassId)
-    {
-        this.inClassId = inClassId;
-    }
-
-    public String getInClassId()
-    {
-        return inClassId;
-    }
-
-    public void setWarehouseId(String warehouseId)
-    {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseId()
-    {
-        return warehouseId;
-    }
-
-    public void setStackingId(String stackingId)
-    {
-        this.stackingId = stackingId;
-    }
-
-    public String getStackingId()
-    {
-        return stackingId;
-    }
-
-    public void setSpare1(String spare1)
-    {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare1()
-    {
-        return spare1;
-    }
-
-    public void setSpare2(String spare2)
-    {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare2()
-    {
-        return spare2;
-    }
-
-    public void setSpare3(String spare3)
-    {
-        this.spare3 = spare3;
-    }
-
-    public String getSpare3()
-    {
-        return spare3;
-    }
-
-    public void setSpare4(String spare4)
-    {
-        this.spare4 = spare4;
-    }
-
-    public String getSpare4()
-    {
-        return spare4;
-    }
-
-    public void setSpare5(String spare5)
-    {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare5()
-    {
-        return spare5;
-    }
-
-    public void setSpare6(String spare6)
-    {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare6()
-    {
-        return spare6;
     }
 
     public void setProductId(String productId) 
@@ -424,156 +93,36 @@ public class ViewHandAllotStock extends BaseEntity
         return productName;
     }
 
-    public void setVoltage(String voltage)
+    public void setGroupCodingNo(String groupCodingNo) 
     {
-        this.voltage = voltage;
+        this.groupCodingNo = groupCodingNo;
     }
 
-    public String getVoltage()
+    public String getGroupCodingNo() 
     {
-        return voltage;
+        return groupCodingNo;
     }
 
-    public void setPower(String power)
+    public void setQuantity(String quantity) 
     {
-        this.power = power;
+        this.quantity = quantity;
     }
 
-    public String getPower()
+    public String getQuantity() 
     {
-        return power;
+        return quantity;
-    }
-
-    public void setPhase(String phase)
-    {
-        this.phase = phase;
-    }
-
-    public String getPhase()
-    {
-        return phase;
-    }
-
-    public void setNetWeight(String netWeight)
-    {
-        this.netWeight = netWeight;
-    }
-
-    public String getNetWeight()
-    {
-        return netWeight;
-    }
-
-    public void setGrossWeight(String grossWeight)
-    {
-        this.grossWeight = grossWeight;
-    }
-
-    public String getGrossWeight()
-    {
-        return grossWeight;
-    }
-
-    public void setDistribution(String distribution)
-    {
-        this.distribution = distribution;
-    }
-
-    public String getDistribution()
-    {
-        return distribution;
-    }
-
-    public void setModel(String model)
-    {
-        this.model = model;
-    }
-
-    public String getModel()
-    {
-        return model;
-    }
-
-    public void setOrderId(String orderId)
-    {
-        this.orderId = orderId;
-    }
-
-    public String getOrderId()
-    {
-        return orderId;
-    }
-
-    public void setSpare7(String spare7)
-    {
-        this.spare7 = spare7;
-    }
-
-    public String getSpare7()
-    {
-        return spare7;
-    }
-
-    public void setSpare8(String spare8)
-    {
-        this.spare8 = spare8;
-    }
-
-    public String getSpare8()
-    {
-        return spare8;
-    }
-
-    public void setCargoSpaceName(String cargoSpaceName)
-    {
-        this.cargoSpaceName = cargoSpaceName;
-    }
-
-    public String getCargoSpaceName()
-    {
-        return cargoSpaceName;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("stockId", getStockId())
+            .append("onlyIdentity", getOnlyIdentity())
-            .append("cargoSpaceId", getCargoSpaceId())
+            .append("theColumn", getTheColumn())
-            .append("stockStatus", getStockStatus())
+            .append("theFloor", getTheFloor())
-            .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("groupCodingNo", getGroupCodingNo())
-            .append("power", getPower())
+            .append("quantity", getQuantity())
-            .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();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/mapper/ViewHandAllotStockMapper.java

@@ -4,58 +4,58 @@ import java.util.List;
 import com.ruoyi.out.handAllotStock.domain.ViewHandAllotStock;
 
 /**
- * 手动分配库存Mapper接口
+ * 指定出库Mapper接口
  * 
  * @author ruoyi
- * @date 2025-09-16
+ * @date 2025-12-09
  */
 public interface ViewHandAllotStockMapper 
 {
     /**
-     * 查询手动分配库存
+     * 查询指定出库
      * 
-     * @param stockId 手动分配库存主键
+     * @param onlyIdentity 指定出库主键
-     * @return 手动分配库存
+     * @return 指定出库
      */
-    public ViewHandAllotStock selectViewHandAllotStockByStockId(String stockId);
+    public ViewHandAllotStock selectViewHandAllotStockByOnlyIdentity(Long onlyIdentity);
 
     /**
-     * 查询手动分配库存列表
+     * 查询指定出库列表
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
-     * @return 手动分配库存集合
+     * @return 指定出库集合
      */
     public List<ViewHandAllotStock> selectViewHandAllotStockList(ViewHandAllotStock viewHandAllotStock);
 
     /**
-     * 新增手动分配库存
+     * 新增指定出库
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
      * @return 结果
      */
     public int insertViewHandAllotStock(ViewHandAllotStock viewHandAllotStock);
 
     /**
-     * 修改手动分配库存
+     * 修改指定出库
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
      * @return 结果
      */
     public int updateViewHandAllotStock(ViewHandAllotStock viewHandAllotStock);
 
     /**
-     * 删除手动分配库存
+     * 删除指定出库
      * 
-     * @param stockId 手动分配库存主键
+     * @param onlyIdentity 指定出库主键
      * @return 结果
      */
-    public int deleteViewHandAllotStockByStockId(String stockId);
+    public int deleteViewHandAllotStockByOnlyIdentity(Long onlyIdentity);
 
     /**
-     * 批量删除手动分配库存
+     * 批量删除指定出库
      * 
-     * @param stockIds 需要删除的数据主键集合
+     * @param onlyIdentitys 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteViewHandAllotStockByStockIds(String[] stockIds);
+    public int deleteViewHandAllotStockByOnlyIdentitys(Long[] onlyIdentitys);
 }

ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/IViewHandAllotStockService.java

@@ -4,58 +4,58 @@ import java.util.List;
 import com.ruoyi.out.handAllotStock.domain.ViewHandAllotStock;
 
 /**
- * 手动分配库存Service接口
+ * 指定出库Service接口
  * 
  * @author ruoyi
- * @date 2025-09-16
+ * @date 2025-12-09
  */
 public interface IViewHandAllotStockService 
 {
     /**
-     * 查询手动分配库存
+     * 查询指定出库
      * 
-     * @param stockId 手动分配库存主键
+     * @param onlyIdentity 指定出库主键
-     * @return 手动分配库存
+     * @return 指定出库
      */
-    public ViewHandAllotStock selectViewHandAllotStockByStockId(String stockId);
+    public ViewHandAllotStock selectViewHandAllotStockByOnlyIdentity(Long onlyIdentity);
 
     /**
-     * 查询手动分配库存列表
+     * 查询指定出库列表
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
-     * @return 手动分配库存集合
+     * @return 指定出库集合
      */
     public List<ViewHandAllotStock> selectViewHandAllotStockList(ViewHandAllotStock viewHandAllotStock);
 
     /**
-     * 新增手动分配库存
+     * 新增指定出库
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
      * @return 结果
      */
     public int insertViewHandAllotStock(ViewHandAllotStock viewHandAllotStock);
 
     /**
-     * 修改手动分配库存
+     * 修改指定出库
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
      * @return 结果
      */
     public int updateViewHandAllotStock(ViewHandAllotStock viewHandAllotStock);
 
     /**
-     * 批量删除手动分配库存
+     * 批量删除指定出库
      * 
-     * @param stockIds 需要删除的手动分配库存主键集合
+     * @param onlyIdentitys 需要删除的指定出库主键集合
      * @return 结果
      */
-    public int deleteViewHandAllotStockByStockIds(String[] stockIds);
+    public int deleteViewHandAllotStockByOnlyIdentitys(Long[] onlyIdentitys);
 
     /**
-     * 删除手动分配库存信息
+     * 删除指定出库信息
      * 
-     * @param stockId 手动分配库存主键
+     * @param onlyIdentity 指定出库主键
      * @return 结果
      */
-    public int deleteViewHandAllotStockByStockId(String stockId);
+    public int deleteViewHandAllotStockByOnlyIdentity(Long onlyIdentity);
 }

ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java

@@ -8,10 +8,10 @@ import com.ruoyi.out.handAllotStock.domain.ViewHandAllotStock;
 import com.ruoyi.out.handAllotStock.service.IViewHandAllotStockService;
 
 /**
- * 手动分配库存Service业务层处理
+ * 指定出库Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-09-16
+ * @date 2025-12-09
  */
 @Service
 public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService 
@@ -20,22 +20,22 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
     private ViewHandAllotStockMapper viewHandAllotStockMapper;
 
     /**
-     * 查询手动分配库存
+     * 查询指定出库
      * 
-     * @param stockId 手动分配库存主键
+     * @param onlyIdentity 指定出库主键
-     * @return 手动分配库存
+     * @return 指定出库
      */
     @Override
-    public ViewHandAllotStock selectViewHandAllotStockByStockId(String stockId)
+    public ViewHandAllotStock selectViewHandAllotStockByOnlyIdentity(Long onlyIdentity)
     {
-        return viewHandAllotStockMapper.selectViewHandAllotStockByStockId(stockId);
+        return viewHandAllotStockMapper.selectViewHandAllotStockByOnlyIdentity(onlyIdentity);
     }
 
     /**
-     * 查询手动分配库存列表
+     * 查询指定出库列表
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
-     * @return 手动分配库存
+     * @return 指定出库
      */
     @Override
     public List<ViewHandAllotStock> selectViewHandAllotStockList(ViewHandAllotStock viewHandAllotStock)
@@ -44,9 +44,9 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
     }
 
     /**
-     * 新增手动分配库存
+     * 新增指定出库
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
      * @return 结果
      */
     @Override
@@ -56,9 +56,9 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
     }
 
     /**
-     * 修改手动分配库存
+     * 修改指定出库
      * 
-     * @param viewHandAllotStock 手动分配库存
+     * @param viewHandAllotStock 指定出库
      * @return 结果
      */
     @Override
@@ -68,26 +68,26 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
     }
 
     /**
-     * 批量删除手动分配库存
+     * 批量删除指定出库
      * 
-     * @param stockIds 需要删除的手动分配库存主键
+     * @param onlyIdentitys 需要删除的指定出库主键
      * @return 结果
      */
     @Override
-    public int deleteViewHandAllotStockByStockIds(String[] stockIds)
+    public int deleteViewHandAllotStockByOnlyIdentitys(Long[] onlyIdentitys)
     {
-        return viewHandAllotStockMapper.deleteViewHandAllotStockByStockIds(stockIds);
+        return viewHandAllotStockMapper.deleteViewHandAllotStockByOnlyIdentitys(onlyIdentitys);
     }
 
     /**
-     * 删除手动分配库存信息
+     * 删除指定出库信息
      * 
-     * @param stockId 手动分配库存主键
+     * @param onlyIdentity 指定出库主键
      * @return 结果
      */
     @Override
-    public int deleteViewHandAllotStockByStockId(String stockId)
+    public int deleteViewHandAllotStockByOnlyIdentity(Long onlyIdentity)
     {
-        return viewHandAllotStockMapper.deleteViewHandAllotStockByStockId(stockId);
+        return viewHandAllotStockMapper.deleteViewHandAllotStockByOnlyIdentity(onlyIdentity);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -55,11 +56,11 @@ public class BasStockMaintainRecord extends BaseEntity
 
     /** 初始数量 */
     @Excel(name = "初始数量")
-    private String oldQuantity;
+    private BigDecimal oldQuantity;
 
     /** 操作后数量 */
     @Excel(name = "操作后数量")
-    private String quantity;
+    private BigDecimal quantity;
 
     /** 操作 */
     @Excel(name = "操作", dictType="stock_maintain_method")
@@ -210,22 +211,22 @@ public class BasStockMaintainRecord extends BaseEntity
         return lotNo;
     }
 
-    public void setOldQuantity(String oldQuantity)
+    public void setOldQuantity(BigDecimal oldQuantity)
     {
         this.oldQuantity = oldQuantity;
     }
 
-    public String getOldQuantity()
+    public BigDecimal getOldQuantity()
     {
         return oldQuantity;
     }
 
-    public void setQuantity(String quantity)
+    public void setQuantity(BigDecimal quantity)
     {
         this.quantity = quantity;
     }
 
-    public String getQuantity()
+    public BigDecimal getQuantity()
     {
         return quantity;
     }

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -94,7 +95,7 @@ public class BasStock extends BaseEntity {
      * 库存数量
      */
     @Excel(name = "库存数量",sort=10)
-    private String quantity;
+    private BigDecimal quantity;
 
     /**
      * 作业ID
@@ -153,7 +154,7 @@ public class BasStock extends BaseEntity {
     /**
      * 出库数量
      */
-    private String outQuantity;
+    private BigDecimal outQuantity;
 
     /**
      * 入库班组ID

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.stock.stock.service.impl;
 
 import cn.hutool.core.util.IdUtil;
+import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -125,8 +126,22 @@ public class BasStockServiceImpl implements IBasStockService
     public int updateBasStock(BasStock basStock)
     {
         BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId());
-        insertMaintainRecord(oldBasStock,basStock,"2");
+        //修改库存记录
-        insertFreezeRecord(oldBasStock,basStock);
+        insertMaintainRecord(oldBasStock, basStock, "2");
+        //修改冻结记录
+        insertFreezeRecord(oldBasStock, basStock);
+        //修改货位
+        if (!oldBasStock.getCargoSpaceId().equals(basStock.getCargoSpaceId())){
+            BasCargoSpace oldBasCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(oldBasStock.getCargoSpaceId());
+            oldBasCargoSpace.setStatus("1");
+            oldBasCargoSpace.setTrayCode("");
+            basCargoSpaceService.updateBasCargoSpace(oldBasCargoSpace);
+            BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(basStock.getCargoSpaceId());
+            basCargoSpace.setStatus("2");
+            basCargoSpace.setTrayCode(oldBasCargoSpace.getTrayCode());
+            basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
+        }
+        //修改货位
         return basStockMapper.updateBasStock(basStock);
     }
 

ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml

@@ -188,6 +188,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where cargo_space_id = #{cargoSpaceId}
     </update>
+    <update id="lockedCargoSpace">
+        update bas_cargo_space
+        set locked = #{locked}
+        where group_coding_no in (
+            select group_coding_no from bas_cargo_space where cargo_space_id = #{cargoSpaceId}
+            )
+        and group_coding > #{groupCoding}
+    </update>
 
     <delete id="deleteBasCargoSpaceByCargoSpaceId" parameterType="String">
         delete from bas_cargo_space where cargo_space_id = #{cargoSpaceId}

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -217,8 +217,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="pointOut" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_point_out(
-        #{v_stock_id,jdbcType=VARCHAR,mode=IN},
+        #{v_group_coding_no,jdbcType=VARCHAR,mode=IN},
-        #{v_exit_id,jdbcType=VARCHAR,mode=IN},
+        #{v_jh_quantity,jdbcType=NUMERIC,mode=IN},
         #{v_result,mode=OUT,jdbcType=INTEGER},
         #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
         )}

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

@@ -5,231 +5,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.out.handAllotStock.mapper.ViewHandAllotStockMapper">
     
     <resultMap type="ViewHandAllotStock" id="ViewHandAllotStockResult">
-        <result property="stockId"    column="stock_id"    />
+        <result property="onlyIdentity"    column="only_identity"    />
-        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="theColumn"    column="the_column"    />
-        <result property="stockStatus"    column="stock_status"    />
+        <result property="theFloor"    column="the_floor"    />
-        <result property="productStatus"    column="product_status"    />
-        <result property="lotNo"    column="lot_no"    />
-        <result property="inDate"    column="in_date"    />
-        <result property="backDate"    column="back_date"    />
-        <result property="productGuid"    column="product_guid"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="jobId"    column="job_id"    />
-        <result property="trayCode"    column="tray_code"    />
-        <result property="outQuantity"    column="out_quantity"    />
-        <result property="stockinDetailId"    column="stockin_detail_id"    />
-        <result property="stockinId"    column="stockin_id"    />
-        <result property="inType"    column="in_type"    />
-        <result property="inClassId"    column="in_class_id"    />
-        <result property="warehouseId"    column="warehouse_id"    />
-        <result property="stackingId"    column="stacking_id"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
         <result property="productId"    column="product_id"    />
         <result property="productName"    column="product_name"    />
-        <result property="voltage"    column="voltage"    />
+        <result property="groupCodingNo"    column="group_coding_no"    />
-        <result property="power"    column="power"    />
+        <result property="quantity"    column="quantity"    />
-        <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
-        <result property="cargoSpaceName"    column="cargo_space_name"    />
     </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 only_identity, the_column, the_floor, product_id, product_name, group_coding_no, quantity from view_hand_allot_stock
     </sql>
 
     <select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
         <include refid="selectViewHandAllotStockVo"/>
         <where>  
-            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
+            <if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="theColumn != null "> and the_column = #{theColumn}</if>
-            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="theFloor != null "> and the_floor = #{theFloor}</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="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>
-            <if test="quantity != null "> and quantity = #{quantity}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
-            <if test="inClassId != null  and inClassId != ''"> and in_class_id = #{inClassId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id = #{stackingId}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
             <if test="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>
+            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no = #{groupCodingNo}</if>
-            <if test="power != null  and power != ''"> and power = #{power}</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
-            <if test="netWeight != null "> and net_weight = #{netWeight}</if>
-            <if test="grossWeight != null "> and gross_weight = #{grossWeight}</if>
-            <if test="distribution != null  and distribution != ''"> and distribution = #{distribution}</if>
-            <if test="model != null  and model != ''"> and model = #{model}</if>
-            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
-            <if test="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>
         </where>
     </select>
     
-    <select id="selectViewHandAllotStockByStockId" parameterType="String" resultMap="ViewHandAllotStockResult">
+    <select id="selectViewHandAllotStockByOnlyIdentity" parameterType="Long" resultMap="ViewHandAllotStockResult">
         <include refid="selectViewHandAllotStockVo"/>
-        where stock_id = #{stockId}
+        where only_identity = #{onlyIdentity}
     </select>
 
     <insert id="insertViewHandAllotStock" parameterType="ViewHandAllotStock">
         insert into view_hand_allot_stock
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">stock_id,</if>
+            <if test="onlyIdentity != null">only_identity,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="theColumn != null">the_column,</if>
-            <if test="stockStatus != null">stock_status,</if>
+            <if test="theFloor != null">the_floor,</if>
-            <if test="productStatus != null">product_status,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="inDate != null">in_date,</if>
-            <if test="backDate != null">back_date,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="quantity != null">quantity,</if>
-            <if test="jobId != null">job_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="outQuantity != null">out_quantity,</if>
-            <if test="stockinDetailId != null">stockin_detail_id,</if>
-            <if test="stockinId != null">stockin_id,</if>
-            <if test="inType != null">in_type,</if>
-            <if test="inClassId != null">in_class_id,</if>
-            <if test="warehouseId != null">warehouse_id,</if>
-            <if test="stackingId != null">stacking_id,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
             <if test="productId != null">product_id,</if>
             <if test="productName != null">product_name,</if>
-            <if test="voltage != null">voltage,</if>
+            <if test="groupCodingNo != null">group_coding_no,</if>
-            <if test="power != null">power,</if>
+            <if test="quantity != null">quantity,</if>
-            <if test="phase != null">phase,</if>
-            <if test="netWeight != null">net_weight,</if>
-            <if test="grossWeight != null">gross_weight,</if>
-            <if test="distribution != null">distribution,</if>
-            <if test="model != null">model,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="spare7 != null">spare7,</if>
-            <if test="spare8 != null">spare8,</if>
-            <if test="cargoSpaceName != null">cargo_space_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockId != null and stockId != ''">#{stockId},</if>
+            <if test="onlyIdentity != null">#{onlyIdentity},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="theColumn != null">#{theColumn},</if>
-            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="theFloor != null">#{theFloor},</if>
-            <if test="productStatus != null">#{productStatus},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="inDate != null">#{inDate},</if>
-            <if test="backDate != null">#{backDate},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="outQuantity != null">#{outQuantity},</if>
-            <if test="stockinDetailId != null">#{stockinDetailId},</if>
-            <if test="stockinId != null">#{stockinId},</if>
-            <if test="inType != null">#{inType},</if>
-            <if test="inClassId != null">#{inClassId},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="stackingId != null">#{stackingId},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
             <if test="productId != null">#{productId},</if>
             <if test="productName != null">#{productName},</if>
-            <if test="voltage != null">#{voltage},</if>
+            <if test="groupCodingNo != null">#{groupCodingNo},</if>
-            <if test="power != null">#{power},</if>
+            <if test="quantity != null">#{quantity},</if>
-            <if test="phase != null">#{phase},</if>
-            <if test="netWeight != null">#{netWeight},</if>
-            <if test="grossWeight != null">#{grossWeight},</if>
-            <if test="distribution != null">#{distribution},</if>
-            <if test="model != null">#{model},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="spare7 != null">#{spare7},</if>
-            <if test="spare8 != null">#{spare8},</if>
-            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
          </trim>
     </insert>
 
     <update id="updateViewHandAllotStock" parameterType="ViewHandAllotStock">
         update view_hand_allot_stock
         <trim prefix="SET" suffixOverrides=",">
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="theColumn != null">the_column = #{theColumn},</if>
-            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="theFloor != null">the_floor = #{theFloor},</if>
-            <if test="productStatus != null">product_status = #{productStatus},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="inDate != null">in_date = #{inDate},</if>
-            <if test="backDate != null">back_date = #{backDate},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="jobId != null">job_id = #{jobId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
-            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
-            <if test="stockinId != null">stockin_id = #{stockinId},</if>
-            <if test="inType != null">in_type = #{inType},</if>
-            <if test="inClassId != null">in_class_id = #{inClassId},</if>
-            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
-            <if test="stackingId != null">stacking_id = #{stackingId},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
             <if test="productId != null">product_id = #{productId},</if>
             <if test="productName != null">product_name = #{productName},</if>
-            <if test="voltage != null">voltage = #{voltage},</if>
+            <if test="groupCodingNo != null">group_coding_no = #{groupCodingNo},</if>
-            <if test="power != null">power = #{power},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="phase != null">phase = #{phase},</if>
-            <if test="netWeight != null">net_weight = #{netWeight},</if>
-            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
-            <if test="distribution != null">distribution = #{distribution},</if>
-            <if test="model != null">model = #{model},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
-            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
         </trim>
-        where stock_id = #{stockId}
+        where only_identity = #{onlyIdentity}
     </update>
 
-    <delete id="deleteViewHandAllotStockByStockId" parameterType="String">
+    <delete id="deleteViewHandAllotStockByOnlyIdentity" parameterType="Long">
-        delete from view_hand_allot_stock where stock_id = #{stockId}
+        delete from view_hand_allot_stock where only_identity = #{onlyIdentity}
     </delete>
 
-    <delete id="deleteViewHandAllotStockByStockIds" parameterType="String">
+    <delete id="deleteViewHandAllotStockByOnlyIdentitys" parameterType="String">
-        delete from view_hand_allot_stock where stock_id in 
+        delete from view_hand_allot_stock where only_identity in 
-        <foreach item="stockId" collection="array" open="(" separator="," close=")">
+        <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
-            #{stockId}
+            #{onlyIdentity}
         </foreach>
     </delete>
 </mapper>

ruoyi-ui/src/api/job/OutmydoJob.js

@@ -35,13 +35,13 @@ export function hangInvalidCheckJob(data) {
   })
 }
 
-export function pointOut(stockIds,exitId) {
+export function pointOut(groupCodingNo, outQuantity) {
   return request({
     url: '/job/outmydoJob/pointOut',
     method: 'get',
     params: {
-      stockIds: stockIds.join(',') ,// 将数组转换为逗号分隔的字符串
+      groupCodingNo: groupCodingNo,
-      exitId:exitId
+      outQuantity: outQuantity
     }
   })
 }

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

@@ -159,7 +159,7 @@
       <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" />
       <!-- 排 -->

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

@@ -135,8 +135,8 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
 
-      <el-table-column label="仓库" align="left" prop="warehouseName" />
+      <!-- <el-table-column label="仓库" align="left" prop="warehouseName" /> -->
-      <el-table-column label="出口" align="left" prop="exitId"/> <!-- 出口ID -->
+      <!-- <el-table-column label="出口" align="left" prop="exitId"/> 出口ID -->
       <el-table-column label="创建时间" align="left" prop="createTime" width="180"/> <!-- 创建时间 -->
       <el-table-column label="开始时间" align="left" prop="startTime" width="180"/> <!-- 开始时间 -->
       <el-table-column label="结束时间" align="left" prop="finishTime" width="180"/> <!-- 结束时间 -->
@@ -154,44 +154,13 @@
 
     <el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" /> <!-- 子任务ID -->
+      <el-table-column label="子任务ID" align="left" prop="jobDetailId"  /> <!-- 子任务ID -->
-      <el-table-column label="库存ID" align="left" prop="stockId" width="160" /> <!-- 库存ID -->
+      <el-table-column label="库存ID" align="left" prop="stockId"  /> <!-- 库存ID -->
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" /> <!-- 子单据ID -->
+      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" /> <!-- 子单据ID -->
       <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="printDate" />
-      <el-table-column label="供应商" align="left" prop="supplierName" />
-      <el-table-column label="来源" align="left" prop="spare1" ><!--来源-->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="left" prop="spare2" ><!--用途-->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.turnover_type" :value="scope.row.spare2"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="套账" align="left" prop="spare3" ><!--用途-->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="用途" align="left" prop="spare4" ><!--用途-->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.spare4"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="台次" align="left" prop="spare5" />
-      <el-table-column label="合同号" align="left" prop="spare6" />
-      <el-table-column label="件次" align="left" prop="spare7" />
-      <el-table-column label="质量等级" align="left" prop="spare8" ><!--用途-->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="管理号" align="left" prop="spare9" />
     </el-table>
 
     <pagination

ruoyi-ui/src/views/kpi/spacePlan/index.vue

@@ -227,7 +227,7 @@ this.getWarehouseList()
             {
               // 图例：出库分配
               name: '出库分配',
-              itemStyle: { color: '#FF0000' }
+              itemStyle: { color: '#00cc00' }
             },
             {
               // 图例：入库需盘点

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

@@ -531,13 +531,13 @@ export default {
 
 
       // 如果是审核操作(status=2)，显示弹窗选择出口
-      if (status === 2 || status === 3) {
+      // if (status === 2 || status === 3) {
-        this.currentAuditStatus = status
+      //   this.currentAuditStatus = status
 
-        this.auditDialogVisible = true
+      //   this.auditDialogVisible = true
-        this.auditForm.exitId = null
+      //   this.auditForm.exitId = null
-        return
+      //   return
-      }
+      // }
 
       const params = {
         stockoutIds: this.selectedRows.map(row => row.stockoutId),

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

@@ -1,36 +1,35 @@
 <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-form-item label="层数" prop="theFloor"><!-- 层数 -->
         <el-input
-          v-model="queryParams.stockId"
+          v-model="queryParams.theFloor"
-          placeholder="请输入库存编码"
+          placeholder="请输入层数"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="货位名称" prop="cargoSpaceName"><!-- 货位id -->
+      <el-form-item label="列数" prop="theColumn"><!-- 列数 -->
         <el-input
-          v-model="queryParams.cargoSpaceName"
+          v-model="queryParams.theColumn"
-          placeholder="请输入货位名称"
+          placeholder="请输入列数"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单号" prop="orderId"><!-- 货位id -->
+      <el-form-item label="通道编码" prop="groupCodingNo"><!-- 货位id -->
         <el-input
-          v-model="queryParams.orderId"
+          v-model="queryParams.groupCodingNo"
-          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"
         />
@@ -59,52 +58,13 @@
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="库存编码" align="center" prop="stockId" />
+      <el-table-column label="唯一id" align="center" prop="onlyIdentity" />
-      <el-table-column label="仓库" align="center" prop="warehouseId" >
+      <el-table-column label="列数" align="center" prop="theColumn" />
-        <template slot-scope="scope">
+      <el-table-column label="层数" align="center" prop="theFloor" />
-          <dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
+      <el-table-column label="产品编码" align="center" prop="productId" />
-        </template>
+      <el-table-column label="产品名称" align="center" prop="productName" />
-      </el-table-column>
+      <el-table-column label="通道组编码" align="center" prop="groupCodingNo" />
-      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
+      <el-table-column label="库存数量" align="center" prop="quantity" />
-      <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="netWeight" />
-      <el-table-column label="图号" align="center" prop="grossWeight" />
-      <el-table-column label="库存数量" align="center" prop="quantity" width="80" />
-      <el-table-column label="来源" align="center" prop="spare1" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
-        </template>
-
-      </el-table-column>
-      <el-table-column label="套账" align="center" prop="spare3" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="用途" align="center" prop="spare4" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.purpose_type" :value="scope.row.model"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="台次" align="center" prop="spare5" />
-      <el-table-column label="入库单价" align="center" prop="spare6" />
-      <el-table-column label="状态" align="center" prop="voltage" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.turnover_type" :value="scope.row.voltage"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="件次" align="center" prop="power" />
-      <!--        <el-table-column label="供应商" align="center" prop="phase" />-->
-      <el-table-column label="供应商" align="center" prop="inClassId" />
-      <el-table-column label="管理号" align="center" prop="distribution" />
-      <el-table-column label="产品质量" align="center" prop="spare8" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="合同号" align="center" prop="orderId" />
 
     </el-table>
 
@@ -148,17 +108,21 @@
     </el-dialog>
 
     <!-- 出口选择弹窗 -->
-    <el-dialog title="选择出口" :visible.sync="exitDialogVisible" width="400px" append-to-body>
+    <el-dialog title="指定出库" :visible.sync="exitDialogVisible" width="420px" append-to-body>
-      <el-form ref="exitForm" :model="exitForm" :rules="exitRules" label-width="80px">
+      <el-form ref="exitForm" :model="exitForm" :rules="exitRules" label-width="90px">
-        <el-form-item label="选择出口" prop="exitId">
+        <el-form-item label="出库数量" prop="outQuantity">
-          <el-select v-model="exitForm.exitId" placeholder="请选择出口" clearable>
+          <el-input-number
-            <el-option
+            v-model="exitForm.outQuantity"
-              v-for="item in exitOptions"
+            :min="1"
-              :key="item.exitId"
+            :max="selectedTotalQuantity"
-              :label="item.exitName"
+            :step="1"
-              :value="item.exitId"
+            :precision="2"
-            />
+            controls-position="right"
-          </el-select>
+            placeholder="请输入出库数量"
+          />
+          <div class="no-wrap" style="margin-top: 6px; color: #909399; font-size: 12px;">
+            可用库存：{{ selectedTotalQuantity }}
+          </div>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -202,31 +166,11 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        stockId: null,
+        theFloor: null,
-        cargoSpaceStockStatus:'2',
+        theColumn: null,
-        cargoSpaceName: null,
+        groupCodingNo: null,
-        stockStatus: null,
+        productId: null,
-        productStatus: null,
+        productName: null,
-        lotNo: null,
-        inDate: null,
-        backDate: null,
-        productGuid: null,
-        quantity: null,
-        jobId: null,
-        trayCode: null,
-        outQuantity: null,
-        stockinDetailId: null,
-        stockinId: null,
-        inType: null,
-        inClassId: null,
-        warehouseId: null,
-        stackingId: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null
       },
       // 表单参数
       form: {},
@@ -240,23 +184,21 @@ export default {
       exitDialogVisible: false,
       // 出口表单数据
       exitForm: {
-        exitId: null
+        exitId: null,
+        outQuantity: null
       },
       // 出口表单验证规则
       exitRules: {
-        exitId: [
+        outQuantity: [
-          { required: true, message: "请选择出口", trigger: 'change' }
+          { required: true, message: "请输入出库数量", trigger: 'change' },
+          { validator: this.validateOutQuantity, trigger: 'blur' }
         ]
       },
-      // 出口选项
-      exitOptions: [
-        { exitId: '1', exitName: '1'},
-        { exitId: '2', exitName: '2'},
 
-      ],
 
       // 选中的库存数据
-      selectedStockData: []
+      selectedStockData: [],
+      selectedTotalQuantity: 0
     }
   },
   created() {
@@ -264,6 +206,20 @@ export default {
     this.getWarehouseList();
   },
   methods: {
+    validateOutQuantity(rule, value, callback) {
+      if (value === null || value === undefined || value === '') {
+        return callback(new Error('请输入出库数量'))
+      }
+      const num = parseFloat(value)
+      if (isNaN(num) || num <= 0) {
+        return callback(new Error('出库数量必须大于0'))
+      }
+      const max = this.selectedTotalQuantity || 0
+      if (num > max) {
+        return callback(new Error('出库数量不能超过可用库存'))
+      }
+      return callback()
+    },
     /** 获取仓库列表 */
     getWarehouseList() {
       listWarehouse().then(response => {
@@ -387,12 +343,17 @@ export default {
       // 获取选中的完整数据
       const selectedData = this.managementList.filter(item => this.ids.includes(item.stockId));
       this.selectedStockData = selectedData;
+      this.selectedTotalQuantity = selectedData.reduce((sum, row) => {
+        const q = parseFloat(row.quantity)
+        return sum + (isNaN(q) ? 0 : q)
+      }, 0)
 
 
 
       // 显示出口选择弹窗
       this.exitDialogVisible = true;
       this.exitForm.exitId = null;
+      this.exitForm.outQuantity = null;
     },
 
 
@@ -400,14 +361,32 @@ export default {
     submitPointOut() {
       this.$refs["exitForm"].validate(valid => {
         if (valid) {
-          const stockIds = this.ids;
+          if (this.ids.length !== 1) {
-          // 调用API将stockIds数组和出口信息传给后端
+            this.$modal.msgError('请选择一条库存进行出库')
-          console.log("指定货位出库：", stockIds, this.exitForm.exitId)
+            return
-          pointOut(stockIds, this.exitForm.exitId).then(response => {
+          }
-            this.$modal.msgSuccess(response.msg);
+          const selectedRow = this.managementList.find(item => item.stockId === this.ids[0])
-            this.getList();
+          if (!selectedRow) {
-            this.exitDialogVisible = false;
+            this.$modal.msgError('未找到选中库存数据')
-          });
+            return
+          }
+          const outQty = parseFloat(this.exitForm.outQuantity)
+          if (isNaN(outQty) || outQty <= 0) {
+            this.$modal.msgError('请输入有效的出库数量')
+            return
+          }
+          const max = parseFloat(selectedRow.quantity) || 0
+          if (outQty > max) {
+            this.$modal.msgError('出库数量不能超过选择的库存数量')
+            return
+          }
+          const groupCodingNo = selectedRow.groupCodingNo
+          console.log('指定货位出库：', groupCodingNo, outQty)
+          pointOut(groupCodingNo, outQty).then(response => {
+            this.$modal.msgSuccess(response.msg)
+            this.getList()
+            this.exitDialogVisible = false
+          })
         }
       })
     },
@@ -416,6 +395,7 @@ export default {
     cancelExit() {
       this.exitDialogVisible = false;
       this.exitForm.exitId = null;
+      this.exitForm.outQuantity = null;
     },
     /** 导出按钮操作 */
     handleExport() {