From 1804b7c34b0cf3151fb4672ef3aec92a66d44efc Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 30 Jun 2025 16:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=BA=93=E7=9B=98=E7=82=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2,=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/CheckDifferenceRecord.java | 18 ++++++ .../CheckDifferenceRecordServiceImpl.java | 18 ++++++ .../check/CheckDifferenceRecordMapper.xml | 21 ++++++- .../resources/mapper/stock/BasStockMapper.xml | 1 + ruoyi-ui/src/lang/en.js | 6 +- ruoyi-ui/src/lang/zh.js | 9 +-- ruoyi-ui/src/views/check/difference/index.vue | 56 ++++++++++++++----- ruoyi-ui/src/views/check/flat/index.vue | 9 ++- 8 files changed, 113 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java index 89a1f6d..9442cc5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java @@ -1,5 +1,6 @@ package com.ruoyi.check.difference.domain; +import com.ruoyi.common.domain.ExtraField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -33,6 +34,8 @@ public class CheckDifferenceRecord extends BaseEntity /** 货位id */ @Excel(name = "货位id") private String cargoSpaceId; + @Excel(name = "货位") + private String cargoSpaceName; /** 物料id */ @Excel(name = "物料id") @@ -77,6 +80,21 @@ public class CheckDifferenceRecord extends BaseEntity @Excel(name = "仓库名称") private String warehouseName; + private ExtraField extraField; + + public String getCargoSpaceName() { + return cargoSpaceName; + } + public void setCargoSpaceName(String cargoSpaceName) { + this.cargoSpaceName = cargoSpaceName; + } + public ExtraField getExtraField() { + return extraField; + } + public void setExtraField(ExtraField extraField) { + this.extraField = extraField; + } + public String getWarehouseId() { return warehouseId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java index 32dd2cf..4c7382d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java @@ -74,7 +74,11 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS } basStock.setProductStatus("2"); basStockService.updateBasStock(basStock); + checkDifferenceRecord.setCargoSpaceId(basStock.getCargoSpaceId()); checkDifferenceRecord.setOldQuantity(basStock.getQuantity()); + checkDifferenceRecord.setTrayCode(basStock.getTrayCode()); + checkDifferenceRecord.setProductId(basStock.getProductId()); + checkDifferenceRecord.setWarehouseId(basStock.getWarehouseId()); }else if (checkDifferenceRecord.getRecordType()==2){ //判断该物料是否已经存在 BasStock queryStock = new BasStock(); @@ -100,6 +104,11 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS basStock.setProductStatus("2"); basStockService.updateBasStock(basStock); checkDifferenceRecord.setNewQuantity("0"); + checkDifferenceRecord.setCargoSpaceId(basStock.getCargoSpaceId()); + checkDifferenceRecord.setTrayCode(basStock.getTrayCode()); + checkDifferenceRecord.setProductId(basStock.getProductId()); + checkDifferenceRecord.setWarehouseId(basStock.getWarehouseId()); + checkDifferenceRecord.setOldQuantity(basStock.getQuantity()); } checkDifferenceRecord.setCreateTime(new Date()); checkDifferenceRecord.setCheckGuid(IdUtil.fastSimpleUUID()); @@ -129,6 +138,15 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS @Override public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids) { + for (String checkGuid : checkGuids) { + CheckDifferenceRecord checkDifferenceRecord = checkDifferenceRecordMapper.selectCheckDifferenceRecordByCheckGuid(checkGuid); + if (checkDifferenceRecord.getRecordType() == 3 || checkDifferenceRecord.getRecordType() == 1){ + //如果是删除和修改的数据，则需要更新库存状态 + BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId()); + basStock.setProductStatus("1"); + basStockService.updateBasStock(basStock); + } + } return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuids(checkGuids); } diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml index e1f58bf..3896972 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -22,15 +23,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select r.check_guid, r.check_stock_detail_id, r.stock_id, r.tray_code, r.cargo_space_id, - r.product_id, r.lot_no, r.supplier, r.customer, r.old_quantity, r.new_quantity, + select r.check_guid, r.check_stock_detail_id, r.stock_id, r.tray_code, r.cargo_space_id, + r.product_id, r.lot_no, r.supplier, r.customer, r.old_quantity, r.new_quantity, r.record_type, r.create_time, r.product_guid, r.status, r.warehouse_id, - w.warehouse_name + w.warehouse_name,bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume, + bcs.cargo_space_name from check_difference_record r left join bas_warehouse w on r.warehouse_id = w.warehouse_id + left join bas_product bp on r.product_id = bp.product_id + left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id