lhq/FT542-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
lsymicc
2025-12-08 15:28:32 +08:00
parent 12a3e92039 4b2e90d556
commit 05d2c7bbbc
35 changed files with 1678 additions and 1395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
View File

@@ -28,6 +28,7 @@ public interface IToErpService {
String login();
AjaxResult callErp(ReceiveOutStockConfirm receiveOutStockConfirm);
AjaxResult receiveOutStockList();

14
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
View File

@@ -38,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -130,10 +131,10 @@ public class ToErpServiceImpl implements IToErpService {
AspResponse responseBean = JSONUtil.toBean(body, AspResponse.class);
for (List<String> row : responseBean.getBody().getSource().getTable().getRows()) {
BasProduct product = new BasProduct();
product.setProductGuid(row.get(0));
product.setProductId(row.get(0));
product.setProductGuid(row.get(2));
product.setProductId(row.get(2));
product.setProductName(row.get(1));
product.setCargoNo(row.get(2));
product.setCargoNo(row.get(0));
product.setSpec(row.get(3));
product.setUnit(row.get(4));
product.setSpare1(row.get(5));
@@ -283,9 +284,12 @@ public class ToErpServiceImpl implements IToErpService {
outStockout.setWarehouseId(Convert.toStr(row.get(2)));
outStockout.setErpStockoutId(Convert.toStr(row.get(0)));
outStockout.setStockoutGuid(stockOutId);
outStockout.setCreateDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
outStockout.setCreateDate(Convert.toStr(row.get(3)));
outStockout.setOutType("1");
outStockout.setStatus("1");
outStockout.setFID(Convert.toStr(row.get(1)));
outStockout.setStockoutSource("2");
outStockout.setCustomerNo(Convert.toStr(row.get(24)));
ErpOutStock erpOutStock1 = erpOutStockService.selectErpOutStockByStockoutId(erpOutStock.getStockoutId());
OutStockout outStockout1 = outStockoutService.selectOutStockoutByStockoutGuid(outStockout.getStockoutGuid());
if (ObjUtil.isNotNull(erpOutStock1)){
@@ -346,6 +350,8 @@ public class ToErpServiceImpl implements IToErpService {
outStockoutDetail.setQuantity(detail.getQuantity());
outStockoutDetail.setProductName(detail.getProductName());
outStockoutDetail.setFid(Convert.toStr(detail.getId()));
outStockoutDetail.setAssignNum(BigDecimal.valueOf(0));
outStockoutDetail.setAllotQuantity(BigDecimal.valueOf(0));
ErpOutStockDetail erpOutStockDetail1 = erpOutStockDetailService.selectErpOutStockDetailById(detail.getId());
OutStockoutDetail outStockoutDetail1 = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(outStockoutDetail.getStockoutDetailId());
if (ObjUtil.isNotNull(erpOutStockDetail1)){

25
ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java
View File

@@ -107,6 +107,18 @@ public class KpiController extends BaseController {
return success(kpiService.getRoadways(warehouseId));
}
/**
* 获取货位楼层数据
*
* @param warehouseId 仓库ID
* @return 货位楼层数据
*/
@GetMapping("/getFloors")
public AjaxResult getFloors(@RequestParam("warehouseId") String warehouseId){
return success(kpiService.getFloors(warehouseId));
}
/**
* 获取货位排数据
*
@@ -116,23 +128,22 @@ public class KpiController extends BaseController {
*/
@GetMapping("/getPlatoons")
public AjaxResult getPlatoons(@RequestParam("warehouseId") String warehouseId,
@RequestParam("roadwayId") String roadwayId){
return success(kpiService.getPlatoons(warehouseId,roadwayId));
@RequestParam("theFloor") String theFloor){
return success(kpiService.getPlatoons(warehouseId,theFloor));
}
/**
* 获取库存平面图
*
* @param warehouseId 仓库ID
* @param roadwayId 巷道ID
* @param thePlatoon 排
* @param theFloor 层数
* @return 库存平面图数据
*/
@GetMapping("/getChartData")
public AjaxResult getChartData(@RequestParam("warehouseId") String warehouseId,
@RequestParam("roadwayId") String roadwayId,
@RequestParam("thePlatoon") String thePlatoon){
return success(kpiService.getChartData(warehouseId,roadwayId,thePlatoon));
@RequestParam("theFloor") String theFloor
){
return success(kpiService.getChartData(warehouseId,theFloor));
}
/**

4
ruoyi-admin/src/main/java/com/ruoyi/kpi/service/KpiService.java
View File

@@ -40,7 +40,7 @@ public interface KpiService {
Map<String, Object> getPlatoons(String warehouseId, String roadwayId);
Map<String,Object> getChartData(String warehouseId, String roadwayId, String thePlatoon);
Map<String,Object> getChartData(String warehouseId, String theFloor);
Map<String,Object> getChartMag(String warehouseId, String theColumn, String theFloor, String thePlatoon);
@@ -48,4 +48,6 @@ public interface KpiService {
// 新增：根据仓库和巷道统计各状态货位数量
Map<String, Object> getSpaceStatusCounts(String warehouseId, String roadwayId);
Map<String, Object> getFloors(String warehouseId);
}

152
ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
View File

@@ -33,7 +33,7 @@ public class KpiServiceImpl implements KpiService
@Autowired
private BasCargoSpaceMapper basCargoSpaceMapper;
@Autowired
private BasStockMapper basStockMapper;
/**
@@ -53,7 +53,7 @@ public class KpiServiceImpl implements KpiService
Map<String, Integer> roadwayCount = new HashMap<>();
for (MydoJob job : list) {
// 检查入库作业标识是否小于10
// 检查入库作业标识是否小于20
if (job.getInOrOut() == null || Integer.parseInt(job.getInOrOut()) >= 20) {
continue;
}
@@ -317,6 +317,36 @@ public class KpiServiceImpl implements KpiService
return res;
}
@Override
public Map<String, Object> getFloors(String warehouseId) {
Map<String, Object> response = new HashMap<>();
// 查询指定仓库和巷道的排号信息
BasCargoSpace queryParams = new BasCargoSpace();
queryParams.setWarehouseId(warehouseId);
List<BasCargoSpace> list = basCargoSpaceMapper.selectBasCargoSpaceList(queryParams);
// 使用TreeSet去重并排序排号
Set<Long> platoonSet = new TreeSet<>();
for (BasCargoSpace space : list) {
if (space.getTheFloor() != null) {
platoonSet.add(space.getTheFloor());
}
}
// 转换为前端下拉框所需的格式
List<Map<String, String>> platoons = new ArrayList<>();
for (Long platoon : platoonSet) {
Map<String, String> platoonMap = new HashMap<>();
platoonMap.put("value", platoon.toString());
platoonMap.put("label", platoon + "层");
platoons.add(platoonMap);
}
response.put("data", platoons);
return response;
}
@Override
public Map<String, Object> getRoadways(String warehouseId){
Map<String, Object> response = new HashMap<>();
@@ -348,13 +378,13 @@ public class KpiServiceImpl implements KpiService
}
@Override
public Map<String,Object> getPlatoons(String warehouseId, String roadwayId){
public Map<String,Object> getPlatoons(String warehouseId, String theFloor){
Map<String, Object> response = new HashMap<>();
// 查询指定仓库和巷道的排号信息
BasCargoSpace queryParams = new BasCargoSpace();
queryParams.setWarehouseId(warehouseId);
queryParams.setRoadwayId(roadwayId);
queryParams.setTheFloor(Long.valueOf(theFloor));
List<BasCargoSpace> list = basCargoSpaceMapper.selectBasCargoSpaceList(queryParams);
// 使用TreeSet去重并排序排号
@@ -379,14 +409,11 @@ public class KpiServiceImpl implements KpiService
}
@Override
public Map<String,Object> getChartData(String warehouseId, String roadwayId, String thePlatoon) {
public Map<String,Object> getChartData(String warehouseId, String theFloor) {
// 查询指定仓库、巷道和排号的货位信息
BasCargoSpace queryParams = new BasCargoSpace();
queryParams.setWarehouseId(warehouseId);
queryParams.setRoadwayId(roadwayId);
if (thePlatoon != null) {
queryParams.setThePlatoon(Long.parseLong(thePlatoon));
}
queryParams.setTheFloor(Long.valueOf(theFloor));
List<BasCargoSpace> list = basCargoSpaceMapper.selectBasCargoSpaceList(queryParams);
// 用于存储不同状态的货位坐标
@@ -405,11 +432,11 @@ public class KpiServiceImpl implements KpiService
for (BasCargoSpace space : list) {
// 收集列和层信息
columnSet.add(space.getTheColumn());
floorSet.add(space.getTheFloor());
floorSet.add(space.getThePlatoon());
// 根据状态分类处理
if (space.getStatus() != null) {
String coordinate = "[" + space.getTheColumn() + "," + space.getTheFloor() + "," + space.getStatus() + "],";
String coordinate = "[" + space.getTheColumn() + "," + space.getThePlatoon() + "," + space.getStatus() + "],";
switch (Integer.parseInt(space.getStatus())) {
case 1: empty += coordinate; break;
case 2: full += coordinate; break;
@@ -424,15 +451,19 @@ public class KpiServiceImpl implements KpiService
// 构建列和层的标签
StringBuilder columnLabels = new StringBuilder();
for (Long col : columnSet) {
columnLabels.append("'").append(col).append(MessageUtils.message("kpi.spacePlan.column")).append("',");
columnLabels.append("'").append(col).append("列").append("',");
}
String column = "[" + columnLabels.toString() + "]";
String column = "[" + columnLabels + "]";
StringBuilder floorLabels = new StringBuilder();
for (Long floor : floorSet) {
floorLabels.append("'").append(floor).append(MessageUtils.message("kpi.spacePlan.floor")).append("',");
if (floor==7){
floorLabels.append("'").append(6).append("排").append("',");
}
floorLabels.append("'").append(floor).append("排").append("',");
}
String floor = "[" + floorLabels.toString() + "]";
//floorLabels.append("6排");
String floor = "[" + floorLabels + "]";
// 返回结果
Map<String, Object> map = new HashMap<>();
@@ -469,7 +500,7 @@ public class KpiServiceImpl implements KpiService
info.append("货位名称：").append(space.getCargoSpaceName()).append("<br>");
info.append("是否锁定：").append("Y".equals(space.getLocked()) ? "是" : "否").append("<br>");
info.append("托盘条码：").append(space.getTrayCode() != null ? space.getTrayCode() : "无").append("<br>");
// 根据cargoSpaceId查询BasStock表，获取productId和productName
BasStock stockQuery = new BasStock();
stockQuery.setCargoSpaceId(space.getCargoSpaceId());
@@ -489,7 +520,7 @@ public class KpiServiceImpl implements KpiService
}
@Override
public AjaxResult getInAnalysisByData(String warehouseId, String startTime, String endTime,String inOut) {
public AjaxResult getInAnalysisByData(String warehouseId, String startTime, String endTime, String inOut) {
Map<String,Object> res = new HashMap<>();
MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setWarehouseId(warehouseId);
@@ -497,47 +528,92 @@ public class KpiServiceImpl implements KpiService
mydoJobParam.setCreateLeftTime(startTime);
mydoJobParam.setCreateRightTime(endTime);
mydoJobParam.setInOut(inOut);
List<DateTime> datesBetween = DateUtil.rangeToList(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), DateField.DAY_OF_MONTH);
List<MydoJob> list = mydoJobFinishMapper.selectMydoJobFinishListByMydoJob(mydoJobParam);
// 获取所有巷道ID（1和2）
List<String> roadwayIds = Arrays.asList("1", "2");
// 收集所有涉及的楼层
Set<Long> floorSet = new HashSet<>();
Map<String, BasCargoSpace> cargoSpaceCache = new HashMap<>();
// 遍历作业记录，收集涉及的货位ID并查询对应楼层
for (MydoJob job : list) {
if (job.getCargoSpaceId() != null) {
// 检查缓存中是否有该货位信息
if (!cargoSpaceCache.containsKey(job.getCargoSpaceId())) {
// 使用现有的查询方法查询货位信息
BasCargoSpace queryParam = new BasCargoSpace();
queryParam.setCargoSpaceId(job.getCargoSpaceId());
List<BasCargoSpace> cargoSpaces = basCargoSpaceMapper.selectBasCargoSpaceList(queryParam);
if (!cargoSpaces.isEmpty()) {
BasCargoSpace cargoSpace = cargoSpaces.get(0);
cargoSpaceCache.put(job.getCargoSpaceId(), cargoSpace);
if (cargoSpace.getTheFloor() != null) {
floorSet.add(cargoSpace.getTheFloor());
}
}
} else {
BasCargoSpace cachedSpace = cargoSpaceCache.get(job.getCargoSpaceId());
if (cachedSpace.getTheFloor() != null) {
floorSet.add(cachedSpace.getTheFloor());
}
}
}
}
// 将楼层排序
List<Long> floors = new ArrayList<>(floorSet);
Collections.sort(floors);
// 生成日期范围
List<DateTime> datesBetween = DateUtil.rangeToList(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), DateField.DAY_OF_MONTH);
List<String> xAxis = new ArrayList<>();
List<Map<String, Object>> series = new ArrayList<>();
// 为每个巷道创建一个系列
for (String roadwayId : roadwayIds) {
// 为每个楼层创建一个系列
for (Long floor : floors) {
Map<String, Object> seriesItem = new HashMap<>();
seriesItem.put("name", roadwayId + "号巷道");
seriesItem.put("name", floor + "层");
seriesItem.put("type", "line");
List<Long> data = new ArrayList<>();
seriesItem.put("data", data);
series.add(seriesItem);
}
// 按日期统计每个巷道的数量
// 按日期统计每个楼层的数量
for (DateTime dateTime : datesBetween) {
xAxis.add(DateUtil.format(dateTime, "yyyy-MM-dd"));
// 统计每个巷道在当天的数量
for (int i = 0; i < roadwayIds.size(); i++) {
String roadwayId = roadwayIds.get(i);
long count = list.stream()
.filter(mydoJob -> roadwayId.equals(mydoJob.getRoadwayId())
&& DateUtil.isIn(mydoJob.getCreateTime(), DateUtil.beginOfDay(dateTime), DateUtil.endOfDay(dateTime)))
.count();
// 统计每个楼层在当天的数量
for (int i = 0; i < floors.size(); i++) {
Long floor = floors.get(i);
long count = 0;
// 遍历作业记录，统计该楼层在当天的作业数量
for (MydoJob job : list) {
if (DateUtil.isIn(job.getCreateTime(), DateUtil.beginOfDay(dateTime), DateUtil.endOfDay(dateTime))) {
// 查找该作业对应的货位是否属于当前楼层
if (job.getCargoSpaceId() != null && cargoSpaceCache.containsKey(job.getCargoSpaceId())) {
BasCargoSpace space = cargoSpaceCache.get(job.getCargoSpaceId());
if (space.getTheFloor() != null && space.getTheFloor().equals(floor)) {
count++;
}
}
}
}
@SuppressWarnings("unchecked")
List<Long> data = (List<Long>) series.get(i).get("data");
data.add(count);
}
}
res.put("xAxis", xAxis);
res.put("series", series);
return AjaxResult.success(res);
}
}

8
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
View File

@@ -40,10 +40,10 @@ public class OutStockoutController extends BaseController {
public TableDataInfo list(OutStockout outStockout) {
startPage();
List<OutStockout> list = new ArrayList<>();
if(Integer.parseInt(outStockout.getStatus())<4){
list =outStockoutService.selectOutStockoutList(outStockout);
}else{
list=outStockoutFinishService.selectOutStockoutFinishListByOutStockout(outStockout);
if (Integer.parseInt(outStockout.getStatus()) < 4) {
list = outStockoutService.selectOutStockoutList(outStockout);
} else {
list = outStockoutFinishService.selectOutStockoutFinishListByOutStockout(outStockout);
}
return getDataTable(list);
}

9
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
View File

@@ -94,8 +94,17 @@ public class OutStockout extends BaseEntity
private String remark;
private String theme;
private List<String> typeData;
public String getTheme() {
return theme;
}
public void setTheme(String theme) {
this.theme = theme;
}
public String getSupplierName() {
return supplierName;

4
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
View File

@@ -135,7 +135,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
String username = SecurityContextHolder.getContext().getAuthentication().getName();
outStockout.setCreateManId(username);
outStockout.setStatus("1");
outStockout.setStockoutSource("0");
outStockout.setStockoutSource("1");
// outStockout.setWarehouseId("01");
for (int i = 0; i < detailList.size(); i++) {
OutStockoutDetail outStockoutDetail = detailList.get(i);
@@ -155,7 +155,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
public String updateOutStockoutStatus(String[] stockoutIds, String status, String newStatus,String exitId) {
HashMap<String, String> map = new HashMap<>();
StringBuilder stringBuilder = new StringBuilder();
if (status.equals("4")){
if ("4".equals(status)){
for(String stockoutId:stockoutIds){
ReceiveOutStockConfirm receiveOutStockConfirm = new ReceiveOutStockConfirm();
OutStockout outStockout = selectOutStockoutByStockoutGuid(stockoutId);

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

@@ -23,9 +23,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* 库存物资Controller
*
*
* @author ruoyi
* @date 2025-09-12
* @date 2025-12-08
*/
@RestController
@RequestMapping("/out/productAndStock")
@@ -45,17 +45,6 @@ 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);
}
/**
* 导出库存物资列表

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

@@ -9,135 +9,29 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 库存物资对象 view_product_and_stock
*
* @author ruoyi
* @date 2025-10-21
* @date 2025-12-08
*/
public class ViewProductAndStock
public class ViewProductAndStock extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 序号 */
@Excel(name = "序号")
/** 唯一id */
@Excel(name = "唯一id")
private Long onlyIdentity;
/** 物料编码 */
@Excel(name = "物料编码")
/** 产品编码 */
@Excel(name = "产品编码")
private String productId;
/** 批次 */
@Excel(name = "批次")
private String lotNo;
/** 物料名称 */
@Excel(name = "物料名称")
/** 产品名称 */
@Excel(name = "产品名称")
private String productName;
/** 库存数量 */
@Excel(name = "库存数量")
private String quantity;
/** 仓库 */
@Excel(name = "仓库")
private String warehouseId;
/** 来源 */
@Excel(name = "来源")
private String spare1;
/** 套账 */
@Excel(name = "套账")
private String spare3;
/** 用途 */
@Excel(name = "用途")
private String spare4;
/** 台次 */
@Excel(name = "台次")
private String spare5;
/** 入库单价 */
@Excel(name = "入库单价")
private String spare6;
/** 状态 */
@Excel(name = "状态")
private String voltage;
/** 件次 */
@Excel(name = "件次")
private String power;
/** 供应商 */
// @Excel(name = "供应商")
private String phase;
private String supplierName;
/** 管理号 */
@Excel(name = "管理号")
private String distribution;
/** 合同号 */
@Excel(name = "合同号")
private String orderId;
/** 质量等级 */
@Excel(name = "质量等级")
private String spare8;
/** 单价 */
@Excel(name = "单价")
private String price;
/** 图号 */
@Excel(name = "图号")
private String cargoNo;
/** 物料状态 */
@Excel(name = "物料状态")
private String productStatus;
/** 常用编码 */
@Excel(name = "常用编码")
private String parentId;
/** 启用标识 */
@Excel(name = "启用标识")
private String spare7;
@Excel(name = "创建时间")
private String createTime;
/** 创建用户 */
@Excel(name = "创建用户")
private String createSys;
/** 规格型号 */
@Excel(name = "规格型号")
private String spec;
/** 单位 */
@Excel(name = "单位")
private String unit;
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public void setOnlyIdentity(Long onlyIdentity)
public void setOnlyIdentity(Long onlyIdentity)
{
this.onlyIdentity = onlyIdentity;
}
@@ -157,16 +51,6 @@ public class ViewProductAndStock
return productId;
}
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getLotNo()
{
return lotNo;
}
public void setProductName(String productName)
{
this.productName = productName;
@@ -187,235 +71,13 @@ public class ViewProductAndStock
return quantity;
}
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
{
return warehouseId;
}
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
{
return spare1;
}
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 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 setDistribution(String distribution)
{
this.distribution = distribution;
}
public String getDistribution()
{
return distribution;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
public String getOrderId()
{
return orderId;
}
public void setSpare8(String spare8)
{
this.spare8 = spare8;
}
public String getSpare8()
{
return spare8;
}
public void setPrice(String price)
{
this.price = price;
}
public String getPrice()
{
return price;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setProductStatus(String productStatus)
{
this.productStatus = productStatus;
}
public String getProductStatus()
{
return productStatus;
}
public void setParentId(String parentId)
{
this.parentId = parentId;
}
public String getParentId()
{
return parentId;
}
public void setSpare7(String spare7)
{
this.spare7 = spare7;
}
public String getSpare7()
{
return spare7;
}
public void setCreateSys(String createSys)
{
this.createSys = createSys;
}
public String getCreateSys()
{
return createSys;
}
public void setSpec(String spec)
{
this.spec = spec;
}
public String getSpec()
{
return spec;
}
public void setUnit(String unit)
{
this.unit = unit;
}
public String getUnit()
{
return unit;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("onlyIdentity", getOnlyIdentity())
.append("productId", getProductId())
.append("lotNo", getLotNo())
.append("productName", getProductName())
.append("quantity", getQuantity())
.append("warehouseId", getWarehouseId())
.append("spare1", getSpare1())
.append("spare3", getSpare3())
.append("spare4", getSpare4())
.append("spare5", getSpare5())
.append("spare6", getSpare6())
.append("voltage", getVoltage())
.append("power", getPower())
.append("phase", getPhase())
.append("distribution", getDistribution())
.append("orderId", getOrderId())
.append("spare8", getSpare8())
.append("price", getPrice())
.append("cargoNo", getCargoNo())
.append("productStatus", getProductStatus())
.append("parentId", getParentId())
.append("spare7", getSpare7())
.append("createTime", getCreateTime())
.append("createSys", getCreateSys())
.append("spec", getSpec())
.append("unit", getUnit())
.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 2025-12-08
*/
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 2025-12-08
*/
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 2025-12-08
*/
@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);
}
}

9
ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
View File

@@ -90,6 +90,15 @@ public class BasStockFreezeRecord extends BaseEntity
/** 物料guid */
// @Excel(name = "${stock.Freeze.productGuid}")
private String productGuid;
/** 单位名称 */
@Excel(name = "单位名称")
private String unitName;
/** 产品型号 */
@Excel(name = "产品型号")
private String productModel;
// 创建时间
@Excel(name = "操作时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -101,6 +101,14 @@ public class BasStockMaintainRecord extends BaseEntity
// @Excel(name = "${stock.Maintain.barCodeQuantity}")
private String barCodeQuantity;
/** 单位名称 */
@Excel(name = "单位名称")
private String unitName;
/** 产品型号 */
@Excel(name = "产品型号")
private String productModel;
/** 物料guid */
// @Excel(name = "${stock.Maintain.productGuid}")
private String productGuid;

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

@@ -81,8 +81,7 @@ public class BasStock extends BaseEntity {
private String spare8;
private String voltage;
@Excel(name = "件次",sort=18)
private String power;
private String phase;
private String netWeight;
private String grossWeight;
@@ -217,4 +216,112 @@ public class BasStock extends BaseEntity {
private String cargoNo;
@Excel(name = "备注",sort=31)
private String remark;
private String power;
/** 产品型号 */
@Excel(name = "产品型号")
private String productModel;
// ---------- 产品明细 pd_ 字段 (来自产品明细 JSON) ----------
/** 入库明细ID */
private String pdDetailId;
/** 产品名称（明细） */
private String pdProductName;
/** 型号（明细） */
private String pdModel;
/** 单位（明细） */
private String pdUnit;
/** 单价（明细） */
private String pdUnitPrice;
/** 辅助单位（明细） */
private String pdAuxUnit;
/** 产品属性1（明细） */
private String pdAttr1;
/** 产品属性2（明细） */
private String pdAttr2;
/** 数量（明细） */
private String pdQuantity;
/** 入库数（明细） */
private String pdInQty;
/** 辅助数量（明细） */
private String pdAuxQuantity;
/** 总价（明细） */
private String pdTotalPrice;
/** 成本单价（明细） */
private String pdCostUnitPrice;
/** 总价2（明细） */
private String pdTotalPrice2;
/** 核算成本总价（明细） */
private String pdAccountCostTotal;
/** 核算数量（明细） */
private String pdAccountQuantity;
/** 核算状态（明细） */
private String pdAccountStatus;
/** 批号（明细） */
private String pdBatchNo;
/** 序列号（明细） */
private String pdSerialNo;
/** 生产日期（明细） */
private String pdProdDate;
/** 有效日期（明细） */
private String pdValidDate;
/** 到货日期（明细） */
private String pdArrivalDate;
/** 备注（明细） */
private String pdRemark;
/** 自定义字段1（明细） */
private String pdCustom1;
/** 自定义字段2（明细） */
private String pdCustom2;
/** 自定义字段3（明细） */
private String pdCustom3;
/** 自定义字段4（明细） */
private String pdCustom4;
/** 自定义字段5（明细） */
private String pdCustom5;
/** 自定义字段6（明细） */
private String pdCustom6;
/** 装卸工（明细） */
private String pdLoader;
// ---------- SQL 脚本中新增的其他字段 ----------
/** 集合数据（JSON/序列化） */
private String Rows;
/** 入库主题 */
private String Title;
/** 入库id */
private String Kuin;
/** 入库状态 */
private String Complete1;
/** 申请人 */
private String Cateid;
/** 申请日期 */
private String Date3;
/** 确认日期 */
private String Date5;
/** 审批人 */
private String Catein;
/** 审批意见 */
private String Intro2;
/** 入库备注 */
private String Intro;
/** 关联其他单据id */
private String Caigou;
/** 添加时间 */
private String Date7;
/** 库管id */
private String Kg;
/** 入库类别 */
private String Sort1;
/** 入库编号 */
private String Rkbh;
/** 审批状态 */
private String Status;
/** 产品明细（JSON/集合） */
private String KuinList;
/** 客户名称 */
private String sysIcusIInheritIdIidI413;
/** 磅单编号 */
private String sysIcusIInheritIdIidI414;
/** 入库车号 */
private String sysIcusIInheritIdIidI415;
}

6
ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
View File

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="customerName" column="customer_name" />
<result property="supplierName" column="supplier_name" />
<result property="remark" column="remark" />
<result property="theme" column="theme" />
</resultMap>
<sql id="selectOutStockoutVo">
@@ -34,12 +35,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,o.remark from out_stockout o
o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,eos.outbound_remarks as remark
,eos.customer_name
from out_stockout o
left join out_stockout_detail d on d.stockout_id = o.stockout_id
left join bas_customer bc on bc.customer_no = d.out_id
left join bas_warehouse bw on bw.warehouse_id = d.warehouse_id
left join bas_supplier bs on bs.supplier_no = d.supplier_id
left join bas_product bp on bp.product_id = d.product_id
left join erp_out_stock eos on eos.stockout_id = o.erp_stockout_id
<where>
<if test="stockoutGuid != null and stockoutGuid != ''"> and o.stockout_guid = #{stockoutGuid}</if>

116
ruoyi-admin/src/main/resources/mapper/out/ViewProductAndStockMapper.xml
View File

@@ -7,35 +7,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="ViewProductAndStock" id="ViewProductAndStockResult">
<result property="onlyIdentity" column="only_identity" />
<result property="productId" column="product_id" />
<result property="lotNo" column="lot_no" />
<result property="productName" column="product_name" />
<result property="quantity" column="quantity" />
<result property="warehouseId" column="warehouse_id" />
<result property="spare1" column="spare1" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="voltage" column="voltage" />
<result property="power" column="power" />
<result property="phase" column="phase" />
<result property="distribution" column="distribution" />
<result property="orderId" column="order_id" />
<result property="spare8" column="spare8" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="productStatus" column="product_status" />
<result property="parentId" column="parent_id" />
<result property="spare7" column="spare7" />
<result property="createTime" column="create_time" />
<result property="createSys" column="create_sys" />
<result property="spec" column="spec" />
<result property="unit" column="unit" />
<result property="supplierName" column="supplier_name" />
</resultMap>
<sql id="selectViewProductAndStockVo">
select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, spare1, spare3, spare4, spare5, spare6, voltage, power, phase, distribution, order_id, spare8, price, cargo_no, product_status, parent_id, spare7, create_time, create_sys, spec, unit,supplier_name from view_product_and_stock
select only_identity, product_id, product_name, quantity from view_product_and_stock
</sql>
<select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
@@ -43,30 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="onlyIdentity != null "> and only_identity = #{onlyIdentity}</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</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="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="distribution != null and distribution != ''"> and distribution like concat('%', #{distribution}, '%')</if>
<if test="orderId != null and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 = #{spare8}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="productStatus != null and productStatus != ''"> and product_status = #{productStatus}</if>
<if test="parentId != null and parentId != ''"> and parent_id = #{parentId}</if>
<if test="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="createSys != null and createSys != ''"> and create_sys like concat('%', #{createSys}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
</where>
</select>
@@ -80,60 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="onlyIdentity != null">only_identity,</if>
<if test="productId != null">product_id,</if>
<if test="lotNo != null">lot_no,</if>
<if test="productName != null">product_name,</if>
<if test="quantity != null">quantity,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="spare1 != null">spare1,</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="voltage != null">voltage,</if>
<if test="power != null">power,</if>
<if test="phase != null">phase,</if>
<if test="distribution != null">distribution,</if>
<if test="orderId != null">order_id,</if>
<if test="spare8 != null">spare8,</if>
<if test="price != null">price,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="productStatus != null">product_status,</if>
<if test="parentId != null">parent_id,</if>
<if test="spare7 != null">spare7,</if>
<if test="createTime != null">create_time,</if>
<if test="createSys != null">create_sys,</if>
<if test="spec != null">spec,</if>
<if test="unit != null">unit,</if>
<if test="supplierName != null">supplier_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="onlyIdentity != null">#{onlyIdentity},</if>
<if test="productId != null">#{productId},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="productName != null">#{productName},</if>
<if test="quantity != null">#{quantity},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="spare1 != null">#{spare1},</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="voltage != null">#{voltage},</if>
<if test="power != null">#{power},</if>
<if test="phase != null">#{phase},</if>
<if test="distribution != null">#{distribution},</if>
<if test="orderId != null">#{orderId},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="price != null">#{price},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="productStatus != null">#{productStatus},</if>
<if test="parentId != null">#{parentId},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createSys != null">#{createSys},</if>
<if test="spec != null">#{spec},</if>
<if test="unit != null">#{unit},</if>
<if test="supplierName != null">#{supplierName},</if>
</trim>
</insert>
@@ -141,31 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update view_product_and_stock
<trim prefix="SET" suffixOverrides=",">
<if test="productId != null">product_id = #{productId},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="spare1 != null">spare1 = #{spare1},</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="voltage != null">voltage = #{voltage},</if>
<if test="power != null">power = #{power},</if>
<if test="phase != null">phase = #{phase},</if>
<if test="distribution != null">distribution = #{distribution},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="price != null">price = #{price},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="productStatus != null">product_status = #{productStatus},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createSys != null">create_sys = #{createSys},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
</trim>
where only_identity = #{onlyIdentity}
</update>

151
ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
View File

@@ -5,81 +5,115 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper">
<resultMap type="ViewStockDetail" id="ViewStockDetailResult">
<result property="spare3" column="spare3" />
<result property="cargoSpaceId" column="cargo_space_id" />
<result property="trayCode" column="tray_code" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<!-- 与 BasStock 不符的字段已注释 -->
<!-- <result property="spec" column="spec" /> -->
<result property="quantity" column="quantity" />
<result property="spare6" column="spare6" />
<result property="price" column="price" />
<result property="spare1" column="spare1" />
<result property="unit" column="unit" />
<result property="cargoNo" column="cargo_no" />
<!-- <result property="price" column="price" /> -->
<!-- <result property="unit" column="unit" /> -->
<!-- <result property="cargoNo" column="cargo_no" /> -->
<result property="orderId" column="order_id" />
<result property="spare5" column="spare5" />
<result property="power" column="power" />
<result property="spare8" column="spare8" />
<result property="parentId" column="parent_id" />
<!-- bs.power 字段与 BasStock 不一致，已注释 -->
<!-- <result property="power" column="power_col" /> -->
<!-- <result property="parentId" column="parent_id" /> -->
<result property="stockinId" column="stockin_id" />
<result property="supplierName" column="supplier_name" />
<result property="supplierNo" column="supplier_no" />
<!-- 供应商相关字段与 BasStock 不符，已注释 -->
<!-- <result property="supplierName" column="supplier_name" /> -->
<!-- <result property="supplierNo" column="supplier_no" /> -->
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="inDate" column="in_date" />
<result property="stackingId" column="stacking_id" />
<result property="spare7" column="spare7" />
<!-- stackingId 非 BasStock 字段，已注释 -->
<!-- <result property="stackingId" column="stacking_id" /> -->
<result property="backDate" column="back_date" />
<result property="remark" column="remark" />
<!-- 备注字段使用 pd_remark（明细）或保留在 BasStock 中，基于适配需求先注释 remark -->
<!-- <result property="remark" column="remark" /> -->
<result property="stockId" column="stock_id" />
<result property="stockStatus" column="stock_status" />
<result property="lotNo" column="lot_no" />
<result property="outQuantity" column="out_quantity" />
<result property="spare4" column="spare4" />
<result property="spare1" column="spare1" />
<result property="productType" column="productType" />
<!-- productType 来自 bas_product(bp)，BasStock 未将其作为主表字段，已注释 -->
<!-- <result property="productType" column="productType" /> -->
<!-- 添加 BasStock 的 pd_ 明细映射 -->
<result property="pdDetailId" column="pd_detail_id" />
<result property="pdProductName" column="pd_product_name" />
<result property="pdModel" column="pd_model" />
<result property="pdUnit" column="pd_unit" />
<result property="pdUnitPrice" column="pd_unit_price" />
<result property="pdAuxUnit" column="pd_aux_unit" />
<result property="pdAttr1" column="pd_attr1" />
<result property="pdAttr2" column="pd_attr2" />
<result property="pdQuantity" column="pd_quantity" />
<result property="pdInQty" column="pd_in_qty" />
<result property="pdAuxQuantity" column="pd_aux_quantity" />
<result property="pdTotalPrice" column="pd_total_price" />
<result property="pdCostUnitPrice" column="pd_cost_unit_price" />
<result property="pdTotalPrice2" column="pd_total_price_2" />
<result property="pdAccountCostTotal" column="pd_account_cost_total" />
<result property="pdAccountQuantity" column="pd_account_quantity" />
<result property="pdAccountStatus" column="pd_account_status" />
<result property="pdBatchNo" column="pd_batch_no" />
<result property="pdSerialNo" column="pd_serial_no" />
<result property="pdProdDate" column="pd_prod_date" />
<result property="pdValidDate" column="pd_valid_date" />
<result property="pdArrivalDate" column="pd_arrival_date" />
<result property="pdRemark" column="pd_remark" />
<result property="pdCustom1" column="pd_custom1" />
<result property="pdCustom2" column="pd_custom2" />
<result property="pdCustom3" column="pd_custom3" />
<result property="pdCustom4" column="pd_custom4" />
<result property="pdCustom5" column="pd_custom5" />
<result property="pdCustom6" column="pd_custom6" />
<result property="pdLoader" column="pd_loader" />
</resultMap>
<sql id="selectViewStockDetailVo">
select bs.spare3, --账套
bs.cargo_space_id, --库位编码
bs.tray_code, --托盘
bs.product_id, --产品编码
bs.product_name,--产品名称
bp.spec, -- 规格
bs.quantity, -- 数量
bs.spare6, -- 金额
bp.price, --单价
bp.spare1 as productType, --产品状态
bp.unit, -- 单位
bp.cargo_no, --图号
bs.order_id, --合同号
bs.spare5, --台次
bs.power, --件次
bs.spare8, --质量
bp.parent_id, --常用编码
bs.stockin_id, --入库单号
bs2.supplier_name, --供应商名称
bs2.supplier_no, --供应商编号
bw.warehouse_id, --仓库编码
bw.warehouse_name, --仓库名称
bs.in_date, --入库时间
bs.stacking_id, --出库时间
bs.spare7, --盘点标识
bs.back_date, --盘点时间
bp.remark, --备注
bs.stock_id, --库存编码
bs.stock_status, --库存状态
bs.lot_no, --批次号
bs.out_quantity,
bs.spare4, --来源
bs.spare1 --用途
from bas_stock bs
select bs.cargo_space_id, --库位编码
bs.tray_code, --托盘
bs.product_id, --产品编码
bs.product_name,--产品名称
bs.quantity, -- 数量
bs.order_id, --合同号
bs.stockin_id, --入库单号
bw.warehouse_id, --仓库编码
bw.warehouse_name, --仓库名称
bs.in_date, --入库时间
bs.back_date, --盘点时间
-- bas_stock 的 pd_ 明细字段
bs.pd_product_name, -- 明细产品名称
bs.pd_batch_no, -- 明细批次号
bs.pd_serial_no, -- 明细序列号
bs.pd_model, -- 明细型号
bs.pd_unit, -- 明细单位
bs.pd_unit_price, -- 明细单价
bs.pd_quantity, -- 明细数量
bs.pd_total_price, -- 明细金额
bs.pd_cost_unit_price,
bs.pd_prod_date, -- 明细生产日期
bs.pd_valid_date, -- 明细有效日期
bs.pd_arrival_date, -- 明细到货日期
bs.pd_remark, -- 明细备注
bs.stock_id, --库存编码
bs.stock_status, --库存状态
bs.lot_no, --批次号
bs.out_quantity
from bas_stock bs
left join bas_product bp on bs.product_id = bp.product_id
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
left join bas_supplier bs2 on bs.phase = bs2.supplier_no
</sql>
<select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
@@ -98,11 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stockinId != null and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
<if test="warehouseId != null and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
<if test="stackingId != null and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
<if test="spare1 != null and spare1 != ''"> and bs.spare1 = #{spare1}</if>
<if test="spare3 != null and spare3 != ''"> and bs.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and bs.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and bs.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and bs.spare6 = #{spare6}</if>
<if test="voltage != null and voltage != ''"> and bs.voltage = #{voltage}</if>
<if test="power != null and power != ''"> and bs.power = #{power}</if>
<if test="orderId != null and orderId != ''"> and bs.order_id = #{orderId}</if>
@@ -113,8 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="theColumn != null and theColumn != ''"> and bcs.the_column = #{theColumn}</if>
<if test="spec != null and spec != ''"> and bp.spec = #{spec}</if>
<if test="parentId != null and parentId != ''"> and bp.parent_id = #{parentId}</if>
<if test="supplierId != null and supplierId != ''"> and bs2.supplier_no = #{supplierId}</if>
<if test="supplierName != null and supplierName != ''"> and bs2.supplier_name = #{supplierName}</if>
<if test="price != null and price != ''"> and bp.price = #{price}</if>
<if test="inDateStart != null and inDateStart != ''"> and bs.in_date &gt;= #{inDateStart}</if>
<if test="inDateEnd != null and inDateEnd != ''"> and bs.in_date &lt;= #{inDateEnd}</if>

18
ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml
View File

@@ -25,22 +25,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="productGuid" column="product_guid" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectBasStockFreezeRecordVo">
select wh_guid, stock_id, bsfr.cargo_space_id,bw.warehouse_name, bcs.cargo_space_name, bsfr.tray_code, product_id, product_name, print_date, lot_no, old_status, curr_status, method, bsfr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid
from bas_stock_freeze_record bsfr
left join bas_cargo_space bcs on bsfr.cargo_space_id=bcs.cargo_space_id
left join bas_warehouse bw on bsfr.warehouse_id=bw.warehouse_id
select bsfr.wh_guid, bsfr.stock_id, bsfr.cargo_space_id, bw.warehouse_name, bcs.cargo_space_name, bsfr.tray_code,
bsfr.product_id, bsfr.product_name, bsfr.print_date, bsfr.lot_no, bsfr.old_status, bsfr.curr_status, bsfr.method,
bsfr.warehouse_id, bsfr.create_time, bsfr.stock_detail_id, bsfr.operating_target, bsfr.bar_code_old_quantity,
bsfr.bar_code_quantity, bsfr.product_guid
from bas_stock_freeze_record bsfr
left join bas_cargo_space bcs on bsfr.cargo_space_id = bcs.cargo_space_id
left join bas_warehouse bw on bsfr.warehouse_id = bw.warehouse_id
left join bas_stock bs on bsfr.stock_id = bs.stock_id
</sql>
<select id="selectBasStockFreezeRecordList" parameterType="BasStockFreezeRecord" resultMap="BasStockFreezeRecordResult">
<include refid="selectBasStockFreezeRecordVo"/>
<where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="stockId != null and stockId != ''"> and bsfr.stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and bsfr.cargo_space_id = #{cargoSpaceId}</if>
<if test="trayCode != null and trayCode != ''"> and bsfr.tray_code = #{trayCode}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="productId != null and productId != ''"> and bsfr.product_id = #{productId}</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>

22
ruoyi-admin/src/main/resources/mapper/stock/BasStockMaintainRecordMapper.xml
View File

@@ -25,22 +25,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="productGuid" column="product_guid" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectBasStockMaintainRecordVo">
select wh_guid, stock_id, bsmr.cargo_space_id,bw.warehouse_name, bcs.cargo_space_name, bsmr.tray_code, product_id, product_name, print_date, lot_no, old_quantity, quantity, method, bsmr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid
from bas_stock_maintain_record bsmr
left join bas_cargo_space bcs on bsmr.cargo_space_id=bcs.cargo_space_id
left join bas_warehouse bw on bsmr.warehouse_id=bw.warehouse_id
</sql>
<sql id="selectBasStockMaintainRecordVo">
select bsmr.wh_guid, bsmr.stock_id, bsmr.cargo_space_id, bw.warehouse_name, bcs.cargo_space_name, bsmr.tray_code,
bsmr.product_id, bsmr.product_name, bsmr.print_date, bsmr.lot_no, bsmr.old_quantity, bsmr.quantity, bsmr.method,
bsmr.warehouse_id, bsmr.create_time, bsmr.stock_detail_id, bsmr.operating_target, bsmr.bar_code_old_quantity,
bsmr.bar_code_quantity, bsmr.product_guid
from bas_stock_maintain_record bsmr
left join bas_cargo_space bcs on bsmr.cargo_space_id = bcs.cargo_space_id
left join bas_warehouse bw on bsmr.warehouse_id = bw.warehouse_id
left join bas_stock bs on bsmr.stock_id = bs.stock_id
</sql>
<select id="selectBasStockMaintainRecordList" parameterType="BasStockMaintainRecord" resultMap="BasStockMaintainRecordResult">
<include refid="selectBasStockMaintainRecordVo"/>
<where>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="stockId != null and stockId != ''"> and bsmr.stock_id = #{stockId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and bsmr.cargo_space_id = #{cargoSpaceId}</if>
<if test="trayCode != null and trayCode != ''"> and bsmr.tray_code = #{trayCode}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="productId != null and productId != ''"> and bsmr.product_id = #{productId}</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>

521
ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
View File

@@ -5,101 +5,163 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.stock.stock.mapper.BasStockMapper">
<resultMap type="BasStock" id="BasStockResult">
<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="warehouseName" column="warehouse_name" />
<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="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<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="cargoSpaceStatus" column="locked" />
<result property="cargoSpaceStockStatus" column="cargoSpaceStockStatus" />
<result property="warehouseName" column="warehouse_name" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="price" column="price" />
<result property="unit" column="unit" />
<result property="cargoNo" column="cargo_no" />
<result property="parentId" column="parent_id" />
<result property="supplierName" column="supplier_name" />
<result property="supplierId" column="supplier_no" />
<result property="remark" column="remark" />
<result property="productType" column="productType" />
<!--<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
</association>-->
<!-- 基于 stock.sql 的 bas_stock 表字段映射，非表字段已注释保留 -->
<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="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="orderId" column="order_id" />
<!-- 以下为 bas_stock 表中存在的扩展字段（来自 stock.sql） -->
<result property="Rows" column="Rows" />
<result property="Title" column="Title" />
<result property="Kuin" column="Kuin" />
<result property="Complete1" column="Complete1" />
<result property="Cateid" column="Cateid" />
<result property="Date3" column="Date3" />
<result property="Date5" column="Date5" />
<result property="Catein" column="Catein" />
<result property="Intro2" column="Intro2" />
<result property="Intro" column="Intro" />
<result property="Caigou" column="Caigou" />
<result property="Date7" column="Date7" />
<result property="Kg" column="Kg" />
<result property="Sort1" column="Sort1" />
<result property="Rkbh" column="Rkbh" />
<result property="Status" column="Status" />
<result property="KuinList" column="KuinList" />
<result property="sysIcusIInheritIdIidI413" column="sysIcusIInheritIdIidI413" />
<result property="sysIcusIInheritIdIidI414" column="sysIcusIInheritIdIidI414" />
<result property="sysIcusIInheritIdIidI415" column="sysIcusIInheritIdIidI415" />
<!-- 产品明细 pd_ 映射（表中存在） -->
<result property="pdDetailId" column="pd_detail_id" />
<result property="pdProductName" column="pd_product_name" />
<result property="pdModel" column="pd_model" />
<result property="pdUnit" column="pd_unit" />
<result property="pdUnitPrice" column="pd_unit_price" />
<result property="pdAuxUnit" column="pd_aux_unit" />
<result property="pdAttr1" column="pd_attr1" />
<result property="pdAttr2" column="pd_attr2" />
<result property="pdQuantity" column="pd_quantity" />
<result property="pdInQty" column="pd_in_qty" />
<result property="pdAuxQuantity" column="pd_aux_quantity" />
<result property="pdTotalPrice" column="pd_total_price" />
<result property="pdCostUnitPrice" column="pd_cost_unit_price" />
<result property="pdTotalPrice2" column="pd_total_price_2" />
<result property="pdAccountCostTotal" column="pd_account_cost_total" />
<result property="pdAccountQuantity" column="pd_account_quantity" />
<result property="pdAccountStatus" column="pd_account_status" />
<result property="pdBatchNo" column="pd_batch_no" />
<result property="pdSerialNo" column="pd_serial_no" />
<result property="pdProdDate" column="pd_prod_date" />
<result property="pdValidDate" column="pd_valid_date" />
<result property="pdArrivalDate" column="pd_arrival_date" />
<result property="pdRemark" column="pd_remark" />
<result property="pdCustom1" column="pd_custom1" />
<result property="pdCustom2" column="pd_custom2" />
<result property="pdCustom3" column="pd_custom3" />
<result property="pdCustom4" column="pd_custom4" />
<result property="pdCustom5" column="pd_custom5" />
<result property="pdCustom6" column="pd_custom6" />
<result property="pdLoader" column="pd_loader" />
<!-- 以下为非 bas_stock 表字段（保留注释，按要求不删除） -->
<!--
<result property="warehouseName" column="warehouse_name" />
<result property="cargoSpaceStatus" column="locked" />
<result property="cargoSpaceStockStatus" column="cargoSpaceStockStatus" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="spec" column="spec" />
<result property="price" column="price" />
<result property="unit" column="unit" />
<result property="cargoNo" column="cargo_no" />
<result property="parentId" column="parent_id" />
<result property="remark" column="remark" />
<result property="productModel" column="productModel" />
<result property="productType" column="productType" />
-->
</resultMap>
<sql id="selectBasStockVo">
select bs.spare3, --账套
bs.cargo_space_id, --库位编码
bs.tray_code, --托盘
bs.product_id, --产品编码
bp.product_name,--产品名称
bp.spec, -- 规格
bs.quantity, -- 数量
bs.spare6, -- 金额
bp.price, --单价
bp.spare1 as productType, --产品状态
bp.unit, -- 单位
bp.cargo_no, --图号
bs.order_id, --合同号
bs.spare5, --台次
bs.power, --件次
bs.spare8, --质量
bp.parent_id, --常用编码
bs.stockin_id, --入库单号
bs2.supplier_name, --供应商名称
bs2.supplier_no, --供应商编号
bw.warehouse_id, --仓库编码
bw.warehouse_name, --仓库名称
bs.in_date, --入库时间
bs.stacking_id, --出库时间
bs.spare7, --盘点标识
bs.back_date, --盘点时间
bp.remark, --备注
bs.stock_id, --库存编码
bs.stock_status, --库存状态
bs.lot_no, --批次号
bs.out_quantity,
bs.spare4, --来源
bs.spare1 --用途
<sql id="selectBasStockVo">
select bs.cargo_space_id, --库位编码（bas_stock）
bs.tray_code, --托盘（bas_stock）
bs.product_id, --产品编码（bas_stock）
bs.product_name, --产品名称（bas_stock）
-- bp.spec, -- 规格（非 bas_stock，已注释保留）
bs.quantity, -- 数量（bas_stock）
-- bp.price, -- 单价（非 bas_stock，已注释保留）
-- bp.spare1 as productType, -- 产品状态（非 bas_stock，已注释保留）
-- bp.cargo_no, -- 图号（非 bas_stock，已注释保留）
bs.order_id, -- 合同号（bas_stock）
-- bs.power (已移除，旧字段)
-- bp.parent_id, -- 常用编码（非 bas_stock，已注释保留）
bs.stockin_id, -- 入库单号（bas_stock）
bs.warehouse_id, -- 仓库编码（bas_stock）
-- bw.warehouse_name, -- 仓库名称（非 bas_stock，已注释保留）
bs.in_date, -- 入库时间（bas_stock）
<!-- bs.stacking_id 已移除（不在新表中） -->
bs.back_date, -- 盘点时间（bas_stock）
-- bp.remark, -- 备注（非 bas_stock，已注释保留）
bs.Rows, -- 集合数据（bas_stock）
bs.Title, -- 入库主题（bas_stock）
bs.Kuin, -- 入库id（bas_stock）
bs.Complete1, -- 入库状态（bas_stock）
bs.Cateid, -- 申请人（bas_stock）
bs.Date3, -- 申请日期（bas_stock）
bs.Date5, -- 确认日期（bas_stock）
bs.Catein, -- 审批人（bas_stock）
bs.Intro2, -- 审批意见（bas_stock）
bs.Intro, -- 入库备注（bas_stock）
bs.Caigou, -- 关联单据id（bas_stock）
bs.Date7, -- 添加时间（bas_stock）
bs.Kg, -- 库管id（bas_stock）
bs.Sort1, -- 入库类别（bas_stock）
bs.Rkbh, -- 入库编号（bas_stock）
bs.Status, -- 审批状态（bas_stock）
bs.KuinList, -- 产品明细集合（bas_stock）
bs.sysIcusIInheritIdIidI413, -- 客户名称（bas_stock）
bs.sysIcusIInheritIdIidI414, -- 磅单编号（bas_stock）
bs.sysIcusIInheritIdIidI415, -- 入库车号（bas_stock）
bs.pd_product_name, -- 明细产品名称（bas_stock）
bs.pd_batch_no, -- 明细批次号（bas_stock）
bs.pd_serial_no, -- 明细序列号（bas_stock）
bs.pd_prod_date, -- 明细生产日期（bas_stock）
bs.pd_valid_date, -- 明细有效日期（bas_stock）
bs.pd_arrival_date, -- 明细到货日期（bas_stock）
bs.stock_id, -- 库存编码（bas_stock）
bs.stock_status, -- 库存状态（bas_stock）
bs.lot_no, -- 批次号（bas_stock）
bs.out_quantity
-- bp.unit, -- 单位（非 bas_stock，已注释保留）
-- bp.model as productModel, -- 非 bas_stock，已注释保留
-- bcs.locked as locked, -- 非 bas_stock，已注释保留
-- bcs.status as cargoSpaceStockStatus, -- 非 bas_stock，已注释保留
-- bcs.cargo_space_name as cargo_space_name -- 非 bas_stock，已注释保留
from bas_stock bs
left join bas_product bp on bs.product_id = bp.product_id
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
left join bas_supplier bs2 on bs.phase = bs2.supplier_no
</sql>
left join bas_product bp on bs.product_id = bp.product_id
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
</sql>
<select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
<include refid="selectBasStockVo"/>
@@ -123,20 +185,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inType != null and inType != ''"> and bs.in_type = #{inType}</if>
<if test="inClassId != null and inClassId != ''"> and bs.in_class_id = #{inClassId}</if>
<if test="warehouseId != null and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
<if test="stackingId != null and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
<if test="spare1 != null and spare1 != ''"> and bs.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and bs.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and bs.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and bs.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and bs.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and bs.spare6 = #{spare6}</if>
<if test="voltage != null and voltage != ''"> and bs.voltage = #{voltage}</if>
<if test="power != null and power != ''"> and bs.power = #{power}</if>
<if test="phase != null and phase != ''"> and bs.phase = #{phase}</if>
<if test="netWeight != null and netWeight != ''"> and bs.net_weight = #{netWeight}</if>
<if test="grossWeight != null and grossWeight != ''"> and bs.gross_weight = #{grossWeight}</if>
<if test="distribution != null and distribution != ''"> and bs.distribution = #{distribution}</if>
<if test="model != null and model != ''"> and bs.model = #{model}</if>
<!-- 已移除查询条件：stackingId（stacking_id 不在新表） -->
<!-- 已移除查询条件：voltage, net_weight, gross_weight, distribution, model （不在新表中） -->
<if test="unit != null and unit != ''"> and bp.unit like concat('%', #{unit}, '%')</if>
<if test="productModel != null and productModel != ''"> and bp.model like concat('%', #{productModel}, '%')</if>
<if test="orderId != null and orderId != ''"> and bs.order_id = #{orderId}</if>
<if test="productId != null and productId != ''"> and bs.product_id = #{productId}</if>
<if test="cargoSpaceStockStatus != null and cargoSpaceStockStatus != ''"> and bcs.status = #{cargoSpaceStockStatus}</if>
@@ -147,13 +200,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="theColumn != null and theColumn != ''"> and bcs.the_column = #{theColumn}</if>
<if test="spec != null and spec != ''"> and bp.spec = #{spec}</if>
<if test="parentId != null and parentId != ''"> and bp.parent_id = #{parentId}</if>
<if test="supplierId != null and supplierId != ''"> and bs2.supplier_no = #{supplierId}</if>
<if test="supplierName != null and supplierName != ''"> and bs2.supplier_name = #{supplierName}</if>
<if test="price != null and price != ''"> and bp.price = #{price}</if>
<if test="inDateStart != null and inDateStart != ''"> and bs.in_date &gt;= #{inDateStart}</if>
<if test="inDateEnd != null and inDateEnd != ''"> and bs.in_date &lt;= #{inDateEnd}</if>
<if test="productType != null and productType != ''"> and bp.spare1 = #{productType}</if>
<!-- 产品明细 搜索条件 -->
<if test="pdProductName != null and pdProductName != ''"> and bs.pd_product_name like concat('%', #{pdProductName}, '%')</if>
<if test="pdBatchNo != null and pdBatchNo != ''"> and bs.pd_batch_no = #{pdBatchNo}</if>
<if test="pdSerialNo != null and pdSerialNo != ''"> and bs.pd_serial_no = #{pdSerialNo}</if>
</where>
</select>
@@ -166,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertBasStock" parameterType="BasStock">
insert into bas_stock
<trim prefix="(" suffix=")" suffixOverrides=",">
<!-- bas_stock 表字段 -->
<if test="stockId != null">stock_id,</if>
<if test="cargoSpaceId != null">cargo_space_id,</if>
<if test="stockStatus != null">stock_status,</if>
@@ -183,27 +241,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<!-- SQL 添加字段（bas_stock 中存在） -->
<if test="Rows != null">Rows,</if>
<if test="Title != null">Title,</if>
<if test="Kuin != null">Kuin,</if>
<if test="Complete1 != null">Complete1,</if>
<if test="Cateid != null">Cateid,</if>
<if test="Date3 != null">Date3,</if>
<if test="Date5 != null">Date5,</if>
<if test="Catein != null">Catein,</if>
<if test="Intro2 != null">Intro2,</if>
<if test="Intro != null">Intro,</if>
<if test="Caigou != null">Caigou,</if>
<if test="Date7 != null">Date7,</if>
<if test="Kg != null">Kg,</if>
<if test="Sort1 != null">Sort1,</if>
<if test="Rkbh != null">Rkbh,</if>
<if test="Status != null">Status,</if>
<if test="KuinList != null">KuinList,</if>
<if test="sysIcusIInheritIdIidI413 != null">sysIcusIInheritIdIidI413,</if>
<if test="sysIcusIInheritIdIidI414 != null">sysIcusIInheritIdIidI414,</if>
<if test="sysIcusIInheritIdIidI415 != null">sysIcusIInheritIdIidI415,</if>
<!-- pd_ 明细字段（bas_stock 中存在） -->
<if test="pdDetailId != null">pd_detail_id,</if>
<if test="pdProductName != null">pd_product_name,</if>
<if test="pdModel != null">pd_model,</if>
<if test="pdUnit != null">pd_unit,</if>
<if test="pdUnitPrice != null">pd_unit_price,</if>
<if test="pdAuxUnit != null">pd_aux_unit,</if>
<if test="pdAttr1 != null">pd_attr1,</if>
<if test="pdAttr2 != null">pd_attr2,</if>
<if test="pdQuantity != null">pd_quantity,</if>
<if test="pdInQty != null">pd_in_qty,</if>
<if test="pdAuxQuantity != null">pd_aux_quantity,</if>
<if test="pdTotalPrice != null">pd_total_price,</if>
<if test="pdCostUnitPrice != null">pd_cost_unit_price,</if>
<if test="pdTotalPrice2 != null">pd_total_price_2,</if>
<if test="pdAccountCostTotal != null">pd_account_cost_total,</if>
<if test="pdAccountQuantity != null">pd_account_quantity,</if>
<if test="pdAccountStatus != null">pd_account_status,</if>
<if test="pdBatchNo != null">pd_batch_no,</if>
<if test="pdSerialNo != null">pd_serial_no,</if>
<if test="pdProdDate != null">pd_prod_date,</if>
<if test="pdValidDate != null">pd_valid_date,</if>
<if test="pdArrivalDate != null">pd_arrival_date,</if>
<if test="pdRemark != null">pd_remark,</if>
<if test="pdCustom1 != null">pd_custom1,</if>
<if test="pdCustom2 != null">pd_custom2,</if>
<if test="pdCustom3 != null">pd_custom3,</if>
<if test="pdCustom4 != null">pd_custom4,</if>
<if test="pdCustom5 != null">pd_custom5,</if>
<if test="pdCustom6 != null">pd_custom6,</if>
<if test="pdLoader != null">pd_loader,</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>
<!-- 以下为非 bas_stock 字段，注释保留 -->
<!-- <if test="voltage != null">voltage,</if> -->
<!-- power 字段已移除 -->
<!-- <if test="netWeight != null">net_weight,</if> -->
<!-- <if test="grossWeight != null">gross_weight,</if> -->
<!-- <if test="distribution != null">distribution,</if> -->
<!-- model 字段已从 bas_stock 表移除，写入引用已删除 -->
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<!-- bas_stock 字段 values -->
<if test="stockId != null">#{stockId},</if>
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
<if test="stockStatus != null">#{stockStatus},</if>
@@ -221,25 +325,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<!-- SQL 添加字段 values（bas_stock 中存在） -->
<if test="Rows != null">#{Rows},</if>
<if test="Title != null">#{Title},</if>
<if test="Kuin != null">#{Kuin},</if>
<if test="Complete1 != null">#{Complete1},</if>
<if test="Cateid != null">#{Cateid},</if>
<if test="Date3 != null">#{Date3},</if>
<if test="Date5 != null">#{Date5},</if>
<if test="Catein != null">#{Catein},</if>
<if test="Intro2 != null">#{Intro2},</if>
<if test="Intro != null">#{Intro},</if>
<if test="Caigou != null">#{Caigou},</if>
<if test="Date7 != null">#{Date7},</if>
<if test="Kg != null">#{Kg},</if>
<if test="Sort1 != null">#{Sort1},</if>
<if test="Rkbh != null">#{Rkbh},</if>
<if test="Status != null">#{Status},</if>
<if test="KuinList != null">#{KuinList},</if>
<if test="sysIcusIInheritIdIidI413 != null">#{sysIcusIInheritIdIidI413},</if>
<if test="sysIcusIInheritIdIidI414 != null">#{sysIcusIInheritIdIidI414},</if>
<if test="sysIcusIInheritIdIidI415 != null">#{sysIcusIInheritIdIidI415},</if>
<!-- pd_ 明细字段 values -->
<if test="pdDetailId != null">#{pdDetailId},</if>
<if test="pdProductName != null">#{pdProductName},</if>
<if test="pdModel != null">#{pdModel},</if>
<if test="pdUnit != null">#{pdUnit},</if>
<if test="pdUnitPrice != null">#{pdUnitPrice},</if>
<if test="pdAuxUnit != null">#{pdAuxUnit},</if>
<if test="pdAttr1 != null">#{pdAttr1},</if>
<if test="pdAttr2 != null">#{pdAttr2},</if>
<if test="pdQuantity != null">#{pdQuantity},</if>
<if test="pdInQty != null">#{pdInQty},</if>
<if test="pdAuxQuantity != null">#{pdAuxQuantity},</if>
<if test="pdTotalPrice != null">#{pdTotalPrice},</if>
<if test="pdCostUnitPrice != null">#{pdCostUnitPrice},</if>
<if test="pdTotalPrice2 != null">#{pdTotalPrice2},</if>
<if test="pdAccountCostTotal != null">#{pdAccountCostTotal},</if>
<if test="pdAccountQuantity != null">#{pdAccountQuantity},</if>
<if test="pdAccountStatus != null">#{pdAccountStatus},</if>
<if test="pdBatchNo != null">#{pdBatchNo},</if>
<if test="pdSerialNo != null">#{pdSerialNo},</if>
<if test="pdProdDate != null">#{pdProdDate},</if>
<if test="pdValidDate != null">#{pdValidDate},</if>
<if test="pdArrivalDate != null">#{pdArrivalDate},</if>
<if test="pdRemark != null">#{pdRemark},</if>
<if test="pdCustom1 != null">#{pdCustom1},</if>
<if test="pdCustom2 != null">#{pdCustom2},</if>
<if test="pdCustom3 != null">#{pdCustom3},</if>
<if test="pdCustom4 != null">#{pdCustom4},</if>
<if test="pdCustom5 != null">#{pdCustom5},</if>
<if test="pdCustom6 != null">#{pdCustom6},</if>
<if test="pdLoader != null">#{pdLoader},</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>
<!-- 非 bas_stock 值占位注释保留 -->
<!-- <if test="voltage != null">#{voltage},</if> -->
<!-- <if test="netWeight != null">#{netWeight},</if> -->
<!-- <if test="grossWeight != null">#{grossWeight},</if> -->
<!-- <if test="distribution != null">#{distribution},</if> -->
</trim>
</insert>
@@ -262,35 +409,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<!-- 已移除 update set for stacking_id -->
<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>
<!-- 以下为非 bas_stock 字段，注释保留 -->
<!-- <if test="productName != null">product_name = #{productName},</if> -->
<!-- <if test="voltage != null">voltage = #{voltage},</if> -->
<!-- power 字段已移除 -->
<!-- <if test="netWeight != null">net_weight = #{netWeight},</if> -->
<!-- <if test="grossWeight != null">gross_weight = #{grossWeight},</if> -->
<!-- <if test="distribution != null">distribution = #{distribution},</if> -->
<!-- model 更新已移除 -->
<if test="orderId != null">order_id = #{orderId},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<!-- SQL 脚本新增字段 set （bas_stock 中存在） -->
<if test="Rows != null">Rows = #{Rows},</if>
<if test="Title != null">Title = #{Title},</if>
<if test="Kuin != null">Kuin = #{Kuin},</if>
<if test="Complete1 != null">Complete1 = #{Complete1},</if>
<if test="Cateid != null">Cateid = #{Cateid},</if>
<if test="Date3 != null">Date3 = #{Date3},</if>
<if test="Date5 != null">Date5 = #{Date5},</if>
<if test="Catein != null">Catein = #{Catein},</if>
<if test="Intro2 != null">Intro2 = #{Intro2},</if>
<if test="Intro != null">Intro = #{Intro},</if>
<if test="Caigou != null">Caigou = #{Caigou},</if>
<if test="Date7 != null">Date7 = #{Date7},</if>
<if test="Kg != null">Kg = #{Kg},</if>
<if test="Sort1 != null">Sort1 = #{Sort1},</if>
<if test="Rkbh != null">Rkbh = #{Rkbh},</if>
<if test="Status != null">Status = #{Status},</if>
<if test="KuinList != null">KuinList = #{KuinList},</if>
<if test="sysIcusIInheritIdIidI413 != null">sysIcusIInheritIdIidI413 = #{sysIcusIInheritIdIidI413},</if>
<if test="sysIcusIInheritIdIidI414 != null">sysIcusIInheritIdIidI414 = #{sysIcusIInheritIdIidI414},</if>
<if test="sysIcusIInheritIdIidI415 != null">sysIcusIInheritIdIidI415 = #{sysIcusIInheritIdIidI415},</if>
<!-- pd_ 明细字段 set -->
<if test="pdDetailId != null">pd_detail_id = #{pdDetailId},</if>
<if test="pdProductName != null">pd_product_name = #{pdProductName},</if>
<if test="pdModel != null">pd_model = #{pdModel},</if>
<if test="pdUnit != null">pd_unit = #{pdUnit},</if>
<if test="pdUnitPrice != null">pd_unit_price = #{pdUnitPrice},</if>
<if test="pdAuxUnit != null">pd_aux_unit = #{pdAuxUnit},</if>
<if test="pdAttr1 != null">pd_attr1 = #{pdAttr1},</if>
<if test="pdAttr2 != null">pd_attr2 = #{pdAttr2},</if>
<if test="pdQuantity != null">pd_quantity = #{pdQuantity},</if>
<if test="pdInQty != null">pd_in_qty = #{pdInQty},</if>
<if test="pdAuxQuantity != null">pd_aux_quantity = #{pdAuxQuantity},</if>
<if test="pdTotalPrice != null">pd_total_price = #{pdTotalPrice},</if>
<if test="pdCostUnitPrice != null">pd_cost_unit_price = #{pdCostUnitPrice},</if>
<if test="pdTotalPrice2 != null">pd_total_price_2 = #{pdTotalPrice2},</if>
<if test="pdAccountCostTotal != null">pd_account_cost_total = #{pdAccountCostTotal},</if>
<if test="pdAccountQuantity != null">pd_account_quantity = #{pdAccountQuantity},</if>
<if test="pdAccountStatus != null">pd_account_status = #{pdAccountStatus},</if>
<if test="pdBatchNo != null">pd_batch_no = #{pdBatchNo},</if>
<if test="pdSerialNo != null">pd_serial_no = #{pdSerialNo},</if>
<if test="pdProdDate != null">pd_prod_date = #{pdProdDate},</if>
<if test="pdValidDate != null">pd_valid_date = #{pdValidDate},</if>
<if test="pdArrivalDate != null">pd_arrival_date = #{pdArrivalDate},</if>
<if test="pdRemark != null">pd_remark = #{pdRemark},</if>
<if test="pdCustom1 != null">pd_custom1 = #{pdCustom1},</if>
<if test="pdCustom2 != null">pd_custom2 = #{pdCustom2},</if>
<if test="pdCustom3 != null">pd_custom3 = #{pdCustom3},</if>
<if test="pdCustom4 != null">pd_custom4 = #{pdCustom4},</if>
<if test="pdCustom5 != null">pd_custom5 = #{pdCustom5},</if>
<if test="pdCustom6 != null">pd_custom6 = #{pdCustom6},</if>
<if test="pdLoader != null">pd_loader = #{pdLoader},</if>
</trim>
where stock_id = #{stockId}
</update>
<insert id="insertBasStockList">
INSERT INTO bas_stock
(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)
(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,product_id,product_name,/*voltage,net_weight,gross_weight,distribution,*/order_id,
pd_detail_id,pd_product_name,pd_model,pd_unit,pd_unit_price,pd_aux_unit,pd_attr1,pd_attr2,pd_quantity,pd_in_qty,pd_aux_quantity,pd_total_price,pd_cost_unit_price,pd_total_price_2,pd_account_cost_total,pd_account_quantity,pd_account_status,pd_batch_no,pd_serial_no,pd_prod_date,pd_valid_date,pd_arrival_date,pd_remark,pd_custom1,pd_custom2,pd_custom3,pd_custom4,pd_custom5,pd_custom6,pd_loader)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId}
,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7},#{item.spare8})
(#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.productId}
,#{item.productName},/*#{item.voltage},#{item.netWeight},#{item.grossWeight},#{item.distribution},*/#{item.orderId},
#{item.pdDetailId},#{item.pdProductName},#{item.pdModel},#{item.pdUnit},#{item.pdUnitPrice},#{item.pdAuxUnit},#{item.pdAttr1},#{item.pdAttr2},#{item.pdQuantity},#{item.pdInQty},#{item.pdAuxQuantity},#{item.pdTotalPrice},#{item.pdCostUnitPrice},#{item.pdTotalPrice2},#{item.pdAccountCostTotal},#{item.pdAccountQuantity},#{item.pdAccountStatus},#{item.pdBatchNo},#{item.pdSerialNo},#{item.pdProdDate},#{item.pdValidDate},#{item.pdArrivalDate},#{item.pdRemark},#{item.pdCustom1},#{item.pdCustom2},#{item.pdCustom3},#{item.pdCustom4},#{item.pdCustom5},#{item.pdCustom6},#{item.pdLoader})
</foreach>
</insert>
@@ -298,7 +493,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update bas_stock set stock_status = #{stockStatus} where tray_code = #{trayCode}
</update>
<update id="resetPdRecord">
update bas_stock set spare7 = '0'
update bas_stock set pd_account_status = '0'
</update>
<delete id="deleteBasStockByStockId" parameterType="String">