库存页面 入库页面手动完成和手动作废

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

@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 任务表Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-23
  */
@@ -101,4 +101,26 @@ public class MydoJobController extends BaseController
     {
         return toAjax(mydoJobService.deleteMydoJobByJobIds(jobIds));
     }
+
+    /**
+     * 手动作废任务表
+     */
+    @PreAuthorize("@ss.hasPermi('job:mydoJob:manualInvalidation')")
+    @Log(title = "任务表", businessType = BusinessType.DELETE)
+    @PostMapping("/manualInvalidation")
+    public AjaxResult manualInvalidation(@RequestBody MydoJob mydoJob)
+    {
+        return mydoJobService.manualInvalidation(mydoJob);
+    }
+
+    /**
+     * 手动完成任务表
+     */
+    @PreAuthorize("@ss.hasPermi('job:mydoJob:manualCompleted')")
+    @Log(title = "任务表", businessType = BusinessType.DELETE)
+    @PostMapping("/manualCompleted")
+    public AjaxResult manualCompleted(@RequestBody MydoJob mydoJob)
+    {
+        return mydoJobService.manualCompleted(mydoJob);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java

@@ -5,15 +5,15 @@ import com.ruoyi.job.mydojob.domain.MydoJob;
 
 /**
  * 任务表Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-23
  */
-public interface MydoJobMapper 
+public interface MydoJobMapper
 {
     /**
      * 查询任务表
-     * 
+     *
      * @param jobId 任务表主键
      * @return 任务表
      */
@@ -21,7 +21,7 @@ public interface MydoJobMapper
 
     /**
      * 查询任务表列表
-     * 
+     *
      * @param mydoJob 任务表
      * @return 任务表集合
      */
@@ -29,7 +29,7 @@ public interface MydoJobMapper
 
     /**
      * 新增任务表
-     * 
+     *
      * @param mydoJob 任务表
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface MydoJobMapper
 
     /**
      * 修改任务表
-     * 
+     *
      * @param mydoJob 任务表
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface MydoJobMapper
 
     /**
      * 删除任务表
-     * 
+     *
      * @param jobId 任务表主键
      * @return 结果
      */
@@ -53,9 +53,11 @@ public interface MydoJobMapper
 
     /**
      * 批量删除任务表
-     * 
+     *
      * @param jobIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteMydoJobByJobIds(String[] jobIds);
+
+    void insertHistory(String jobId);
 }

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

@@ -1,19 +1,21 @@
 package com.ruoyi.job.mydojob.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 
 /**
  * 任务表Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-23
  */
-public interface IMydoJobService 
+public interface IMydoJobService
 {
     /**
      * 查询任务表
-     * 
+     *
      * @param jobId 任务表主键
      * @return 任务表
      */
@@ -21,7 +23,7 @@ public interface IMydoJobService
 
     /**
      * 查询任务表列表
-     * 
+     *
      * @param mydoJob 任务表
      * @return 任务表集合
      */
@@ -29,7 +31,7 @@ public interface IMydoJobService
 
     /**
      * 新增任务表
-     * 
+     *
      * @param mydoJob 任务表
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface IMydoJobService
 
     /**
      * 修改任务表
-     * 
+     *
      * @param mydoJob 任务表
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface IMydoJobService
 
     /**
      * 批量删除任务表
-     * 
+     *
      * @param jobIds 需要删除的任务表主键集合
      * @return 结果
      */
@@ -53,9 +55,23 @@ public interface IMydoJobService
 
     /**
      * 删除任务表信息
-     * 
+     *
      * @param jobId 任务表主键
      * @return 结果
      */
     public int deleteMydoJobByJobId(String jobId);
+
+    /**
+     * 手动作废任务
+     * @param mydoJob
+     * @return
+     */
+    AjaxResult manualInvalidation(MydoJob mydoJob);
+
+    /**
+     * 手动完成任务
+     * @param mydoJob
+     * @return
+     */
+    AjaxResult manualCompleted(MydoJob mydoJob);
 }

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

@@ -1,16 +1,27 @@
 package com.ruoyi.job.mydojob.service.impl;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import com.ruoyi.bas.basJobId.service.IBasJobIdService;
 import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
+import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
+import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.service.IBasStockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 任务表Service业务层处理
@@ -27,6 +38,13 @@ public class MydoJobServiceImpl implements IMydoJobService
     private IBasJobIdService basJobIdService;
     @Autowired
     private IBasTaskNoService basTaskNoService;
+    @Autowired
+    private IMydoJobDetailService mydoJobDetailService;
+    @Autowired
+    private IInStockinDetailService inStockinDetailService;
+    @Autowired
+    private IBasStockService basStockService;
+
 
     /**
      * 查询任务表
@@ -102,4 +120,95 @@ public class MydoJobServiceImpl implements IMydoJobService
     {
         return mydoJobMapper.deleteMydoJobByJobId(jobId);
     }
+    /**
+     * 手动作废任务表
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult manualInvalidation(MydoJob mydoJob) {
+        String jobId = mydoJob.getJobId();
+        MydoJob job = selectMydoJobByJobId(jobId);
+        if (job == null){
+            return AjaxResult.warn("任务不存在");
+        }
+        MydoJobDetail param = new MydoJobDetail();
+        param.setJobId(jobId);
+        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param);
+
+        for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
+            String inOrOutDId = mydoJobDetail.getInOrOutDId();
+            InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
+            BigDecimal stockInNum = Convert.toBigDecimal(inStockinDetail.getScanNum());
+            BigDecimal jobInNum = Convert.toBigDecimal(mydoJobDetail.getInQuantity());
+            BigDecimal subtract = stockInNum.subtract(jobInNum);
+            inStockinDetail.setScanNum(Convert.toStr(subtract));
+            inStockinDetailService.updateInStockinDetail(inStockinDetail);
+        }
+        mydoJob.setStatus("5");
+        updateMydoJob(mydoJob);
+        //插入历史表
+        insertHistory(mydoJob.getJobId());
+        return AjaxResult.success();
+    }
+
+    /**
+     * 插入历史表
+     * @param jobId
+     */
+    private void insertHistory(String jobId) {
+        mydoJobMapper.insertHistory(jobId);
+        mydoJobDetailService.insertHistory(jobId);
+        mydoJobMapper.deleteMydoJobByJobId(jobId);
+        mydoJobDetailService.deleteMydoJobDetailByJobId(jobId);
+    }
+
+    /**
+     * 手动完成任务表
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult manualCompleted(MydoJob mydoJob) {
+        //插入库存
+
+        String jobId = mydoJob.getJobId();
+        MydoJob job = selectMydoJobByJobId(jobId);
+        if (job == null){
+            return AjaxResult.warn("任务不存在");
+        }
+        MydoJobDetail param = new MydoJobDetail();
+        param.setJobId(jobId);
+        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param);
+        if (CollUtil.isNotEmpty(mydoJobDetails)){
+            List<BasStock> list = new ArrayList<>();
+            for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
+                list.add(getStockByInStockinDetail(mydoJobDetail,job));
+            }
+            basStockService.insertBasStockList(list);
+            mydoJob.setStatus("4");
+            updateMydoJob(mydoJob);
+            //插入历史表
+            insertHistory(mydoJob.getJobId());
+        }
+
+        return AjaxResult.success();
+    }
+
+    private BasStock getStockByInStockinDetail(MydoJobDetail mydoJobDetail,MydoJob mydoJob) {
+        BasStock stock = new BasStock();
+        stock.setStockId(basJobIdService.getJobId("KC"));
+        stock.setCargoSpaceId(mydoJob.getCargoSpaceId());
+        stock.setStockStatus("1");
+        stock.setProductStatus("1");
+        stock.setLotNo(mydoJobDetail.getLotNo());
+        stock.setInDate(DateUtils.getDate());
+        stock.setProductGuid(mydoJobDetail.getProductGuid());
+        stock.setQuantity(mydoJobDetail.getInQuantity());
+        stock.setJobId(mydoJob.getJobId());
+        stock.setTrayCode(mydoJob.getTrayCode());
+        stock.setInClassId(mydoJob.getClassId());
+        stock.setWarehouseId(mydoJob.getWarehouseId());
+        stock.setStackingId(mydoJobDetail.getStackingId());
+        return stock;
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java

@@ -5,15 +5,15 @@ import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 
 /**
  * 子任务Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-22
  */
-public interface MydoJobDetailMapper 
+public interface MydoJobDetailMapper
 {
     /**
      * 查询子任务
-     * 
+     *
      * @param jobDetailId 子任务主键
      * @return 子任务
      */
@@ -21,7 +21,7 @@ public interface MydoJobDetailMapper
 
     /**
      * 查询子任务列表
-     * 
+     *
      * @param mydoJobDetail 子任务
      * @return 子任务集合
      */
@@ -29,7 +29,7 @@ public interface MydoJobDetailMapper
 
     /**
      * 新增子任务
-     * 
+     *
      * @param mydoJobDetail 子任务
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface MydoJobDetailMapper
 
     /**
      * 修改子任务
-     * 
+     *
      * @param mydoJobDetail 子任务
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface MydoJobDetailMapper
 
     /**
      * 删除子任务
-     * 
+     *
      * @param jobDetailId 子任务主键
      * @return 结果
      */
@@ -53,9 +53,13 @@ public interface MydoJobDetailMapper
 
     /**
      * 批量删除子任务
-     * 
+     *
      * @param jobDetailIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteMydoJobDetailByJobDetailIds(String[] jobDetailIds);
+
+    void insertHistory(String jobId);
+
+    void deleteMydoJobDetailByJobId(String jobId);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java

@@ -58,4 +58,8 @@ public interface IMydoJobDetailService
      * @return 结果
      */
     public int deleteMydoJobDetailByJobDetailId(String jobDetailId);
+
+    void insertHistory(String jobId);
+
+    void deleteMydoJobDetailByJobId(String jobId);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java

@@ -9,19 +9,19 @@ import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
 
 /**
  * 子任务Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-05-22
  */
 @Service
-public class MydoJobDetailServiceImpl implements IMydoJobDetailService 
+public class MydoJobDetailServiceImpl implements IMydoJobDetailService
 {
     @Autowired
     private MydoJobDetailMapper mydoJobDetailMapper;
 
     /**
      * 查询子任务
-     * 
+     *
      * @param jobDetailId 子任务主键
      * @return 子任务
      */
@@ -33,7 +33,7 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
 
     /**
      * 查询子任务列表
-     * 
+     *
      * @param mydoJobDetail 子任务
      * @return 子任务
      */
@@ -45,7 +45,7 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
 
     /**
      * 新增子任务
-     * 
+     *
      * @param mydoJobDetail 子任务
      * @return 结果
      */
@@ -57,7 +57,7 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
 
     /**
      * 修改子任务
-     * 
+     *
      * @param mydoJobDetail 子任务
      * @return 结果
      */
@@ -69,7 +69,7 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
 
     /**
      * 批量删除子任务
-     * 
+     *
      * @param jobDetailIds 需要删除的子任务主键
      * @return 结果
      */
@@ -81,7 +81,7 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
 
     /**
      * 删除子任务信息
-     * 
+     *
      * @param jobDetailId 子任务主键
      * @return 结果
      */
@@ -90,4 +90,14 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
     {
         return mydoJobDetailMapper.deleteMydoJobDetailByJobDetailId(jobDetailId);
     }
+
+    @Override
+    public void insertHistory(String jobId) {
+        mydoJobDetailMapper.insertHistory(jobId);
+    }
+
+    @Override
+    public void deleteMydoJobDetailByJobId(String jobId) {
+        mydoJobDetailMapper.deleteMydoJobDetailByJobId(jobId);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/controller/BasStockController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.stock.stock.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.service.IBasStockService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 库存信息Controller
+ * 
+ * @author ruoyi
+ * @date 2025-05-24
+ */
+@RestController
+@RequestMapping("/stock/management")
+public class BasStockController extends BaseController
+{
+    @Autowired
+    private IBasStockService basStockService;
+
+    /**
+     * 查询库存信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('stock:management:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BasStock basStock)
+    {
+        startPage();
+        List<BasStock> list = basStockService.selectBasStockList(basStock);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('stock:management:export')")
+    @Log(title = "库存信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasStock basStock)
+    {
+        List<BasStock> list = basStockService.selectBasStockList(basStock);
+        ExcelUtil<BasStock> util = new ExcelUtil<BasStock>(BasStock.class);
+        util.exportExcel(response, list, "库存信息数据");
+    }
+
+    /**
+     * 获取库存信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('stock:management:query')")
+    @GetMapping(value = "/{stockId}")
+    public AjaxResult getInfo(@PathVariable("stockId") String stockId)
+    {
+        return success(basStockService.selectBasStockByStockId(stockId));
+    }
+
+    /**
+     * 新增库存信息
+     */
+    @PreAuthorize("@ss.hasPermi('stock:management:add')")
+    @Log(title = "库存信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BasStock basStock)
+    {
+        return toAjax(basStockService.insertBasStock(basStock));
+    }
+
+    /**
+     * 修改库存信息
+     */
+    @PreAuthorize("@ss.hasPermi('stock:management:edit')")
+    @Log(title = "库存信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BasStock basStock)
+    {
+        return toAjax(basStockService.updateBasStock(basStock));
+    }
+
+    /**
+     * 删除库存信息
+     */
+    @PreAuthorize("@ss.hasPermi('stock:management:remove')")
+    @Log(title = "库存信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockIds}")
+    public AjaxResult remove(@PathVariable String[] stockIds)
+    {
+        return toAjax(basStockService.deleteBasStockByStockIds(stockIds));
+    }
+}

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

@@ -0,0 +1,383 @@
+package com.ruoyi.stock.stock.domain;
+
+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;
+
+/**
+ * 库存信息对象 bas_stock
+ * 
+ * @author ruoyi
+ * @date 2025-05-24
+ */
+public class BasStock extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 库存id */
+    @Excel(name = "库存id")
+    private String stockId;
+
+    /** 货位id */
+    @Excel(name = "货位id")
+    private String cargoSpaceId;
+
+    /** 库存状态 */
+    @Excel(name = "库存状态")
+    private String stockStatus;
+
+    /** 物料状态 */
+    @Excel(name = "物料状态")
+    private String productStatus;
+
+    /** 批次号 */
+    @Excel(name = "批次号")
+    private String lotNo;
+
+    /** 入库时间 */
+    @Excel(name = "入库时间")
+    private String inDate;
+
+    /** 回流时间 */
+    @Excel(name = "回流时间")
+    private String backDate;
+
+    /** 物料GUID */
+    @Excel(name = "物料GUID")
+    private String productGuid;
+
+    /** 库存数量 */
+    @Excel(name = "库存数量")
+    private String quantity;
+
+    /** 作业ID */
+    @Excel(name = "作业ID")
+    private String jobId;
+
+    /** 托盘条码 */
+    @Excel(name = "托盘条码")
+    private String trayCode;
+
+    /** 出库数量 */
+    @Excel(name = "出库数量")
+    private String outQuantity;
+
+    /** 入库子单id */
+    @Excel(name = "入库子单id")
+    private String stockinDetailId;
+
+    /** 入库主单 */
+    @Excel(name = "入库主单")
+    private String stockinId;
+
+    /** 入库类型 */
+    @Excel(name = "入库类型")
+    private String inType;
+
+    /** 入库班组ID */
+    @Excel(name = "入库班组ID")
+    private String inClassId;
+
+    /** 仓库 */
+    @Excel(name = "仓库")
+    private String warehouseId;
+
+    /** 垛型ID */
+    @Excel(name = "垛型ID")
+    private String stackingId;
+
+    /** 备用字段1 */
+    @Excel(name = "备用字段1")
+    private String spare1;
+
+    /** 备用字段2 */
+    @Excel(name = "备用字段2")
+    private String spare2;
+
+    /** 备用字段3 */
+    @Excel(name = "备用字段3")
+    private String spare3;
+
+    /** 备用字段4 */
+    @Excel(name = "备用字段4")
+    private String spare4;
+
+    /** 备用字段5 */
+    @Excel(name = "备用字段5")
+    private String spare5;
+
+    /** 备用字段6 */
+    @Excel(name = "备用字段6")
+    private String spare6;
+
+    public void setStockId(String stockId) 
+    {
+        this.stockId = stockId;
+    }
+
+    public String getStockId() 
+    {
+        return stockId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) 
+    {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getCargoSpaceId() 
+    {
+        return cargoSpaceId;
+    }
+
+    public void setStockStatus(String stockStatus) 
+    {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getStockStatus() 
+    {
+        return stockStatus;
+    }
+
+    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(String quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public String getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setJobId(String jobId) 
+    {
+        this.jobId = jobId;
+    }
+
+    public String getJobId() 
+    {
+        return jobId;
+    }
+
+    public void 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;
+    }
+
+    @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())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.stock.stock.mapper;
+
+import java.util.List;
+import com.ruoyi.stock.stock.domain.BasStock;
+
+/**
+ * 库存信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-24
+ */
+public interface BasStockMapper 
+{
+    /**
+     * 查询库存信息
+     * 
+     * @param stockId 库存信息主键
+     * @return 库存信息
+     */
+    public BasStock selectBasStockByStockId(String stockId);
+
+    /**
+     * 查询库存信息列表
+     * 
+     * @param basStock 库存信息
+     * @return 库存信息集合
+     */
+    public List<BasStock> selectBasStockList(BasStock basStock);
+
+    /**
+     * 新增库存信息
+     * 
+     * @param basStock 库存信息
+     * @return 结果
+     */
+    public int insertBasStock(BasStock basStock);
+
+    /**
+     * 修改库存信息
+     * 
+     * @param basStock 库存信息
+     * @return 结果
+     */
+    public int updateBasStock(BasStock basStock);
+
+    /**
+     * 删除库存信息
+     * 
+     * @param stockId 库存信息主键
+     * @return 结果
+     */
+    public int deleteBasStockByStockId(String stockId);
+
+    /**
+     * 批量删除库存信息
+     * 
+     * @param stockIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBasStockByStockIds(String[] stockIds);
+
+    void insertBasStockList(List<BasStock> list);
+}

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/IBasStockService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.stock.stock.service;
+
+import java.util.List;
+import com.ruoyi.stock.stock.domain.BasStock;
+
+/**
+ * 库存信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-24
+ */
+public interface IBasStockService 
+{
+    /**
+     * 查询库存信息
+     * 
+     * @param stockId 库存信息主键
+     * @return 库存信息
+     */
+    public BasStock selectBasStockByStockId(String stockId);
+
+    /**
+     * 查询库存信息列表
+     * 
+     * @param basStock 库存信息
+     * @return 库存信息集合
+     */
+    public List<BasStock> selectBasStockList(BasStock basStock);
+
+    /**
+     * 新增库存信息
+     * 
+     * @param basStock 库存信息
+     * @return 结果
+     */
+    public int insertBasStock(BasStock basStock);
+
+    /**
+     * 修改库存信息
+     * 
+     * @param basStock 库存信息
+     * @return 结果
+     */
+    public int updateBasStock(BasStock basStock);
+
+    /**
+     * 批量删除库存信息
+     * 
+     * @param stockIds 需要删除的库存信息主键集合
+     * @return 结果
+     */
+    public int deleteBasStockByStockIds(String[] stockIds);
+
+    /**
+     * 删除库存信息信息
+     * 
+     * @param stockId 库存信息主键
+     * @return 结果
+     */
+    public int deleteBasStockByStockId(String stockId);
+
+    void insertBasStockList(List<BasStock> list);
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.stock.stock.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.stock.stock.mapper.BasStockMapper;
+import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.service.IBasStockService;
+
+/**
+ * 库存信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-05-24
+ */
+@Service
+public class BasStockServiceImpl implements IBasStockService
+{
+    @Autowired
+    private BasStockMapper basStockMapper;
+
+    /**
+     * 查询库存信息
+     *
+     * @param stockId 库存信息主键
+     * @return 库存信息
+     */
+    @Override
+    public BasStock selectBasStockByStockId(String stockId)
+    {
+        return basStockMapper.selectBasStockByStockId(stockId);
+    }
+
+    /**
+     * 查询库存信息列表
+     *
+     * @param basStock 库存信息
+     * @return 库存信息
+     */
+    @Override
+    public List<BasStock> selectBasStockList(BasStock basStock)
+    {
+        return basStockMapper.selectBasStockList(basStock);
+    }
+
+    /**
+     * 新增库存信息
+     *
+     * @param basStock 库存信息
+     * @return 结果
+     */
+    @Override
+    public int insertBasStock(BasStock basStock)
+    {
+        return basStockMapper.insertBasStock(basStock);
+    }
+
+    /**
+     * 修改库存信息
+     *
+     * @param basStock 库存信息
+     * @return 结果
+     */
+    @Override
+    public int updateBasStock(BasStock basStock)
+    {
+        return basStockMapper.updateBasStock(basStock);
+    }
+
+    /**
+     * 批量删除库存信息
+     *
+     * @param stockIds 需要删除的库存信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBasStockByStockIds(String[] stockIds)
+    {
+        return basStockMapper.deleteBasStockByStockIds(stockIds);
+    }
+
+    /**
+     * 删除库存信息信息
+     *
+     * @param stockId 库存信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBasStockByStockId(String stockId)
+    {
+        return basStockMapper.deleteBasStockByStockId(stockId);
+    }
+
+    @Override
+    public void insertBasStockList(List<BasStock> list) {
+        basStockMapper.insertBasStockList(list);
+    }
+}