出库单据
This commit is contained in:
张怡蓉
@@ -32,6 +32,7 @@ import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
|
||||
import com.ruoyi.pda.domain.TrayCodeMakeSure;
|
||||
import com.ruoyi.pda.service.PdaService;
|
||||
import com.ruoyi.stock.stock.domain.BasStock;
|
||||
import com.ruoyi.stock.stock.mapper.BasStockMapper;
|
||||
import com.ruoyi.stock.stock.service.IBasStockService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -76,6 +77,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
|
||||
private IToWcsService iToWcsService;
|
||||
@Autowired
|
||||
private ITransferBillCallbackService transferBillCallbackService;
|
||||
@Autowired
|
||||
private BasStockMapper basStockMapper;
|
||||
|
||||
|
||||
/**
|
||||
@@ -361,12 +364,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
|
||||
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail);
|
||||
for (MydoJobDetail detail : mydoJobDetails) {
|
||||
//修改库存的出库数量
|
||||
BasStock basStock = basStockService.selectBasStockByStockId(detail.getStockId());
|
||||
BasStock basStock = basStockMapper.selectBasStockByStockId(detail.getStockId());
|
||||
if (basStock != null) {
|
||||
BigDecimal outQuantity = Convert.toBigDecimal(basStock.getOutQuantity());
|
||||
BigDecimal substract = outQuantity.subtract(Convert.toBigDecimal(detail.getOutQuantity()));
|
||||
basStock.setOutQuantity(String.valueOf(substract));
|
||||
basStockService.updateBasStock(basStock);
|
||||
basStockMapper.updateBasStock(basStock);
|
||||
}
|
||||
//修改单据数量
|
||||
OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(detail.getInOrOutDId());
|
||||
@@ -388,12 +391,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
|
||||
updateMydoJob(job);
|
||||
insertHistory(jobId);
|
||||
//通知wcs
|
||||
AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
|
||||
if (ajaxResult.isSuccess()) {
|
||||
return AjaxResult.success();
|
||||
} else {
|
||||
throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
|
||||
}
|
||||
// AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
|
||||
// if (ajaxResult.isSuccess()){
|
||||
// return AjaxResult.success();
|
||||
// }else {
|
||||
// throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
|
||||
// }
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
@@ -401,7 +404,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
|
||||
log.error("任务处理异常", e);
|
||||
return AjaxResult.error();
|
||||
}
|
||||
return AjaxResult.error();
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.ruoyi.out.handAllotStock.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.out.handAllotStock.domain.ViewHandAllotStock;
|
||||
import com.ruoyi.out.handAllotStock.service.IViewHandAllotStockService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 手动分配库存Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-09-16
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/out/handAllotStock")
|
||||
public class ViewHandAllotStockController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IViewHandAllotStockService viewHandAllotStockService;
|
||||
|
||||
/**
|
||||
* 查询手动分配库存列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('out:handAllotStock:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(ViewHandAllotStock viewHandAllotStock)
|
||||
{
|
||||
startPage();
|
||||
List<ViewHandAllotStock> list = viewHandAllotStockService.selectViewHandAllotStockList(viewHandAllotStock);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出手动分配库存列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('out:handAllotStock: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, "手动分配库存数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取手动分配库存详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('out:handAllotStock:query')")
|
||||
@GetMapping(value = "/{stockId}")
|
||||
public AjaxResult getInfo(@PathVariable("stockId") String stockId)
|
||||
{
|
||||
return success(viewHandAllotStockService.selectViewHandAllotStockByStockId(stockId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增手动分配库存
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('out:handAllotStock:add')")
|
||||
@Log(title = "手动分配库存", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody ViewHandAllotStock viewHandAllotStock)
|
||||
{
|
||||
return toAjax(viewHandAllotStockService.insertViewHandAllotStock(viewHandAllotStock));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改手动分配库存
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('out:handAllotStock:edit')")
|
||||
@Log(title = "手动分配库存", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody ViewHandAllotStock viewHandAllotStock)
|
||||
{
|
||||
return toAjax(viewHandAllotStockService.updateViewHandAllotStock(viewHandAllotStock));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除手动分配库存
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('out:handAllotStock:remove')")
|
||||
@Log(title = "手动分配库存", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockIds}")
|
||||
public AjaxResult remove(@PathVariable String[] stockIds)
|
||||
{
|
||||
return toAjax(viewHandAllotStockService.deleteViewHandAllotStockByStockIds(stockIds));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,579 @@
|
||||
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
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-09-16
|
||||
*/
|
||||
public class ViewHandAllotStock extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 库存编码 */
|
||||
@Excel(name = "库存编码")
|
||||
private String stockId;
|
||||
|
||||
/** 货位编码 */
|
||||
@Excel(name = "货位编码")
|
||||
private String cargoSpaceId;
|
||||
|
||||
/** 库存状态 */
|
||||
@Excel(name = "库存状态")
|
||||
private String stockStatus;
|
||||
|
||||
/** 物品状态 */
|
||||
@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 = "品名")
|
||||
private String productName;
|
||||
|
||||
/** 电压 */
|
||||
@Excel(name = "电压")
|
||||
private String voltage;
|
||||
|
||||
/** 功率 */
|
||||
@Excel(name = "功率")
|
||||
private String power;
|
||||
|
||||
/** 相位 */
|
||||
@Excel(name = "相位")
|
||||
private String phase;
|
||||
|
||||
/** 净重 */
|
||||
@Excel(name = "净重")
|
||||
private BigDecimal netWeight;
|
||||
|
||||
/** 毛重 */
|
||||
@Excel(name = "毛重")
|
||||
private BigDecimal 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;
|
||||
}
|
||||
|
||||
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(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)
|
||||
{
|
||||
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(BigDecimal netWeight)
|
||||
{
|
||||
this.netWeight = netWeight;
|
||||
}
|
||||
|
||||
public BigDecimal getNetWeight()
|
||||
{
|
||||
return netWeight;
|
||||
}
|
||||
|
||||
public void setGrossWeight(BigDecimal grossWeight)
|
||||
{
|
||||
this.grossWeight = grossWeight;
|
||||
}
|
||||
|
||||
public BigDecimal 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("cargoSpaceId", getCargoSpaceId())
|
||||
.append("stockStatus", getStockStatus())
|
||||
.append("productStatus", getProductStatus())
|
||||
.append("lotNo", getLotNo())
|
||||
.append("inDate", getInDate())
|
||||
.append("backDate", getBackDate())
|
||||
.append("productGuid", getProductGuid())
|
||||
.append("quantity", getQuantity())
|
||||
.append("jobId", getJobId())
|
||||
.append("trayCode", getTrayCode())
|
||||
.append("outQuantity", getOutQuantity())
|
||||
.append("stockinDetailId", getStockinDetailId())
|
||||
.append("stockinId", getStockinId())
|
||||
.append("inType", getInType())
|
||||
.append("inClassId", getInClassId())
|
||||
.append("warehouseId", getWarehouseId())
|
||||
.append("stackingId", getStackingId())
|
||||
.append("spare1", getSpare1())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare3", getSpare3())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare5", getSpare5())
|
||||
.append("spare6", getSpare6())
|
||||
.append("productId", getProductId())
|
||||
.append("productName", getProductName())
|
||||
.append("voltage", getVoltage())
|
||||
.append("power", getPower())
|
||||
.append("phase", getPhase())
|
||||
.append("netWeight", getNetWeight())
|
||||
.append("grossWeight", getGrossWeight())
|
||||
.append("distribution", getDistribution())
|
||||
.append("model", getModel())
|
||||
.append("orderId", getOrderId())
|
||||
.append("spare7", getSpare7())
|
||||
.append("spare8", getSpare8())
|
||||
.append("cargoSpaceName", getCargoSpaceName())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.out.handAllotStock.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.out.handAllotStock.domain.ViewHandAllotStock;
|
||||
|
||||
/**
|
||||
* 手动分配库存Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-09-16
|
||||
*/
|
||||
public interface ViewHandAllotStockMapper
|
||||
{
|
||||
/**
|
||||
* 查询手动分配库存
|
||||
*
|
||||
* @param stockId 手动分配库存主键
|
||||
* @return 手动分配库存
|
||||
*/
|
||||
public ViewHandAllotStock selectViewHandAllotStockByStockId(String stockId);
|
||||
|
||||
/**
|
||||
* 查询手动分配库存列表
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 手动分配库存集合
|
||||
*/
|
||||
public List<ViewHandAllotStock> selectViewHandAllotStockList(ViewHandAllotStock viewHandAllotStock);
|
||||
|
||||
/**
|
||||
* 新增手动分配库存
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertViewHandAllotStock(ViewHandAllotStock viewHandAllotStock);
|
||||
|
||||
/**
|
||||
* 修改手动分配库存
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateViewHandAllotStock(ViewHandAllotStock viewHandAllotStock);
|
||||
|
||||
/**
|
||||
* 删除手动分配库存
|
||||
*
|
||||
* @param stockId 手动分配库存主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteViewHandAllotStockByStockId(String stockId);
|
||||
|
||||
/**
|
||||
* 批量删除手动分配库存
|
||||
*
|
||||
* @param stockIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteViewHandAllotStockByStockIds(String[] stockIds);
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.out.handAllotStock.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.out.handAllotStock.domain.ViewHandAllotStock;
|
||||
|
||||
/**
|
||||
* 手动分配库存Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-09-16
|
||||
*/
|
||||
public interface IViewHandAllotStockService
|
||||
{
|
||||
/**
|
||||
* 查询手动分配库存
|
||||
*
|
||||
* @param stockId 手动分配库存主键
|
||||
* @return 手动分配库存
|
||||
*/
|
||||
public ViewHandAllotStock selectViewHandAllotStockByStockId(String stockId);
|
||||
|
||||
/**
|
||||
* 查询手动分配库存列表
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 手动分配库存集合
|
||||
*/
|
||||
public List<ViewHandAllotStock> selectViewHandAllotStockList(ViewHandAllotStock viewHandAllotStock);
|
||||
|
||||
/**
|
||||
* 新增手动分配库存
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertViewHandAllotStock(ViewHandAllotStock viewHandAllotStock);
|
||||
|
||||
/**
|
||||
* 修改手动分配库存
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateViewHandAllotStock(ViewHandAllotStock viewHandAllotStock);
|
||||
|
||||
/**
|
||||
* 批量删除手动分配库存
|
||||
*
|
||||
* @param stockIds 需要删除的手动分配库存主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteViewHandAllotStockByStockIds(String[] stockIds);
|
||||
|
||||
/**
|
||||
* 删除手动分配库存信息
|
||||
*
|
||||
* @param stockId 手动分配库存主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteViewHandAllotStockByStockId(String stockId);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.ruoyi.out.handAllotStock.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.out.handAllotStock.mapper.ViewHandAllotStockMapper;
|
||||
import com.ruoyi.out.handAllotStock.domain.ViewHandAllotStock;
|
||||
import com.ruoyi.out.handAllotStock.service.IViewHandAllotStockService;
|
||||
|
||||
/**
|
||||
* 手动分配库存Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-09-16
|
||||
*/
|
||||
@Service
|
||||
public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
|
||||
{
|
||||
@Autowired
|
||||
private ViewHandAllotStockMapper viewHandAllotStockMapper;
|
||||
|
||||
/**
|
||||
* 查询手动分配库存
|
||||
*
|
||||
* @param stockId 手动分配库存主键
|
||||
* @return 手动分配库存
|
||||
*/
|
||||
@Override
|
||||
public ViewHandAllotStock selectViewHandAllotStockByStockId(String stockId)
|
||||
{
|
||||
return viewHandAllotStockMapper.selectViewHandAllotStockByStockId(stockId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询手动分配库存列表
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 手动分配库存
|
||||
*/
|
||||
@Override
|
||||
public List<ViewHandAllotStock> selectViewHandAllotStockList(ViewHandAllotStock viewHandAllotStock)
|
||||
{
|
||||
return viewHandAllotStockMapper.selectViewHandAllotStockList(viewHandAllotStock);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增手动分配库存
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertViewHandAllotStock(ViewHandAllotStock viewHandAllotStock)
|
||||
{
|
||||
return viewHandAllotStockMapper.insertViewHandAllotStock(viewHandAllotStock);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改手动分配库存
|
||||
*
|
||||
* @param viewHandAllotStock 手动分配库存
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateViewHandAllotStock(ViewHandAllotStock viewHandAllotStock)
|
||||
{
|
||||
return viewHandAllotStockMapper.updateViewHandAllotStock(viewHandAllotStock);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除手动分配库存
|
||||
*
|
||||
* @param stockIds 需要删除的手动分配库存主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteViewHandAllotStockByStockIds(String[] stockIds)
|
||||
{
|
||||
return viewHandAllotStockMapper.deleteViewHandAllotStockByStockIds(stockIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除手动分配库存信息
|
||||
*
|
||||
* @param stockId 手动分配库存主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteViewHandAllotStockByStockId(String stockId)
|
||||
{
|
||||
return viewHandAllotStockMapper.deleteViewHandAllotStockByStockId(stockId);
|
||||
}
|
||||
}
|
||||
@@ -137,4 +137,15 @@ public class OutStockoutController extends BaseController {
|
||||
public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId) {
|
||||
return outStockoutService.autoAllot(stockoutId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 手动分配
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('out:outStockout:manualAllot')")
|
||||
@Log(title = "出库单手动分配", businessType = BusinessType.OTHER)
|
||||
@GetMapping("/manualAllot")
|
||||
public AjaxResult manualAllot(@RequestParam("stockList") String[] stockList, @RequestParam("stockoutDetailId") String stockoutDetailId) {
|
||||
return outStockoutService.manualAllot(stockList, stockoutDetailId);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,4 +66,6 @@ public interface OutStockoutMapper
|
||||
void autoAllot(HashMap<String, String> map);
|
||||
|
||||
OutStockout selectOutStockoutByStockoutId(String stockoutId);
|
||||
|
||||
void manualAllot(HashMap<String, String> map);
|
||||
}
|
||||
|
||||
@@ -71,4 +71,6 @@ public interface IOutStockoutService
|
||||
AjaxResult autoAllot(String stockoutId);
|
||||
|
||||
List<OutStockout> selectOutStockoutListApi(OutStockout outStockoutParam);
|
||||
|
||||
AjaxResult manualAllot(String[] stockList,String stockoutDetailId);
|
||||
}
|
||||
|
||||
@@ -197,4 +197,23 @@ public class OutStockoutServiceImpl implements IOutStockoutService
|
||||
public List<OutStockout> selectOutStockoutListApi(OutStockout outStockout) {
|
||||
return outStockoutMapper.selectOutStockoutList(outStockout);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult manualAllot(String[] stockList, String stockoutDetailId) {
|
||||
HashMap<String, String> map = new HashMap<>();
|
||||
StringBuilder stringBuilder = new StringBuilder();
|
||||
for (String stock : stockList) {
|
||||
map.put("v_stockout_detail_id", stockoutDetailId);
|
||||
map.put("v_stock_id", stock);
|
||||
outStockoutMapper.manualAllot(map);
|
||||
toWcsService.pushOutMydoJob();
|
||||
if (!"10".equals(map.get("v_result"))){
|
||||
stringBuilder.append(",").append(map.get("v_resultString"));
|
||||
}
|
||||
}
|
||||
if (!StrUtil.isEmpty(stringBuilder.toString())){
|
||||
return AjaxResult.warn(stringBuilder.toString());
|
||||
}
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user