zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库管理页面字段修改

Browse Source
This commit is contained in:
liuhanqing
2026-01-07 10:08:57 +08:00
parent 3b8dbc90d0
commit a71caaef81
11 changed files with 242 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/controller/ViewProductAndStockController.java
View File

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 库存物资Controller
*
* @author ruoyi
* @date 2025-09-12
* @date 2026-01-06
*/
@RestController
@RequestMapping("/out/productAndStock")
@@ -37,7 +37,7 @@ public class ViewProductAndStockController extends BaseController
/**
* 查询库存物资列表
*/
@PreAuthorize("@ss.hasPermi('out:productAndStock:list')")
@PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:list')")
@GetMapping("/list")
public TableDataInfo list(ViewProductAndStock viewProductAndStock)
{
@@ -45,22 +45,11 @@ public class ViewProductAndStockController extends BaseController
List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockList(viewProductAndStock);
return getDataTable(list);
}
/**
* 查询库存物资列表
*/
@PreAuthorize("@ss.hasPermi('out:productAndStock:list')")
@GetMapping("/pd/list")
public TableDataInfo pdList(ViewProductAndStock viewProductAndStock)
{
startPage();
List<ViewProductAndStock> list = viewProductAndStockService.selectViewProductAndStockPdList(viewProductAndStock);
return getDataTable(list);
}
/**
* 导出库存物资列表
*/
@PreAuthorize("@ss.hasPermi('out:productAndStock:export')")
@PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:export')")
@Log(title = "库存物资", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ViewProductAndStock viewProductAndStock)
@@ -73,7 +62,7 @@ public class ViewProductAndStockController extends BaseController
/**
* 获取库存物资详细信息
*/
@PreAuthorize("@ss.hasPermi('out:productAndStock:query')")
@PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:query')")
@GetMapping(value = "/{onlyIdentity}")
public AjaxResult getInfo(@PathVariable("onlyIdentity") Long onlyIdentity)
{
@@ -83,7 +72,7 @@ public class ViewProductAndStockController extends BaseController
/**
* 新增库存物资
*/
@PreAuthorize("@ss.hasPermi('out:productAndStock:add')")
@PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:add')")
@Log(title = "库存物资", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ViewProductAndStock viewProductAndStock)
@@ -94,7 +83,7 @@ public class ViewProductAndStockController extends BaseController
/**
* 修改库存物资
*/
@PreAuthorize("@ss.hasPermi('out:productAndStock:edit')")
@PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:edit')")
@Log(title = "库存物资", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ViewProductAndStock viewProductAndStock)
@@ -105,7 +94,7 @@ public class ViewProductAndStockController extends BaseController
/**
* 删除库存物资
*/
@PreAuthorize("@ss.hasPermi('out:productAndStock:remove')")
@PreAuthorize("@ss.hasPermi('productAndStock:productAndStock:remove')")
@Log(title = "库存物资", businessType = BusinessType.DELETE)
@DeleteMapping("/{onlyIdentitys}")
public AjaxResult remove(@PathVariable Long[] onlyIdentitys)

230
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java
View File

@@ -1,6 +1,5 @@
package com.ruoyi.out.productAndStock.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;
@@ -8,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 库存物资对象 view_product_and_stock
*
*
* @author ruoyi
* @date 2025-09-12
* @date 2026-01-06
*/
public class ViewProductAndStock extends BaseEntity
{
@@ -20,278 +19,226 @@ public class ViewProductAndStock extends BaseEntity
@Excel(name = "序号")
private Long onlyIdentity;
/** 品号 */
@Excel(name = "品号")
/** 物料编码 */
@Excel(name = "物料编码")
private String productId;
/** 批次号 */
@Excel(name = "批次号")
/** 批号 */
@Excel(name = "批号")
private String lotNo;
/** 品名 */
@Excel(name = "品名")
/** 物料名称 */
@Excel(name = "物料名称")
private String productName;
/** 数量 */
@Excel(name = "数量")
private BigDecimal quantity;
/** 库存数量 */
@Excel(name = "库存数量")
private String quantity;
/** 仓库 */
@Excel(name = "仓库")
/** 仓库编码 */
@Excel(name = "仓库编码")
private String warehouseId;
/** 规格 */
@Excel(name = "规格")
/** 供应商名称 */
@Excel(name = "供应商名称")
private String stackingId;
/** 层次关系 */
@Excel(name = "层次关系")
private String spare1;
/** 单位 */
@Excel(name = "单位")
/** 上层物料 */
@Excel(name = "上层物料")
private String spare2;
/** 顶层物料 */
@Excel(name = "顶层物料")
private String spare3;
/** 型号 */
@Excel(name = "型号")
/** 项目号 */
@Excel(name = "项目号")
private String spare4;
/** 颜色 */
@Excel(name = "颜色")
/** 合同号 */
@Excel(name = "合同号")
private String spare5;
/** 序列号 */
@Excel(name = "序列号")
/** 销售订单号 */
@Excel(name = "销售订单号")
private String spare6;
@Excel(name = "是否盘点")
private String spare7;
/** 电压 */
@Excel(name = "电压")
/** 供应商编码 */
@Excel(name = "供应商编码")
private String voltage;
/** 功率 */
@Excel(name = "功率")
/** 规格型号 */
@Excel(name = "规格型号")
private String power;
/** 相位 */
@Excel(name = "相位")
/** 计量单位 */
@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;
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public void setOnlyIdentity(Long onlyIdentity)
public void setOnlyIdentity(Long onlyIdentity)
{
this.onlyIdentity = onlyIdentity;
}
public Long getOnlyIdentity()
public Long getOnlyIdentity()
{
return onlyIdentity;
}
public void setProductId(String productId)
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductId()
public String getProductId()
{
return productId;
}
public void setLotNo(String lotNo)
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getLotNo()
public String getLotNo()
{
return lotNo;
}
public void setProductName(String productName)
public void setProductName(String productName)
{
this.productName = productName;
}
public String getProductName()
public String getProductName()
{
return productName;
}
public void setQuantity(BigDecimal quantity)
public void setQuantity(String quantity)
{
this.quantity = quantity;
}
public BigDecimal getQuantity()
public String getQuantity()
{
return quantity;
}
public void setWarehouseId(String warehouseId)
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
public String getWarehouseId()
{
return warehouseId;
}
public void setSpare1(String spare1)
public void setStackingId(String stackingId)
{
this.stackingId = stackingId;
}
public String getStackingId()
{
return stackingId;
}
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
public String getSpare1()
{
return spare1;
}
public void setSpare3(String spare3)
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
{
return spare2;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
public String getSpare3()
{
return spare3;
}
public void setSpare4(String spare4)
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
public String getSpare4()
{
return spare4;
}
public void setSpare5(String spare5)
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare5()
public String getSpare5()
{
return spare5;
}
public void setSpare6(String spare6)
public void setSpare6(String spare6)
{
this.spare6 = spare6;
}
public String getSpare6()
public String getSpare6()
{
return spare6;
}
public void setVoltage(String voltage)
public void setVoltage(String voltage)
{
this.voltage = voltage;
}
public String getVoltage()
public String getVoltage()
{
return voltage;
}
public void setPower(String power)
public void setPower(String power)
{
this.power = power;
}
public String getPower()
public String getPower()
{
return power;
}
public void setPhase(String phase)
public void setPhase(String phase)
{
this.phase = phase;
}
public String getPhase()
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;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -301,7 +248,9 @@ public class ViewProductAndStock extends BaseEntity
.append("productName", getProductName())
.append("quantity", getQuantity())
.append("warehouseId", getWarehouseId())
.append("stackingId", getStackingId())
.append("spare1", getSpare1())
.append("spare2", getSpare2())
.append("spare3", getSpare3())
.append("spare4", getSpare4())
.append("spare5", getSpare5())
@@ -309,11 +258,6 @@ public class ViewProductAndStock extends BaseEntity
.append("voltage", getVoltage())
.append("power", getPower())
.append("phase", getPhase())
.append("netWeight", getNetWeight())
.append("grossWeight", getGrossWeight())
.append("distribution", getDistribution())
.append("model", getModel())
.append("orderId", getOrderId())
.toString();
}
}

20
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/mapper/ViewProductAndStockMapper.java
View File

@@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
/**
* 库存物资Mapper接口
*
*
* @author ruoyi
* @date 2025-09-12
* @date 2026-01-06
*/
public interface ViewProductAndStockMapper
public interface ViewProductAndStockMapper
{
/**
* 查询库存物资
*
*
* @param onlyIdentity 库存物资主键
* @return 库存物资
*/
@@ -21,7 +21,7 @@ public interface ViewProductAndStockMapper
/**
* 查询库存物资列表
*
*
* @param viewProductAndStock 库存物资
* @return 库存物资集合
*/
@@ -29,7 +29,7 @@ public interface ViewProductAndStockMapper
/**
* 新增库存物资
*
*
* @param viewProductAndStock 库存物资
* @return 结果
*/
@@ -37,7 +37,7 @@ public interface ViewProductAndStockMapper
/**
* 修改库存物资
*
*
* @param viewProductAndStock 库存物资
* @return 结果
*/
@@ -45,7 +45,7 @@ public interface ViewProductAndStockMapper
/**
* 删除库存物资
*
*
* @param onlyIdentity 库存物资主键
* @return 结果
*/
@@ -53,11 +53,9 @@ public interface ViewProductAndStockMapper
/**
* 批量删除库存物资
*
*
* @param onlyIdentitys 需要删除的数据主键集合
* @return 结果
*/
public int deleteViewProductAndStockByOnlyIdentitys(Long[] onlyIdentitys);
List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
}

20
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/IViewProductAndStockService.java
View File

@@ -5,15 +5,15 @@ import com.ruoyi.out.productAndStock.domain.ViewProductAndStock;
/**
* 库存物资Service接口
*
*
* @author ruoyi
* @date 2025-09-12
* @date 2026-01-06
*/
public interface IViewProductAndStockService
public interface IViewProductAndStockService
{
/**
* 查询库存物资
*
*
* @param onlyIdentity 库存物资主键
* @return 库存物资
*/
@@ -21,7 +21,7 @@ public interface IViewProductAndStockService
/**
* 查询库存物资列表
*
*
* @param viewProductAndStock 库存物资
* @return 库存物资集合
*/
@@ -29,7 +29,7 @@ public interface IViewProductAndStockService
/**
* 新增库存物资
*
*
* @param viewProductAndStock 库存物资
* @return 结果
*/
@@ -37,7 +37,7 @@ public interface IViewProductAndStockService
/**
* 修改库存物资
*
*
* @param viewProductAndStock 库存物资
* @return 结果
*/
@@ -45,7 +45,7 @@ public interface IViewProductAndStockService
/**
* 批量删除库存物资
*
*
* @param onlyIdentitys 需要删除的库存物资主键集合
* @return 结果
*/
@@ -53,11 +53,9 @@ public interface IViewProductAndStockService
/**
* 删除库存物资信息
*
*
* @param onlyIdentity 库存物资主键
* @return 结果
*/
public int deleteViewProductAndStockByOnlyIdentity(Long onlyIdentity);
List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock);
}

