From 5f9ae7660178b2dc29d646560d96f02ac8ce80ba Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 19 Apr 2024 17:47:44 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=88=90=E5=93=81=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BF=A1=E6=81=AF=E3=80=81=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsProductStockController.java | 2 +- .../wms/controller/WmsRawStockController.java | 2 +- .../controller/WmsStockTotalController.java | 25 ++- .../com/hw/wms/domain/WmsProductStock.java | 27 ++- .../java/com/hw/wms/domain/WmsRawStock.java | 60 ++++-- .../java/com/hw/wms/domain/WmsStockTotal.java | 29 ++- .../mapper/wms/WmsProductStockMapper.xml | 194 ++++++++++-------- .../mapper/wms/WmsRawStockMapper.xml | 168 ++++++++------- .../mapper/wms/WmsStockTotalMapper.xml | 106 ++++++---- hw-ui/src/api/wms/stocktotal.js | 18 ++ 10 files changed, 386 insertions(+), 245 deletions(-) diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsProductStockController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsProductStockController.java index 6a66834e..e5e5d700 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsProductStockController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsProductStockController.java @@ -38,7 +38,7 @@ public class WmsProductStockController extends BaseController /** * 查询成品库存列表 */ - @RequiresPermissions("wms:productstock:list") +// @RequiresPermissions("wms:productstock:list") @GetMapping("/list") public TableDataInfo list(WmsProductStock wmsProductStock) { diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawStockController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawStockController.java index 2e8bde7a..ed28b5ff 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawStockController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawStockController.java @@ -38,7 +38,7 @@ public class WmsRawStockController extends BaseController /** * 查询原材料库存列表 */ - @RequiresPermissions("wms:rawstock:list") +// @RequiresPermissions("wms:rawstock:list") @GetMapping("/list") public TableDataInfo list(WmsRawStock wmsRawStock) { diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsStockTotalController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsStockTotalController.java index 90607424..169024e1 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsStockTotalController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsStockTotalController.java @@ -1,7 +1,6 @@ package com.hw.wms.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +22,7 @@ import com.hw.common.core.utils.poi.ExcelUtil; import com.hw.common.core.web.page.TableDataInfo; /** - * 原材料库存Controller + * 原材料/成品库存Controller * * @author xins * @date 2024-03-14 @@ -36,7 +35,7 @@ public class WmsStockTotalController extends BaseController private IWmsStockTotalService wmsStockTotalService; /** - * 查询原材料库存列表 + * 查询原材料/成品库存列表 */ @RequiresPermissions("wms:stocktotal:list") @GetMapping("/list") @@ -48,20 +47,20 @@ public class WmsStockTotalController extends BaseController } /** - * 导出原材料库存列表 + * 导出原材料/成品库存列表 */ @RequiresPermissions("wms:stocktotal:export") - @Log(title = "原材料库存", businessType = BusinessType.EXPORT) + @Log(title = "原材料/成品库存", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, WmsStockTotal wmsStockTotal) { List list = wmsStockTotalService.selectWmsStockTotalList(wmsStockTotal); ExcelUtil util = new ExcelUtil(WmsStockTotal.class); - util.exportExcel(response, list, "原材料库存数据"); + util.exportExcel(response, list, "原材料/成品库存数据"); } /** - * 获取原材料库存详细信息 + * 获取原材料/成品库存详细信息 */ @RequiresPermissions("wms:stocktotal:query") @GetMapping(value = "/{stockTotalId}") @@ -71,10 +70,10 @@ public class WmsStockTotalController extends BaseController } /** - * 新增原材料库存 + * 新增原材料/成品库存 */ @RequiresPermissions("wms:stocktotal:add") - @Log(title = "原材料库存", businessType = BusinessType.INSERT) + @Log(title = "原材料/成品库存", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody WmsStockTotal wmsStockTotal) { @@ -82,10 +81,10 @@ public class WmsStockTotalController extends BaseController } /** - * 修改原材料库存 + * 修改原材料/成品库存 */ @RequiresPermissions("wms:stocktotal:edit") - @Log(title = "原材料库存", businessType = BusinessType.UPDATE) + @Log(title = "原材料/成品库存", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody WmsStockTotal wmsStockTotal) { @@ -93,10 +92,10 @@ public class WmsStockTotalController extends BaseController } /** - * 删除原材料库存 + * 删除原材料/成品库存 */ @RequiresPermissions("wms:stocktotal:remove") - @Log(title = "原材料库存", businessType = BusinessType.DELETE) + @Log(title = "原材料/成品库存", businessType = BusinessType.DELETE) @DeleteMapping("/{stockTotalIds}") public AjaxResult remove(@PathVariable Long[] stockTotalIds) { diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java index ea1197d9..3deb3434 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java @@ -25,6 +25,10 @@ public class WmsProductStock extends BaseEntity @Excel(name = "仓库ID") private Long warehouseId; + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + /** 仓库楼层 */ @Excel(name = "仓库楼层") private Long warehouseFloor; @@ -49,6 +53,14 @@ public class WmsProductStock extends BaseEntity @Excel(name = "产品ID") private Long productId; + /** 产品编码 */ + @Excel(name = "产品编码") + private String materialCode; + + /** 产品名称 */ + @Excel(name = "产品名称") + private String materialName; + /** * 计划编号,关联pd_base_plan_info的plan_id */ @@ -79,13 +91,13 @@ public class WmsProductStock extends BaseEntity private BigDecimal occupyAmount; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createDate; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date updateDate; /** 有效标记 */ @@ -96,17 +108,10 @@ public class WmsProductStock extends BaseEntity @Excel(name = "入库时间", readConverterExp = "预=留") private Date instockDate; - private String materialCode; - - private String materialName; - private BigDecimal orderAmount; - private String warehouseName; - private BigDecimal applyAmount; - public void setProductStockId(Long productStockId) { this.productStockId = productStockId; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java index d9ac1700..c44792dc 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java @@ -25,6 +25,10 @@ public class WmsRawStock extends BaseEntity @Excel(name = "仓库ID") private Long warehouseId; + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + /** 仓库楼层 */ @Excel(name = "仓库楼层") private Long warehouseFloor; @@ -34,13 +38,21 @@ public class WmsRawStock extends BaseEntity private String locationCode; /** 库存类型：1原材料 2半成品 */ - @Excel(name = "库存类型：1原材料 2半成品") + @Excel(name = "库存类型") private String stockType; /** 物料ID */ @Excel(name = "物料ID") private Long materialId; + /** 物料编号 */ + @Excel(name = "物料编号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + /** 入库批次号 */ @Excel(name = "入库批次号") private String instockBatch; @@ -49,21 +61,21 @@ public class WmsRawStock extends BaseEntity private String palletInfoCode; /** 入库时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date instockDate; /** 最晚出库时间;入库时，根据物料信“存放周期“计算出来的时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最晚出库时间;入库时，根据物料信“存放周期“计算出来的时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最晚出库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date lastOutstockTime; /** 质检状态(1检验中,2质检通过,3质检不通过) */ - @Excel(name = "质检状态(1检验中,2质检通过,3质检不通过)") + @Excel(name = "质检状态") private String qualityStatus; - /** 质检状态(1检验中,2质检通过,3质检不通过) */ - @Excel(name = "完整标识(1是0否)拆分后为0") + /** 完整标识 */ + @Excel(name = "完整标识") private String completeFlag; /** 总数量 */ @@ -83,19 +95,43 @@ public class WmsRawStock extends BaseEntity private Long supplierId; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createDate; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date updateDate; /** 有效标记 */ @Excel(name = "有效标记") private String activeFlag; + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + public void setRawStockId(Long rawStockId) { this.rawStockId = rawStockId; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java index 2f3fd6ee..26ffaa68 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsStockTotal.java @@ -25,6 +25,10 @@ public class WmsStockTotal extends BaseEntity @Excel(name = "仓库ID") private Long warehouseId; + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + /** 仓库楼层 */ @Excel(name = "仓库楼层") private Long warehouseFloor; @@ -37,6 +41,14 @@ public class WmsStockTotal extends BaseEntity @Excel(name = "物料ID") private Long materialId; + /** 物料编号 */ + @Excel(name = "物料编号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + /** 总数量;仓库存放的总数量 */ @Excel(name = "总数量;仓库存放的总数量") private BigDecimal totalAmount; @@ -50,22 +62,27 @@ public class WmsStockTotal extends BaseEntity private BigDecimal occupyAmount; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createDate; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date updateDate; /** 有效标记 */ @Excel(name = "有效标记") private String activeFlag; - private String materialCode; - private String materialName; + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } public void setStockTotalId(Long stockTotalId) { diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml index c3e0dd6b..ed9f1ba4 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml @@ -1,70 +1,99 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - select product_stock_id, warehouse_id, location_code, stock_type, product_batch, quality_status, product_id, plan_code, plan_detail_code,sale_order_id,saleorder_code, total_amount, frozen_amount, occupy_amount, create_by, create_date, update_by, update_date, active_flag, instock_date from wms_product_stock + select wps.product_stock_id, + wps.warehouse_id, + wbw.warehouse_name, + wbw.warehouse_floor, + wps.location_code, + wps.stock_type, + wps.product_batch, + wps.quality_status, + wps.product_id, + mbmi.material_code, + mbmi.material_name, + wps.plan_code, + wps.plan_detail_code, + wps.sale_order_id, + wps.saleorder_code, + wps.total_amount, + wps.frozen_amount, + wps.occupy_amount, + wps.create_by, + wps.create_date, + wps.update_by, + wps.update_date, + wps.active_flag, + wps.instock_date + from wms_product_stock wps + left join wms_base_warehouse wbw on wbw.warehouse_id = wps.warehouse_id + left join mes_base_material_info mbmi on mbmi.material_id = wps.product_id - + insert into wms_product_stock warehouse_id, @@ -86,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_date, active_flag, instock_date, - + #{warehouseId}, #{warehouseFloor}, @@ -107,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateDate}, #{activeFlag}, #{instockDate}, - + @@ -136,7 +165,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from wms_product_stock where product_stock_id = #{productStockId} + delete + from wms_product_stock + where product_stock_id = #{productStockId} @@ -147,17 +178,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - @@ -169,12 +193,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - -