Merge remote-tracking branch 'origin/main'
This commit is contained in:
1009473166@qq.com
@@ -151,6 +151,13 @@ public class PdaController extends BaseController {
|
||||
return pdaService.selectDetailByPDTray(trayCodeMakeSure);
|
||||
}
|
||||
|
||||
@RequestMapping("/selectHcTray")
|
||||
@ResponseBody
|
||||
public AjaxResult selectHcTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
|
||||
return pdaService.selectHcTray(trayCodeMakeSure);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 盘点出库确认
|
||||
*
|
||||
|
||||
@@ -48,6 +48,8 @@ public interface PdaService {
|
||||
|
||||
public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure);
|
||||
|
||||
public AjaxResult selectHcTray(TrayCodeMakeSure trayCodeMakeSure);
|
||||
|
||||
AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure);
|
||||
|
||||
AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure);
|
||||
|
||||
@@ -27,6 +27,8 @@ import com.ruoyi.pda.domain.TrayCodeMsg;
|
||||
import com.ruoyi.pda.mapper.PdaMapper;
|
||||
import com.ruoyi.pda.trayMsg.domain.TrayMsg;
|
||||
import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
|
||||
import com.ruoyi.stock.hcstock.domain.BasStockHc;
|
||||
import com.ruoyi.stock.hcstock.service.IBasStockHcService;
|
||||
import com.ruoyi.stock.stock.domain.BasStock;
|
||||
import com.ruoyi.stock.stock.mapper.BasStockMapper;
|
||||
import com.ruoyi.system.service.ISysRoleService;
|
||||
@@ -64,6 +66,8 @@ public class PdaServiceImp implements PdaService {
|
||||
private IInStockinService inStockinService;
|
||||
@Autowired
|
||||
private IAgvPointService agvPointService;
|
||||
@Autowired
|
||||
private IBasStockHcService basStockHcService;
|
||||
|
||||
|
||||
@Override
|
||||
@@ -210,6 +214,16 @@ public class PdaServiceImp implements PdaService {
|
||||
return AjaxResult.success(mydoJobDetails);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult selectHcTray(TrayCodeMakeSure trayCodeMakeSure) {
|
||||
BasStockHc basStockHc = new BasStockHc();
|
||||
basStockHc.setTrayCode(trayCodeMakeSure.getTrayCode());
|
||||
List<BasStockHc> basStockHcs = basStockHcService.selectBasStockHcList(basStockHc);
|
||||
return AjaxResult.success(basStockHcs);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
|
||||
String trayCode = trayCodeMakeSure.getTrayCode();
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.ruoyi.stock.hcstock.controller;
|
||||
|
||||
import java.util.List;
|
||||
import jakarta.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.hcstock.domain.BasStockHc;
|
||||
import com.ruoyi.stock.hcstock.service.IBasStockHcService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 缓存库存信息Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-03-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/hcstock/hcstock")
|
||||
public class BasStockHcController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IBasStockHcService basStockHcService;
|
||||
|
||||
/**
|
||||
* 查询缓存库存信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('hcstock:hcstock:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BasStockHc basStockHc)
|
||||
{
|
||||
startPage();
|
||||
List<BasStockHc> list = basStockHcService.selectBasStockHcList(basStockHc);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出缓存库存信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('hcstock:hcstock:export')")
|
||||
@Log(title = "缓存库存信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, BasStockHc basStockHc)
|
||||
{
|
||||
List<BasStockHc> list = basStockHcService.selectBasStockHcList(basStockHc);
|
||||
ExcelUtil<BasStockHc> util = new ExcelUtil<BasStockHc>(BasStockHc.class);
|
||||
util.exportExcel(response, list, "缓存库存信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取缓存库存信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('hcstock:hcstock:query')")
|
||||
@GetMapping(value = "/{stockId}")
|
||||
public AjaxResult getInfo(@PathVariable("stockId") String stockId)
|
||||
{
|
||||
return success(basStockHcService.selectBasStockHcByStockId(stockId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增缓存库存信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('hcstock:hcstock:add')")
|
||||
@Log(title = "缓存库存信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BasStockHc basStockHc)
|
||||
{
|
||||
return toAjax(basStockHcService.insertBasStockHc(basStockHc));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改缓存库存信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('hcstock:hcstock:edit')")
|
||||
@Log(title = "缓存库存信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody BasStockHc basStockHc)
|
||||
{
|
||||
return toAjax(basStockHcService.updateBasStockHc(basStockHc));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除缓存库存信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('hcstock:hcstock:remove')")
|
||||
@Log(title = "缓存库存信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockIds}")
|
||||
public AjaxResult remove(@PathVariable String[] stockIds)
|
||||
{
|
||||
return toAjax(basStockHcService.deleteBasStockHcByStockIds(stockIds));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,562 @@
|
||||
package com.ruoyi.stock.hcstock.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_hc
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-03-23
|
||||
*/
|
||||
public class BasStockHc extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 库存id */
|
||||
private String stockId;
|
||||
|
||||
/** 货位id */
|
||||
@Excel(name = "货位id")
|
||||
private String cargoSpaceId;
|
||||
|
||||
/** 库存状态 1正常 2冻结 */
|
||||
@Excel(name = "库存状态 1正常 2冻结")
|
||||
private String stockStatus;
|
||||
|
||||
/** 物料状态 1正常 2盘点待审批 3异常 */
|
||||
@Excel(name = "物料状态 1正常 2盘点待审批 3异常")
|
||||
private String productStatus;
|
||||
|
||||
/** 546批号 */
|
||||
@Excel(name = "546批号")
|
||||
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;
|
||||
|
||||
/** 供应商名称546 */
|
||||
@Excel(name = "供应商名称546")
|
||||
private String stackingId;
|
||||
|
||||
/** 层级关系546 */
|
||||
@Excel(name = "层级关系546")
|
||||
private String spare1;
|
||||
|
||||
/** 上层物料546 */
|
||||
@Excel(name = "上层物料546")
|
||||
private String spare2;
|
||||
|
||||
/** 顶层物料546 */
|
||||
@Excel(name = "顶层物料546")
|
||||
private String spare3;
|
||||
|
||||
/** 项目号546 */
|
||||
@Excel(name = "项目号546")
|
||||
private String spare4;
|
||||
|
||||
/** 合同号546 */
|
||||
@Excel(name = "合同号546")
|
||||
private String spare5;
|
||||
|
||||
/** 销售订单号546 */
|
||||
@Excel(name = "销售订单号546")
|
||||
private String spare6;
|
||||
|
||||
/** 物料编码 */
|
||||
@Excel(name = "物料编码")
|
||||
private String productId;
|
||||
|
||||
/** 物料名称 */
|
||||
@Excel(name = "物料名称")
|
||||
private String productName;
|
||||
|
||||
/** 供应商编码546 */
|
||||
@Excel(name = "供应商编码546")
|
||||
private String voltage;
|
||||
|
||||
/** 规格型号546 */
|
||||
@Excel(name = "规格型号546")
|
||||
private String power;
|
||||
|
||||
/** 计量单位546 */
|
||||
@Excel(name = "计量单位546")
|
||||
private String phase;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String netWeight;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String grossWeight;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String distribution;
|
||||
|
||||
/** 是否满盘546,0否1是 */
|
||||
@Excel(name = "是否满盘546,0否1是")
|
||||
private String model;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String orderId;
|
||||
|
||||
/** 盘点记录 0-未盘点 1-已盘点 */
|
||||
@Excel(name = "盘点记录 0-未盘点 1-已盘点")
|
||||
private String spare7;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String spare8;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
public void setProductId(String productId)
|
||||
{
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductId()
|
||||
{
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductName(String productName)
|
||||
{
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public String getProductName()
|
||||
{
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setVoltage(String voltage)
|
||||
{
|
||||
this.voltage = voltage;
|
||||
}
|
||||
|
||||
public String getVoltage()
|
||||
{
|
||||
return voltage;
|
||||
}
|
||||
|
||||
public void setPower(String power)
|
||||
{
|
||||
this.power = power;
|
||||
}
|
||||
|
||||
public String getPower()
|
||||
{
|
||||
return power;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("stockId", getStockId())
|
||||
.append("cargoSpaceId", getCargoSpaceId())
|
||||
.append("stockStatus", getStockStatus())
|
||||
.append("productStatus", getProductStatus())
|
||||
.append("lotNo", getLotNo())
|
||||
.append("inDate", getInDate())
|
||||
.append("backDate", getBackDate())
|
||||
.append("productGuid", getProductGuid())
|
||||
.append("quantity", getQuantity())
|
||||
.append("jobId", getJobId())
|
||||
.append("trayCode", getTrayCode())
|
||||
.append("outQuantity", getOutQuantity())
|
||||
.append("stockinDetailId", getStockinDetailId())
|
||||
.append("stockinId", getStockinId())
|
||||
.append("inType", getInType())
|
||||
.append("inClassId", getInClassId())
|
||||
.append("warehouseId", getWarehouseId())
|
||||
.append("stackingId", getStackingId())
|
||||
.append("spare1", getSpare1())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare3", getSpare3())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare5", getSpare5())
|
||||
.append("spare6", getSpare6())
|
||||
.append("productId", getProductId())
|
||||
.append("productName", getProductName())
|
||||
.append("voltage", getVoltage())
|
||||
.append("power", getPower())
|
||||
.append("phase", getPhase())
|
||||
.append("netWeight", getNetWeight())
|
||||
.append("grossWeight", getGrossWeight())
|
||||
.append("distribution", getDistribution())
|
||||
.append("model", getModel())
|
||||
.append("orderId", getOrderId())
|
||||
.append("spare7", getSpare7())
|
||||
.append("spare8", getSpare8())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.stock.hcstock.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.stock.hcstock.domain.BasStockHc;
|
||||
|
||||
/**
|
||||
* 缓存库存信息Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-03-23
|
||||
*/
|
||||
public interface BasStockHcMapper
|
||||
{
|
||||
/**
|
||||
* 查询缓存库存信息
|
||||
*
|
||||
* @param stockId 缓存库存信息主键
|
||||
* @return 缓存库存信息
|
||||
*/
|
||||
public BasStockHc selectBasStockHcByStockId(String stockId);
|
||||
|
||||
/**
|
||||
* 查询缓存库存信息列表
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 缓存库存信息集合
|
||||
*/
|
||||
public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc);
|
||||
|
||||
/**
|
||||
* 新增缓存库存信息
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBasStockHc(BasStockHc basStockHc);
|
||||
|
||||
/**
|
||||
* 修改缓存库存信息
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBasStockHc(BasStockHc basStockHc);
|
||||
|
||||
/**
|
||||
* 删除缓存库存信息
|
||||
*
|
||||
* @param stockId 缓存库存信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasStockHcByStockId(String stockId);
|
||||
|
||||
/**
|
||||
* 批量删除缓存库存信息
|
||||
*
|
||||
* @param stockIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasStockHcByStockIds(String[] stockIds);
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.stock.hcstock.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.stock.hcstock.domain.BasStockHc;
|
||||
|
||||
/**
|
||||
* 缓存库存信息Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-03-23
|
||||
*/
|
||||
public interface IBasStockHcService
|
||||
{
|
||||
/**
|
||||
* 查询缓存库存信息
|
||||
*
|
||||
* @param stockId 缓存库存信息主键
|
||||
* @return 缓存库存信息
|
||||
*/
|
||||
public BasStockHc selectBasStockHcByStockId(String stockId);
|
||||
|
||||
/**
|
||||
* 查询缓存库存信息列表
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 缓存库存信息集合
|
||||
*/
|
||||
public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc);
|
||||
|
||||
/**
|
||||
* 新增缓存库存信息
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBasStockHc(BasStockHc basStockHc);
|
||||
|
||||
/**
|
||||
* 修改缓存库存信息
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBasStockHc(BasStockHc basStockHc);
|
||||
|
||||
/**
|
||||
* 批量删除缓存库存信息
|
||||
*
|
||||
* @param stockIds 需要删除的缓存库存信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasStockHcByStockIds(String[] stockIds);
|
||||
|
||||
/**
|
||||
* 删除缓存库存信息信息
|
||||
*
|
||||
* @param stockId 缓存库存信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasStockHcByStockId(String stockId);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.ruoyi.stock.hcstock.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.stock.hcstock.mapper.BasStockHcMapper;
|
||||
import com.ruoyi.stock.hcstock.domain.BasStockHc;
|
||||
import com.ruoyi.stock.hcstock.service.IBasStockHcService;
|
||||
|
||||
/**
|
||||
* 缓存库存信息Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-03-23
|
||||
*/
|
||||
@Service
|
||||
public class BasStockHcServiceImpl implements IBasStockHcService
|
||||
{
|
||||
@Autowired
|
||||
private BasStockHcMapper basStockHcMapper;
|
||||
|
||||
/**
|
||||
* 查询缓存库存信息
|
||||
*
|
||||
* @param stockId 缓存库存信息主键
|
||||
* @return 缓存库存信息
|
||||
*/
|
||||
@Override
|
||||
public BasStockHc selectBasStockHcByStockId(String stockId)
|
||||
{
|
||||
return basStockHcMapper.selectBasStockHcByStockId(stockId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询缓存库存信息列表
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 缓存库存信息
|
||||
*/
|
||||
@Override
|
||||
public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc)
|
||||
{
|
||||
return basStockHcMapper.selectBasStockHcList(basStockHc);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增缓存库存信息
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertBasStockHc(BasStockHc basStockHc)
|
||||
{
|
||||
return basStockHcMapper.insertBasStockHc(basStockHc);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改缓存库存信息
|
||||
*
|
||||
* @param basStockHc 缓存库存信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateBasStockHc(BasStockHc basStockHc)
|
||||
{
|
||||
return basStockHcMapper.updateBasStockHc(basStockHc);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除缓存库存信息
|
||||
*
|
||||
* @param stockIds 需要删除的缓存库存信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBasStockHcByStockIds(String[] stockIds)
|
||||
{
|
||||
return basStockHcMapper.deleteBasStockHcByStockIds(stockIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除缓存库存信息信息
|
||||
*
|
||||
* @param stockId 缓存库存信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBasStockHcByStockId(String stockId)
|
||||
{
|
||||
return basStockHcMapper.deleteBasStockHcByStockId(stockId);
|
||||
}
|
||||
}
|
||||
228
ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml
Normal file
228
ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml
Normal file
@@ -0,0 +1,228 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.stock.hcstock.mapper.BasStockHcMapper">
|
||||
|
||||
<resultMap type="BasStockHc" id="BasStockHcResult">
|
||||
<result property="stockId" column="stock_id" />
|
||||
<result property="cargoSpaceId" column="cargo_space_id" />
|
||||
<result property="stockStatus" column="stock_status" />
|
||||
<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="power" column="power" />
|
||||
<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" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBasStockHcVo">
|
||||
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 from bas_stock_hc
|
||||
</sql>
|
||||
|
||||
<select id="selectBasStockHcList" parameterType="BasStockHc" resultMap="BasStockHcResult">
|
||||
<include refid="selectBasStockHcVo"/>
|
||||
<where>
|
||||
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</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 = #{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 != ''"> 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="power != null and power != ''"> and power = #{power}</if>
|
||||
<if test="phase != null and phase != ''"> and phase = #{phase}</if>
|
||||
<if test="netWeight != null and netWeight != ''"> and net_weight = #{netWeight}</if>
|
||||
<if test="grossWeight != null and grossWeight != ''"> 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>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectBasStockHcByStockId" parameterType="String" resultMap="BasStockHcResult">
|
||||
<include refid="selectBasStockHcVo"/>
|
||||
where stock_id = #{stockId}
|
||||
</select>
|
||||
|
||||
<insert id="insertBasStockHc" parameterType="BasStockHc">
|
||||
insert into bas_stock_hc
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="stockId != null">stock_id,</if>
|
||||
<if test="cargoSpaceId != null">cargo_space_id,</if>
|
||||
<if test="stockStatus != null">stock_status,</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="power != null">power,</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>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="stockId != null">#{stockId},</if>
|
||||
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
|
||||
<if test="stockStatus != null">#{stockStatus},</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="power != null">#{power},</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>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateBasStockHc" parameterType="BasStockHc">
|
||||
update bas_stock_hc
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
|
||||
<if test="stockStatus != null">stock_status = #{stockStatus},</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="power != null">power = #{power},</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>
|
||||
</trim>
|
||||
where stock_id = #{stockId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteBasStockHcByStockId" parameterType="String">
|
||||
delete from bas_stock_hc where stock_id = #{stockId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteBasStockHcByStockIds" parameterType="String">
|
||||
delete from bas_stock_hc where stock_id in
|
||||
<foreach item="stockId" collection="array" open="(" separator="," close=")">
|
||||
#{stockId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user