24
ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/service/impl/ViewProductAndStockServiceImpl.java
View File

@@ -9,19 +9,19 @@ import com.ruoyi.out.productAndStock.service.IViewProductAndStockService;
/**
* 库存物资Service业务层处理
*
*
* @author ruoyi
* @date 2025-09-12
* @date 2026-01-06
*/
@Service
public class ViewProductAndStockServiceImpl implements IViewProductAndStockService
public class ViewProductAndStockServiceImpl implements IViewProductAndStockService
{
@Autowired
private ViewProductAndStockMapper viewProductAndStockMapper;
/**
* 查询库存物资
*
*
* @param onlyIdentity 库存物资主键
* @return 库存物资
*/
@@ -33,7 +33,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/**
* 查询库存物资列表
*
*
* @param viewProductAndStock 库存物资
* @return 库存物资
*/
@@ -45,7 +45,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/**
* 新增库存物资
*
*
* @param viewProductAndStock 库存物资
* @return 结果
*/
@@ -57,7 +57,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/**
* 修改库存物资
*
*
* @param viewProductAndStock 库存物资
* @return 结果
*/
@@ -69,7 +69,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/**
* 批量删除库存物资
*
*
* @param onlyIdentitys 需要删除的库存物资主键
* @return 结果
*/
@@ -81,7 +81,7 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
/**
* 删除库存物资信息
*
*
* @param onlyIdentity 库存物资主键
* @return 结果
*/
@@ -90,10 +90,4 @@ public class ViewProductAndStockServiceImpl implements IViewProductAndStockServi
{
return viewProductAndStockMapper.deleteViewProductAndStockByOnlyIdentity(onlyIdentity);
}
@Override
public List<ViewProductAndStock> selectViewProductAndStockPdList(ViewProductAndStock viewProductAndStock) {
return viewProductAndStockMapper.selectViewProductAndStockPdList(viewProductAndStock);
}
}