From 35f38dfbd458d717476f90d73b75485719ca54f3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 19 Aug 2024 11:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=A2=9E=E5=8A=A0=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=98?= =?UTF-8?q?=E7=9B=88=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81=E5=92=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=AE=8C=E6=88=90=20=E8=B0=83=E8=AF=95=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E7=9B=98=E7=9B=88=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=AE=8C=E6=88=90=20=E7=9B=98=E7=9B=88=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= =?UTF-8?q?=20PC=E7=AB=AF=E7=9B=98=E7=9B=88=E5=85=A5=E5=BA=93=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E5=AE=8C=E6=88=90=20=E9=87=87=E8=B4=AD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/wms/inventorycheckbill/Extra.java | 5 ++ .../WmsInventoryCheckbillGoodsPyDto.java | 6 ++ .../WmsInventoryCheckbillService.java | 14 ++++- .../fegin/basegoodssku/GoodsDeptVo.java | 16 ++++- .../base/basegoodssku/BaseGoodsSkuMapper.xml | 11 +++- .../biz/base/basegoodssku/GoodsDeptVo.java | 16 ++++- .../biz/base/basegoodssku/GoodsSkuVo.java | 2 + .../PmsPurchasebackBillDetailsVo.java | 4 -- .../PmsPurchasebackBillService.java | 4 -- .../PmsPurchasebackDetail.java | 23 +++++++ .../PmsPurchasebackDetailDetailsVo.java | 22 +++++++ .../PmsPurchasebackDetailDto.java | 22 +++++++ .../pms/pmspurchasebill/PmsPurchaseBill.java | 5 ++ .../PmsPurchaseBillDetailsVo.java | 7 +++ .../pmspurchasebill/PmsPurchaseBillDto.java | 5 ++ .../PmsPurchaseBillService.java | 2 + .../PmsPurchaseBillDetail.java | 5 ++ .../PmsPurchaseBillDetailDetailsVo.java | 5 ++ .../PmsPurchaseBillDetailDto.java | 5 ++ .../inventroy/WmsInventoryProfitinRest.java | 21 +++++-- .../apiadmin/inventroy/WmsInventoryRest.java | 10 ++++ .../WmsInventoryBillUseOrgSidQuery.java | 40 +++++++++++++ .../WmsInventoryBillUseOrgSidVo.java | 60 +++++++++++++++++++ .../wmsinventory/WmsInventoryMapper.java | 2 + .../wmsinventory/WmsInventoryMapper.xml | 20 +++++++ .../wmsinventory/WmsInventoryService.java | 40 ++++++++++++- .../WmsInventoryCheckbillMapper.java | 3 + .../WmsInventoryCheckbillMapper.xml | 58 ++++++++++++------ .../WmsInventoryCheckbillService.java | 15 ++++- .../WmsInventoryCheckbillDetail.java | 20 +++++-- .../WmsInventoryCheckbillDetailDetailsVo.java | 20 +++++-- .../WmsInventoryCheckbillDetailDto.java | 20 +++++-- .../WmsInventoryCheckbillDetailMapper.java | 7 +-- .../WmsInventoryCheckbillDetailMapper.xml | 27 ++++++++- .../WmsInventoryCheckbillDetailService.java | 13 +++- .../app/WmsInventoryCheckbillGoodsPyDto.java | 6 ++ .../WmsInventoryProfitinDetailsVo.java | 12 ++-- .../WmsInventoryProfitinDto.java | 8 +-- .../WmsInventoryProfitinService.java | 23 +++++-- .../WmsInventoryProfitinDetail.java | 22 +++++-- .../WmsInventoryProfitinDetailDetailsVo.java | 46 ++++++++------ .../WmsInventoryProfitinDetailDto.java | 39 +++++++----- .../WmsInventoryProfitinDetailMapper.java | 1 - .../WmsInventoryProfitinDetailMapper.xml | 23 +++++++ .../WmsInventoryProfitinDetailService.java | 8 +++ .../WmsInventoryProfitoutDetail.java | 22 +++++-- .../WmsInventoryProfitoutDetailDetailsVo.java | 22 +++++-- .../WmsInventoryProfitoutDetailDto.java | 22 +++++-- 48 files changed, 675 insertions(+), 134 deletions(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidQuery.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidVo.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/Extra.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/Extra.java index d6fab77255..f5929f3600 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/Extra.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/Extra.java @@ -7,4 +7,9 @@ public class Extra { private String unit; private String goodsSkuCode; + private String goodsSkuOwnSpec; + private String goodsSkuSid; + private String goodsSpuName; + private String manufacturerName; + private String manufacturerSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPyDto.java index 974b48aba2..202d69b28c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPyDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPyDto.java @@ -61,4 +61,10 @@ public class WmsInventoryCheckbillGoodsPyDto implements Dto { * 单位 */ private String unit; + + private String goodsSkuSid; + private String goodsSpuName; + private String goodsSkuOwnSpec; + private String manufacturerSid; + private String manufacturerName; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java index b2c3b1279a..623d6be1f2 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java @@ -104,7 +104,11 @@ public class WmsInventoryCheckbillService { handleBean.setGoodsName(record.getGoodsSkuTitle()); handleBean.setGoodsSkuCode(record.getGoodsSkuCode()); handleBean.setLockNum(record.getBookCount().toString()); - handleBean.setNum(record.getBookCount().toString()); + if (record.getRealCount() == null){ + handleBean.setNum(record.getBookCount().toString()); + }else { + handleBean.setNum(record.getRealCount().toString()); + } handleBean.setRemarks(record.getRemarks()); handleBean.setSid(record.getSid()); handleBean.setUnit(record.getUnit()); @@ -133,10 +137,16 @@ public class WmsInventoryCheckbillService { List goodsDeptVos = baseGoodsSkuFeign.selectGoods(name, orgPath).getData(); for (GoodsDeptVo goodsDeptVo : goodsDeptVos) { AppInventoryCheckbill appInventoryCheckbill = new AppInventoryCheckbill(); - appInventoryCheckbill.setDictValue(goodsDeptVo.getGoodsName()); + appInventoryCheckbill.setId(goodsDeptVo.getGoodsSpuSid()); + appInventoryCheckbill.setDictValue(goodsDeptVo.getGoodsSkuTitle()); Extra extra = new Extra(); extra.setGoodsSkuCode(goodsDeptVo.getGoodsSkuCode()); extra.setUnit(goodsDeptVo.getUnit()); + extra.setGoodsSkuOwnSpec(goodsDeptVo.getGoodsSkuOwnSpec()); + extra.setGoodsSkuSid(goodsDeptVo.getGoodsSkuSid()); + extra.setGoodsSpuName(goodsDeptVo.getGoodsSpuName()); + extra.setManufacturerSid(goodsDeptVo.getManufacturerSid()); + extra.setManufacturerName(goodsDeptVo.getManufacturerName()); appInventoryCheckbill.setExtra(extra); appInventoryCheckbills.add(appInventoryCheckbill); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/GoodsDeptVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/GoodsDeptVo.java index f6ab211c17..4f905fdf56 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/GoodsDeptVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/GoodsDeptVo.java @@ -11,10 +11,22 @@ import lombok.Data; @Data public class GoodsDeptVo { - @ApiModelProperty("商品名称") - private String goodsName; + @ApiModelProperty("商品spuSid") + private String goodsSpuSid; + @ApiModelProperty("商品spu名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; @ApiModelProperty("单位") private String unit; @ApiModelProperty("图号") private String goodsSkuCode; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml index 63d0d82a26..d94a428dd0 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml @@ -67,6 +67,7 @@ sku.goodsSkuCode, sku.indexes, spu.goodsUnitName, + spu.manufacturerSid, spu.manufacturerName from base_goods_sku sku left join base_goods_spu spu on spu.sid = sku.goodsSpuSid @@ -76,9 +77,15 @@ + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index 9dd3d13b41..512bff8639 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -566,6 +566,44 @@ public class WmsInventoryService extends MybatisBaseService selByDeptSidAndRackSid(String deptSid, List rackSids) { - return baseMapper.selByDeptSidAndRackSid(deptSid,rackSids); + return baseMapper.selByDeptSidAndRackSid(deptSid, rackSids); + } + + public PagerVo selInvenGoodsByUseOrgSid(PagerQuery pq) { + WmsInventoryBillUseOrgSidQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("w.useOrgSid", query.getUseOrgSid()); + if (StringUtils.isNotBlank(query.getGoodsName())) { + qw.like("w.goodsSkuTitle", query.getGoodsName()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("w.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("w.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getWarehouseArea())) { + qw.like("wa.areaName", query.getWarehouseArea()); + } + if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { + qw.like("w.warehouseRackCode", query.getWarehouseRackCode()); + } + if (StringUtils.isNotBlank(query.getSupplierName())) { + qw.like("p.supplierName", query.getSupplierName()); + } + if (StringUtils.isNotBlank(query.getManufacturerName())) { + qw.like("w.manufacturerName", query.getManufacturerName()); + } + if (StringUtils.isNotBlank(query.getManufactorBillNo())) { + qw.like("w.manufactorBillNo", query.getManufactorBillNo()); + } + qw.apply(StringUtils.isNotBlank(query.getInDateStart()), "date_format (w.firstInDate,'%Y-%m-%d') >= date_format('" + query.getInDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getInDateEnd()), "date_format (w.firstInDate,'%Y-%m-%d') <= date_format('" + query.getInDateEnd() + "','%Y-%m-%d')" + ); + qw.apply("w.count > 0"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selInvenGoodsByUseOrgSid(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java index f6955745a1..00282a0aaa 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java @@ -34,6 +34,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbi import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo; +import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -83,4 +84,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper beanToMap); IPage appDetailRackPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selPyByDeptSid(String deptSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index 73be135214..afd75a19e0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -86,29 +86,29 @@ realCount * cost AS realAmount, CASE state - WHEN 1 - THEN '正常' WHEN 2 - THEN '盘盈' + THEN '正常' WHEN 3 + THEN '盘盈' + WHEN 4 THEN '盘亏' END AS state, CASE state - WHEN 1 - THEN 0 WHEN 2 - THEN profitCount + THEN 0 WHEN 3 + THEN profitCount + WHEN 4 THEN loseCount END AS profitAndLoseCount, CASE state - WHEN 1 - THEN 0 WHEN 2 - THEN profitCount * cost + THEN 0 WHEN 3 + THEN profitCount * cost + WHEN 4 THEN loseCount * cost END AS profitAndLoseAmount, lossCount, @@ -137,29 +137,29 @@ realCount * cost AS realAmount, CASE state - WHEN 0 + WHEN 2 THEN '正常' - WHEN 1 + WHEN 3 THEN '盘盈' - WHEN 2 + WHEN 4 THEN '盘亏' END AS state, CASE state - WHEN 0 + WHEN 2 THEN 0 - WHEN 1 + WHEN 3 THEN profitCount - WHEN 2 + WHEN 4 THEN loseCount END AS profitAndLoseCount, CASE state - WHEN 0 + WHEN 2 THEN 0 - WHEN 1 + WHEN 3 THEN profitCount * cost - WHEN 2 + WHEN 4 THEN loseCount * cost END AS profitAndLoseAmount, lossCount, @@ -191,7 +191,7 @@ + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index ffa2a66167..9c3cfc52b2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -47,6 +47,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.*; +import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo; import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import com.yxt.wms.feign.flowable.flow.FlowableFeign; @@ -286,8 +287,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService saveOrUpdateDto(WmsInventoryCheckbillDto dto) { ResultBean rb = ResultBean.fireFail(); - String nodeState = baseMapper.checkState(dto.getDeptSid()); - if (StringUtils.isNotBlank(nodeState) && !"已办结".equals(nodeState)) { + String checkState = baseMapper.checkState(dto.getDeptSid()); + if (!"2".equals(checkState)) { return rb.setMsg("存在盘点中数据，无法生成新的盘点单"); } SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(dto.getDeptSid()).getData(); @@ -323,8 +324,14 @@ public class WmsInventoryCheckbillService extends MybatisBaseService selPyByDeptSid(String deptSid) { + return baseMapper.selPyByDeptSid(deptSid); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java index d673f7fa73..431ee35df7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java @@ -55,11 +55,23 @@ public class WmsInventoryCheckbillDetail extends BaseEntity { @ApiModelProperty("盘点单sid") private String billSid; // 盘点单sid @ApiModelProperty("商品ID") - private String goodsID; // 商品ID - @ApiModelProperty("商品名称") - private String goodsSkuTitle; // 商品名称 + private String goodsID; + @ApiModelProperty("商品spuSid") + private String goodsSpuSid; + @ApiModelProperty("商品spu名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 + private String goodsSkuCode; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; @ApiModelProperty("成本单价") private BigDecimal cost; // 成本单价 @ApiModelProperty("单位") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java index 8939fcd0eb..fe8e1ba640 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java @@ -58,11 +58,23 @@ public class WmsInventoryCheckbillDetailDetailsVo implements Vo { @ApiModelProperty("盘点单sid") private String billSid; // 盘点单sid @ApiModelProperty("商品ID") - private String goodsID; // 商品ID - @ApiModelProperty("商品名称") - private String goodsSkuTitle; // 商品名称 + private String goodsID; + @ApiModelProperty("商品spuSid") + private String goodsSpuSid; + @ApiModelProperty("商品spu名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 + private String goodsSkuCode; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; @ApiModelProperty("成本单价") private BigDecimal cost; // 成本单价 @ApiModelProperty("单位") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java index ce6f062fd1..34302e2bf4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java @@ -58,11 +58,23 @@ public class WmsInventoryCheckbillDetailDto implements Dto { @ApiModelProperty("盘点单sid") private String billSid; // 盘点单sid @ApiModelProperty("商品ID") - private String goodsID; // 商品ID - @ApiModelProperty("商品名称") - private String goodsSkuTitle; // 商品名称 + private String goodsID; + @ApiModelProperty("商品spuSid") + private String goodsSpuSid; + @ApiModelProperty("商品spu名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 + private String goodsSkuCode; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; @ApiModelProperty("成本单价") private BigDecimal cost; // 成本单价 @ApiModelProperty("单位") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java index 7181b49a53..c9c632ee15 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java @@ -25,17 +25,14 @@ *********************************************************/ package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; +import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.math.BigDecimal; import java.util.List; @@ -74,4 +71,6 @@ public interface WmsInventoryCheckbillDetailMapper extends BaseMapper sourceBillBySid(String sid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml index b487b360f5..f9648805be 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml @@ -82,15 +82,15 @@ - update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = 0,remarks = #{dto.remarks} where sid = #{dto.sid} + update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = 0,remarks = #{dto.remarks},state = 2 where sid = #{dto.sid} - update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = #{pyCount},loseCount = 0,remarks = #{dto.remarks} where sid = #{dto.sid} + update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = #{pyCount},loseCount = 0,remarks = #{dto.remarks},state = 3 where sid = #{dto.sid} - update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = #{pkCount},remarks = #{dto.remarks} where sid = #{dto.sid} + update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = #{pkCount},remarks = #{dto.remarks},state = 4 where sid = #{dto.sid} + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java index fe7e3e60fa..7067acdd76 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java @@ -27,7 +27,6 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.core.result.ResultBean; import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea; import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo; @@ -43,6 +42,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryChe import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -140,9 +140,16 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService sourceBillBySid(String sid) { + return baseMapper.sourceBillBySid(sid); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsPyDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsPyDto.java index 64a87bcc60..7851650c9d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsPyDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsPyDto.java @@ -57,4 +57,10 @@ public class WmsInventoryCheckbillGoodsPyDto implements Dto { * 单位 */ private String unit; + + private String goodsSkuSid; + private String goodsSpuName; + private String goodsSkuOwnSpec; + private String manufacturerSid; + private String manufacturerName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java index 241e4d9cbb..a2b2b809ee 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java @@ -73,11 +73,11 @@ public class WmsInventoryProfitinDetailsVo implements Vo { @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 @ApiModelProperty("业务类型") - private String busType; // 业务类型 - @ApiModelProperty("盘点单sid") - private String checkBillSid; // 盘点单sid - @ApiModelProperty("盘点单号") - private String checkBillNo; // 盘点单号 + private String businessVaule; // 业务类型 + @ApiModelProperty("盘点单sid") + private String sourceBillSid; // 盘点单sid + @ApiModelProperty("盘点单号") + private String sourceBillNo; // 盘点单号 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 @@ -96,5 +96,5 @@ public class WmsInventoryProfitinDetailsVo implements Vo { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty - private List wmsInventoryProfitinDetailList; + private List goodsList; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java index e7df63fd2e..2b4c893a01 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java @@ -69,11 +69,11 @@ public class WmsInventoryProfitinDto implements Dto { @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 @ApiModelProperty("业务类型") - private String busType; // 业务类型 + private String businessVaule; // 业务类型 @ApiModelProperty("盘点单sid") - private String checkBillSid; // 盘点单sid + private String sourceBillSid; // 盘点单sid @ApiModelProperty("盘点单号") - private String checkBillNo; // 盘点单号 + private String sourceBillNo; // 盘点单号 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 @@ -92,5 +92,5 @@ public class WmsInventoryProfitinDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty - private List wmsInventoryProfitinDetailList; + private List goodsList; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java index 367f13a420..a7ae1290f0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java @@ -33,7 +33,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.common.core.result.ResultBean; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbill; +import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillService; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService; import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*; import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDetailsVo; import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto; @@ -102,6 +104,10 @@ public class WmsInventoryProfitinService extends MybatisBaseService listPageVo(PagerQuery pq) { WmsInventoryProfitinQuery query = pq.getParams(); @@ -176,7 +182,7 @@ public class WmsInventoryProfitinService extends MybatisBaseService saveOrUpdateDto(WmsInventoryProfitinDto dto){ ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); - List wmsInventoryProfitinDetailList = dto.getWmsInventoryProfitinDetailList(); + List wmsInventoryProfitinDetailList = dto.getGoodsList(); String deptSid = dto.getDeptSid(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); @@ -215,6 +221,9 @@ public class WmsInventoryProfitinService extends MybatisBaseService wmsInventoryProfitinDetailDetailsVos = wmsInventoryProfitinDetailService.selByMainSid(sid); - vo.setWmsInventoryProfitinDetailList(wmsInventoryProfitinDetailDetailsVos); + vo.setGoodsList(wmsInventoryProfitinDetailDetailsVos); return vo; } @@ -555,8 +567,11 @@ public class WmsInventoryProfitinService extends MybatisBaseService getSourceBillNoBySid(String deptSid) { + return wmsInventoryCheckbillService.selPyByDeptSid(deptSid); + } - return null; + public List sourceBillBySid(String sid) { + return wmsInventoryCheckbillDetailService.sourceBillBySid(sid); } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetail.java index 1f61a9c94a..950cc21e82 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetail.java @@ -54,12 +54,22 @@ public class WmsInventoryProfitinDetail extends BaseEntity { @ApiModelProperty("主表sid") private String mainSid; // 主表sid - @ApiModelProperty("商品名称") - private String goodsSkuTitle; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 + @ApiModelProperty("商品spuSid") + private String goodsSpuSid; + @ApiModelProperty("商品spu名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; + @ApiModelProperty("图号") + private String goodsSkuCode; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; @ApiModelProperty("单位") private String unit; // 单位 @ApiModelProperty("盘盈数量") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailDetailsVo.java index da44bd9772..c0cd0cd7a6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailDetailsVo.java @@ -53,25 +53,37 @@ public class WmsInventoryProfitinDetailDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("主表sid") - private String mainSid; // 主表sid - @ApiModelProperty("商品名称") - private String goodsSkuTitle; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 - @ApiModelProperty("单位") + @ApiModelProperty("主表sid") + private String mainSid; + @ApiModelProperty("图号") + private String goodsCode; + @ApiModelProperty("商品spuSid") + private String goodsSid; + @ApiModelProperty("商品spu名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品sku名称") + private String goodsName; + @ApiModelProperty("规格") + private String goodsSpec; + @ApiModelProperty("入库数量(默认盘盈数量)") + private String inStorageNum; + @ApiModelProperty("入库单价") + private String inStoragePrice; + @ApiModelProperty("盘盈数量") + private String pyNum; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; + @ApiModelProperty("单位") private String unit; // 单位 - @ApiModelProperty("盘盈数量") - private BigDecimal profitCount; // 盘盈数量 - @ApiModelProperty("供应商sid") + @ApiModelProperty("供应商sid") private String supplierSid; // 供应商sid - @ApiModelProperty("供应商名称") + @ApiModelProperty("供应商名称") private String supplierName; // 供应商名称 - @ApiModelProperty("入库单价") - private BigDecimal inCost; // 入库单价 - @ApiModelProperty("入库数量") - private BigDecimal inCount; // 入库数量 + + private String money; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailDto.java index 04f5396c4b..67daba8965 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailDto.java @@ -53,25 +53,36 @@ public class WmsInventoryProfitinDetailDto implements Dto { private String sid; // sid - @ApiModelProperty("主表sid") - private String mainSid; // 主表sid - @ApiModelProperty("商品名称") - private String goodsSkuTitle; // 商品名称 - @ApiModelProperty("图号") - private String goodsSkuCode; // 图号 - @ApiModelProperty("规格") - private String goodsSkuOwnSpec; // 规格 + @ApiModelProperty("主表sid") + private String mainSid; + @ApiModelProperty("图号") + private String goodsCode; + @ApiModelProperty("商品spuSid") + private String goodsSid; + @ApiModelProperty("商品spu名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品sku名称") + private String goodsName; + @ApiModelProperty("规格") + private String goodsSpec; + @ApiModelProperty("入库数量(默认盘盈数量)") + private String inStorageNum; + @ApiModelProperty("入库单价") + private String inStoragePrice; + @ApiModelProperty("盘盈数量") + private String pyNum; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; @ApiModelProperty("单位") private String unit; // 单位 - @ApiModelProperty("盘盈数量") - private BigDecimal profitCount; // 盘盈数量 @ApiModelProperty("供应商sid") private String supplierSid; // 供应商sid @ApiModelProperty("供应商名称") private String supplierName; // 供应商名称 - @ApiModelProperty("入库单价") - private BigDecimal inCost; // 入库单价 - @ApiModelProperty("入库数量") - private BigDecimal inCount; // 入库数量 + private String money; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java index 6c65b89917..28f998f332 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java @@ -55,6 +55,5 @@ public interface WmsInventoryProfitinDetailMapper extends BaseMapper selByMainSid(String mainSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml index 401ce24291..32961e6836 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml @@ -3,4 +3,27 @@ + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java index 8411eb5294..8090b91abc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java @@ -30,6 +30,7 @@ import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; @Service @@ -38,6 +39,13 @@ public class WmsInventoryProfitinDetailService extends MybatisBaseService