diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java index 6e0a87e4..8217d0bc 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java @@ -68,6 +68,9 @@ public class WmsMobileController extends BaseController { @Autowired private IWmsProductStockService wmsProductStockService; + @Autowired + private IWmsProductStockSaleorderService wmsProductStockSaleorderService; + @Resource private RemoteMesService remoteMesService; @@ -254,7 +257,7 @@ public class WmsMobileController extends BaseController { /** - * 根据仓库ID获取成品库存信息 + * 根据仓库ID获取成品库存信息（目前就是根据半成品仓库ID获取库存信息，然后根据库存选择对应的成品和数量进行转到成品库） */ // @RequiresPermissions("wms:rawoutstock:query") @GetMapping(value = "/getProductStocksByWarehouseId") @@ -316,17 +319,17 @@ public class WmsMobileController extends BaseController { */ // @RequiresPermissions("wms:rawoutstock:query") @GetMapping(value = "/getProductStocksBySalesorderCode") - public TableDataInfo getProductStocksBySalesorderCode(WmsProductStock queryProductStock) { + public TableDataInfo getProductStocksBySalesorderCode(WmsProductStockSaleorder queryProductStockSaleorder) { startPage(); // WmsProductStock queryProductStock = new WmsProductStock(); // queryProductStock.setSaleorderCode(request.getParameter("salesorderCode")); // queryProductStock.setStockType(WmsConstants.PRODUCT_STOCK_STOCK_TYPE_PRODUCT); - List list = wmsProductStockService.selectWmsProductStocksBySaleorder(queryProductStock); + List list = wmsProductStockSaleorderService.selectWmsProductStockSaleordersBySaleorder(queryProductStockSaleorder); return getDataTable(list); } /** - * 成品出库申请（包括人工合agv的出库申请） + * 成品出库申请（包括人工和agv的出库申请） */ @Log(title = "成品出库记录", businessType = BusinessType.INSERT) @PostMapping(("/applyProductOutstock")) @@ -355,17 +358,17 @@ public class WmsMobileController extends BaseController { // @RequiresPermissions("wms:rawoutstock:query") @GetMapping(value = "/getProductOutStockWithDetails") public AjaxResult getProductOutStockWithDetails(WmsProductOutstock queryProductOutstock) { - AjaxResult ajax = AjaxResult.success(); WmsProductOutstock productOutstock = wmsProductOutstockService. selectWmsProductOutstockJoinByOutstockId(queryProductOutstock.getProductOutstockId()); - startPage(); WmsProductOutstockDetail queryProductOutstockDetail = new WmsProductOutstockDetail(); + queryProductOutstockDetail.setProductOutstockId(queryProductOutstock.getProductOutstockId()); List productOutstockDetails = wmsProductOutstockDetailService.selectWmsProductOutstockDetailList(queryProductOutstockDetail); - ajax.put("productOutstock", productOutstock); - ajax.put("productOutstockDetails", productOutstockDetails); - return ajax; + productOutstock.setWmsProductOutstockDetailList(productOutstockDetails); +// ajax.put("productOutstock", productOutstock); +// ajax.put("productOutstockDetails", productOutstockDetails); + return success(productOutstock); } /** diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsProductStockSaleorderController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsProductStockSaleorderController.java new file mode 100644 index 00000000..36bcfb72 --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsProductStockSaleorderController.java @@ -0,0 +1,105 @@ +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; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.wms.domain.WmsProductStockSaleorder; +import com.hw.wms.service.IWmsProductStockSaleorderService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 成品订单库存记录Controller + * + * @author xins + * @date 2024-02-22 + */ +@RestController +@RequestMapping("/productstocksaleorder") +public class WmsProductStockSaleorderController extends BaseController +{ + @Autowired + private IWmsProductStockSaleorderService wmsProductStockSaleorderService; + + /** + * 查询成品订单库存记录列表 + */ + @RequiresPermissions("wms:productstocksaleorder:list") + @GetMapping("/list") + public TableDataInfo list(WmsProductStockSaleorder wmsProductStockSaleorder) + { + startPage(); + List list = wmsProductStockSaleorderService.selectWmsProductStockSaleorderList(wmsProductStockSaleorder); + return getDataTable(list); + } + + /** + * 导出成品订单库存记录列表 + */ + @RequiresPermissions("wms:productstocksaleorder:export") + @Log(title = "成品订单库存记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmsProductStockSaleorder wmsProductStockSaleorder) + { + List list = wmsProductStockSaleorderService.selectWmsProductStockSaleorderList(wmsProductStockSaleorder); + ExcelUtil util = new ExcelUtil(WmsProductStockSaleorder.class); + util.exportExcel(response, list, "成品订单库存记录数据"); + } + + /** + * 获取成品订单库存记录详细信息 + */ + @RequiresPermissions("wms:productstocksaleorder:query") + @GetMapping(value = "/{productStockSaleorderId}") + public AjaxResult getInfo(@PathVariable("productStockSaleorderId") Long productStockSaleorderId) + { + return success(wmsProductStockSaleorderService.selectWmsProductStockSaleorderByProductStockSaleorderId(productStockSaleorderId)); + } + + /** + * 新增成品订单库存记录 + */ + @RequiresPermissions("wms:productstocksaleorder:add") + @Log(title = "成品订单库存记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmsProductStockSaleorder wmsProductStockSaleorder) + { + return toAjax(wmsProductStockSaleorderService.insertWmsProductStockSaleorder(wmsProductStockSaleorder)); + } + + /** + * 修改成品订单库存记录 + */ + @RequiresPermissions("wms:productstocksaleorder:edit") + @Log(title = "成品订单库存记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmsProductStockSaleorder wmsProductStockSaleorder) + { + return toAjax(wmsProductStockSaleorderService.updateWmsProductStockSaleorder(wmsProductStockSaleorder)); + } + + /** + * 删除成品订单库存记录 + */ + @RequiresPermissions("wms:productstocksaleorder:remove") + @Log(title = "成品订单库存记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{productStockSaleorderIds}") + public AjaxResult remove(@PathVariable Long[] productStockSaleorderIds) + { + return toAjax(wmsProductStockSaleorderService.deleteWmsProductStockSaleorderByProductStockSaleorderIds(productStockSaleorderIds)); + } +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseLocation.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseLocation.java index ce9d2a69..88194f6b 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseLocation.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseLocation.java @@ -24,6 +24,9 @@ public class WmsBaseLocation extends BaseEntity private String warehouseName; /** 库位编码 */ + + private String agvPositionCode; + @Excel(name = "库位编码") private String locationCode; @@ -94,22 +97,6 @@ public class WmsBaseLocation extends BaseEntity @Excel(name = "是否报废库位 1:正常 0：报废") private String locationScrapType; - /** 库位属性 */ - @Excel(name = "库位属性") - private String locationAttr; - - /** 周转需求 */ - @Excel(name = "周转需求") - private String turnDemand; - - /** 校验码 */ - @Excel(name = "校验码") - private String checkCode; - - /** 工作区 */ - @Excel(name = "工作区") - private String workArea; - /** 体积限制 */ @Excel(name = "体积限制") private BigDecimal volumeLimit; @@ -118,14 +105,6 @@ public class WmsBaseLocation extends BaseEntity @Excel(name = "重量限制") private BigDecimal weightLimit; - /** 箱数限制 */ - @Excel(name = "箱数限制") - private Long boxLimit; - - /** 托盘限制 */ - @Excel(name = "托盘限制") - private Long palletLimit; - /** 长度 */ @Excel(name = "长度") private BigDecimal length; @@ -185,6 +164,14 @@ public class WmsBaseLocation extends BaseEntity this.warehouseName = warehouseName; } + public String getAgvPositionCode() { + return agvPositionCode; + } + + public void setAgvPositionCode(String agvPositionCode) { + this.agvPositionCode = agvPositionCode; + } + public void setLocationCode(String locationCode) { this.locationCode = locationCode; @@ -347,42 +334,6 @@ public class WmsBaseLocation extends BaseEntity { return locationScrapType; } - public void setLocationAttr(String locationAttr) - { - this.locationAttr = locationAttr; - } - - public String getLocationAttr() - { - return locationAttr; - } - public void setTurnDemand(String turnDemand) - { - this.turnDemand = turnDemand; - } - - public String getTurnDemand() - { - return turnDemand; - } - public void setCheckCode(String checkCode) - { - this.checkCode = checkCode; - } - - public String getCheckCode() - { - return checkCode; - } - public void setWorkArea(String workArea) - { - this.workArea = workArea; - } - - public String getWorkArea() - { - return workArea; - } public void setVolumeLimit(BigDecimal volumeLimit) { this.volumeLimit = volumeLimit; @@ -401,24 +352,6 @@ public class WmsBaseLocation extends BaseEntity { return weightLimit; } - public void setBoxLimit(Long boxLimit) - { - this.boxLimit = boxLimit; - } - - public Long getBoxLimit() - { - return boxLimit; - } - public void setPalletLimit(Long palletLimit) - { - this.palletLimit = palletLimit; - } - - public Long getPalletLimit() - { - return palletLimit; - } public void setLength(BigDecimal length) { this.length = length; @@ -520,14 +453,8 @@ public class WmsBaseLocation extends BaseEntity .append("pickFlag", getPickFlag()) .append("isOpenKnFlag", getIsOpenKnFlag()) .append("locationScrapType", getLocationScrapType()) - .append("locationAttr", getLocationAttr()) - .append("turnDemand", getTurnDemand()) - .append("checkCode", getCheckCode()) - .append("workArea", getWorkArea()) .append("volumeLimit", getVolumeLimit()) .append("weightLimit", getWeightLimit()) - .append("boxLimit", getBoxLimit()) - .append("palletLimit", getPalletLimit()) .append("length", getLength()) .append("width", getWidth()) .append("height", getHeight()) diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseWarehouse.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseWarehouse.java index e8958d0e..c3326a8e 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseWarehouse.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseWarehouse.java @@ -13,154 +13,212 @@ import java.util.List; * @author xins * @date 2024-01-09 */ -public class WmsBaseWarehouse extends BaseEntity -{ +public class WmsBaseWarehouse extends BaseEntity { private static final long serialVersionUID = 1L; - /** 仓库ID */ + /** + * 仓库ID + */ private Long warehouseId; - /** 存放类型(1原材料, 2半成品,3成品) */ + /** + * 存放类型(1原材料, 2半成品,3成品) + */ @Excel(name = "存放类型(1原材料, 2半成品,3成品)") private String warehouseInstockType; - /** 仓库类型 0:普通仓库 1:背负agv仓库 2料箱agv仓库;背负agv仓库和料箱agv仓库审核标识为否 */ + /** + * 仓库类型 0:普通仓库 1:背负agv仓库 2料箱agv仓库;背负agv仓库和料箱agv仓库审核标识为否 + */ @Excel(name = "仓库类型 1:普通仓库 2:背负agv仓库 3料箱agv仓库;背负agv仓库和料箱agv仓库审核标识为否") private String warehouseType; - /** 仓库编码 */ + /** + * 仓库编码 + */ @Excel(name = "仓库编码") private String warehouseCode; - /** 仓库名称 */ + /** + * 仓库名称 + */ @Excel(name = "仓库名称") private String warehouseName; - /** 仓库类别(关联wms_base_category的category_id) */ + /** + * 仓库类别(关联wms_base_category的category_id) + */ private Long warehouseCategoryId; - /** 仓库类别名称 */ + /** + * 仓库类别名称 + */ @Excel(name = "仓库类别") private String warehouseCategoryName; - /** 楼层 */ + /** + * 楼层 + */ @Excel(name = "楼层") private Long warehouseFloor; - /** 管辖部门(关联sys_deptt的dept_id) */ + /** + * 管辖部门(关联sys_deptt的dept_id) + */ @Excel(name = "管辖部门(关联sys_deptt的dept_id)") private Long deptId; - /** 多排库类型(1单排库,2双排库) */ + /** + * 多排库类型(1单排库,2双排库) + */ @Excel(name = "多排库类型(1单排库,2双排库)") private String multiRowType; - /** 多边库类型(1单面库，2双面库);料箱agv是两面的，叉车agv在两面库的中间进行输送，尽量一次让叉车输送同一面的额任务 */ + /** + * 多边库类型(1单面库，2双面库);料箱agv是两面的，叉车agv在两面库的中间进行输送，尽量一次让叉车输送同一面的额任务 + */ @Excel(name = "多边库类型(1单面库，2双面库);料箱agv是两面的，叉车agv在两面库的中间进行输送，尽量一次让叉车输送同一面的额任务") private String multiSideType; - /** 允许混放批次(1是,0否) */ + /** + * 允许混放批次(1是,0否) + */ @Excel(name = "允许混放批次(1是,0否)") private String batchMix; - /** 允许混放产品 1是 0否;预留，允许混放不同的产品 */ + /** + * 允许混放产品 1是 0否;预留，允许混放不同的产品 + */ @Excel(name = "允许混放产品 1是 0否;预留，允许混放不同的产品") private String productMix; - /** 料箱标识(0否,1是) */ + /** + * 料箱标识(0否,1是) + */ @Excel(name = "料箱标识(0否,1是)") private String workbinFlag; - /** 位置 */ + /** + * 位置 + */ @Excel(name = "位置") private String warehouseLocation; - /** 激活标记 1是 0否 */ + /** + * 激活标记 1是 0否 + */ @Excel(name = "激活标记 1是 0否") private String activeFlag; - /** 审核标识 （1是，0否） */ - @Excel(name = "审核标识 ", readConverterExp = "1=是，0否") - private String auditFlag; - - /** 返库标识(1是，0否) */ + /** + * 入库要求 （0申请入库，1申请审核入库，2直接入库） + */ + @Excel(name = "入库要求 ", readConverterExp = "0=申请入库，2直接入库") + private String inRequirement; + + /** + * 出库要求 （0申请出库，1申请审核出库，2直接出库） + */ + @Excel(name = "出库要求 ", readConverterExp = "0=申请出库，1申请审核出库，2直接出库") + private String outRequirement; + + /** + * 退库要求（0申请退库，1申请审核退库） + */ + @Excel(name = "退库要求", readConverterExp = "0=申请退库，1申请审核退库") + private String returnRequirement; + + /** + * 自动标识(0全人工，1全自动，2入库自动，3出库自动) + */ + @Excel(name = "自动标识(0全人工，1全自动，2入库自动，3出库自动)") + private String autoFlag; + + /** + * 返库标识(1是，0否) + */ @Excel(name = "返库标识(1是，0否)") private String returnFlag; - /** 删除标志 1删除 0显示 */ + /** + * 删除标志 1删除 0显示 + */ private String delFlag; - /** 工厂ID */ + /** + * 工厂ID + */ @Excel(name = "工厂ID") private Long factoryId; - /** 数据源 */ + /** + * 数据源 + */ @Excel(name = "数据源") private String dataSource; - /** DB用户 */ + /** + * DB用户 + */ @Excel(name = "DB用户") private String schame; - /** 是否按照线体入库 0否 1是 */ + /** + * 是否按照线体入库 0否 1是 + */ @Excel(name = "是否按照线体入库 0否 1是") private String lineFlag; - /** 库位信息 */ + /** + * 库位信息 + */ private List wmsBaseLocationList; - public void setWarehouseId(Long warehouseId) - { + public void setWarehouseId(Long warehouseId) { this.warehouseId = warehouseId; } - public Long getWarehouseId() - { + public Long getWarehouseId() { return warehouseId; } - public void setWarehouseInstockType(String warehouseInstockType) - { + + public void setWarehouseInstockType(String warehouseInstockType) { this.warehouseInstockType = warehouseInstockType; } - public String getWarehouseInstockType() - { + public String getWarehouseInstockType() { return warehouseInstockType; } - public void setWarehouseType(String warehouseType) - { + + public void setWarehouseType(String warehouseType) { this.warehouseType = warehouseType; } - public String getWarehouseType() - { + public String getWarehouseType() { return warehouseType; } - public void setWarehouseCode(String warehouseCode) - { + + public void setWarehouseCode(String warehouseCode) { this.warehouseCode = warehouseCode; } - public String getWarehouseCode() - { + public String getWarehouseCode() { return warehouseCode; } - public void setWarehouseName(String warehouseName) - { + + public void setWarehouseName(String warehouseName) { this.warehouseName = warehouseName; } - public String getWarehouseName() - { + public String getWarehouseName() { return warehouseName; } - public void setWarehouseCategoryId(Long warehouseCategoryId) - { + + public void setWarehouseCategoryId(Long warehouseCategoryId) { this.warehouseCategoryId = warehouseCategoryId; } - public Long getWarehouseCategoryId() - { + public Long getWarehouseCategoryId() { return warehouseCategoryId; } @@ -172,13 +230,11 @@ public class WmsBaseWarehouse extends BaseEntity this.warehouseCategoryName = warehouseCategoryName; } - public void setWarehouseFloor(Long warehouseFloor) - { + public void setWarehouseFloor(Long warehouseFloor) { this.warehouseFloor = warehouseFloor; } - public Long getWarehouseFloor() - { + public Long getWarehouseFloor() { return warehouseFloor; } @@ -190,130 +246,139 @@ public class WmsBaseWarehouse extends BaseEntity this.deptId = deptId; } - public void setMultiRowType(String multiRowType) - { + public void setMultiRowType(String multiRowType) { this.multiRowType = multiRowType; } - public String getMultiRowType() - { + public String getMultiRowType() { return multiRowType; } - public void setMultiSideType(String multiSideType) - { + + public void setMultiSideType(String multiSideType) { this.multiSideType = multiSideType; } - public String getMultiSideType() - { + public String getMultiSideType() { return multiSideType; } - public void setBatchMix(String batchMix) - { + + public void setBatchMix(String batchMix) { this.batchMix = batchMix; } - public String getBatchMix() - { + public String getBatchMix() { return batchMix; } - public void setProductMix(String productMix) - { + + public void setProductMix(String productMix) { this.productMix = productMix; } - public String getProductMix() - { + public String getProductMix() { return productMix; } - public void setWorkbinFlag(String workbinFlag) - { + + public void setWorkbinFlag(String workbinFlag) { this.workbinFlag = workbinFlag; } - public String getWorkbinFlag() - { + public String getWorkbinFlag() { return workbinFlag; } - public void setWarehouseLocation(String warehouseLocation) - { + + public void setWarehouseLocation(String warehouseLocation) { this.warehouseLocation = warehouseLocation; } - public String getWarehouseLocation() - { + public String getWarehouseLocation() { return warehouseLocation; } - public void setActiveFlag(String activeFlag) - { + + public void setActiveFlag(String activeFlag) { this.activeFlag = activeFlag; } - public String getActiveFlag() - { + public String getActiveFlag() { return activeFlag; } - public void setAuditFlag(String auditFlag) - { - this.auditFlag = auditFlag; + + public String getInRequirement() { + return inRequirement; + } + + public void setInRequirement(String inRequirement) { + this.inRequirement = inRequirement; } - public String getAuditFlag() - { - return auditFlag; + public String getOutRequirement() { + return outRequirement; } - public void setReturnFlag(String returnFlag) - { + + public void setOutRequirement(String outRequirement) { + this.outRequirement = outRequirement; + } + + public String getReturnRequirement() { + return returnRequirement; + } + + public void setReturnRequirement(String returnRequirement) { + this.returnRequirement = returnRequirement; + } + + public String getAutoFlag() { + return autoFlag; + } + + public void setAutoFlag(String autoFlag) { + this.autoFlag = autoFlag; + } + + public void setReturnFlag(String returnFlag) { this.returnFlag = returnFlag; } - public String getReturnFlag() - { + public String getReturnFlag() { return returnFlag; } - public void setDelFlag(String delFlag) - { + + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setFactoryId(Long factoryId) - { + + public void setFactoryId(Long factoryId) { this.factoryId = factoryId; } - public Long getFactoryId() - { + public Long getFactoryId() { return factoryId; } - public void setDataSource(String dataSource) - { + + public void setDataSource(String dataSource) { this.dataSource = dataSource; } - public String getDataSource() - { + public String getDataSource() { return dataSource; } - public void setSchame(String schame) - { + + public void setSchame(String schame) { this.schame = schame; } - public String getSchame() - { + public String getSchame() { return schame; } - public void setLineFlag(String lineFlag) - { + + public void setLineFlag(String lineFlag) { this.lineFlag = lineFlag; } - public String getLineFlag() - { + public String getLineFlag() { return lineFlag; } @@ -327,34 +392,38 @@ public class WmsBaseWarehouse extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("warehouseId", getWarehouseId()) - .append("warehouseInstockType", getWarehouseInstockType()) - .append("warehouseType", getWarehouseType()) - .append("warehouseCode", getWarehouseCode()) - .append("warehouseName", getWarehouseName()) - .append("warehouseCategoryId", getWarehouseCategoryId()) - .append("warehouseFloor", getWarehouseFloor()) - .append("deptId", getDeptId()) - .append("multiRowType", getMultiRowType()) - .append("multiSideType", getMultiSideType()) - .append("batchMix", getBatchMix()) - .append("productMix", getProductMix()) - .append("workbinFlag", getWorkbinFlag()) - .append("warehouseLocation", getWarehouseLocation()) - .append("activeFlag", getActiveFlag()) - .append("auditFlag", getAuditFlag()) - .append("returnFlag", getReturnFlag()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("delFlag", getDelFlag()) - .append("factoryId", getFactoryId()) - .append("dataSource", getDataSource()) - .append("schame", getSchame()) - .append("lineFlag", getLineFlag()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("warehouseId", getWarehouseId()) + .append("warehouseInstockType", getWarehouseInstockType()) + .append("warehouseType", getWarehouseType()) + .append("warehouseCode", getWarehouseCode()) + .append("warehouseName", getWarehouseName()) + .append("warehouseCategoryId", getWarehouseCategoryId()) + .append("warehouseFloor", getWarehouseFloor()) + .append("deptId", getDeptId()) + .append("multiRowType", getMultiRowType()) + .append("multiSideType", getMultiSideType()) + .append("batchMix", getBatchMix()) + .append("productMix", getProductMix()) + .append("workbinFlag", getWorkbinFlag()) + .append("warehouseLocation", getWarehouseLocation()) + .append("activeFlag", getActiveFlag()) + .append("inRequirement", getInRequirement()) + .append("outRequirement", getOutRequirement()) + .append("returnRequirement", getReturnRequirement()) + .append("autoFlag", getAutoFlag()) + .append("returnFlag", getReturnFlag()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .append("factoryId", getFactoryId()) + .append("dataSource", getDataSource()) + .append("schame", getSchame()) + .append("lineFlag", getLineFlag()) + .append("wmsBaseLocationList", getWmsBaseLocationList()) + .toString(); } } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstockDetail.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstockDetail.java index eb35f20e..3735878c 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstockDetail.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstockDetail.java @@ -53,6 +53,10 @@ public class WmsProductOutstockDetail extends BaseEntity @Excel(name = "出库数量") private BigDecimal outstockAmount; + /** 确认数量 */ + @Excel(name = "确认数量") + private BigDecimal confirmAmount; + /** 执行状态(0待执行,1执行中,2执行完成) */ @Excel(name = "执行状态(0待执行,1执行中,2执行完成)") private String executeStatus; @@ -157,6 +161,15 @@ public class WmsProductOutstockDetail extends BaseEntity { return outstockAmount; } + + public BigDecimal getConfirmAmount() { + return confirmAmount; + } + + public void setConfirmAmount(BigDecimal confirmAmount) { + this.confirmAmount = confirmAmount; + } + public void setExecuteStatus(String executeStatus) { this.executeStatus = executeStatus; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStockSaleorder.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStockSaleorder.java new file mode 100644 index 00000000..b82b07ea --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStockSaleorder.java @@ -0,0 +1,298 @@ +package com.hw.wms.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 成品订单库存记录对象 wms_product_stock_saleorder + * + * @author xins + * @date 2024-02-22 + */ +public class WmsProductStockSaleorder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 成品库存ID */ + private Long productStockSaleorderId; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private Long warehouseId; + + /** 仓库楼层 */ + @Excel(name = "仓库楼层") + private Long warehouseFloor; + + /** 库存类型(2半成品，3成品) */ + @Excel(name = "库存类型(2半成品，3成品)") + private String stockType; + + /** 产品ID，关联物料信息的物料ID */ + @Excel(name = "产品ID，关联物料信息的物料ID") + private Long productId; + + /** 销售订单ID，关联销售订单主键 */ + @Excel(name = "销售订单ID，关联销售订单主键") + private Long saleOrderId; + + /** 销售订单编号 */ + @Excel(name = "销售订单编号") + private String saleorderCode; + + /** 总数量;此数量记录此订单生产的总数量，只能加，不能减 */ + @Excel(name = "总数量;此数量记录此订单生产的总数量，只能加，不能减") + private BigDecimal totalAmount; + + /** 占用数量 */ + @Excel(name = "占用数量") + private BigDecimal occupyAmount; + + /** 冻结数量 */ + @Excel(name = "冻结数量") + private BigDecimal frozenAmount; + + /** 已申请数量 */ + @Excel(name = "已申请数量") + private BigDecimal applyAmount; + + /** 已出库数量（库管或agv出库的数量） */ + @Excel(name = "已出库数量", readConverterExp = "库=管或agv出库的数量") + private BigDecimal outstockAmount; + + /** 确认数量（在一楼最终扫码确认出库的数量） */ + @Excel(name = "确认数量", readConverterExp = "在=一楼最终扫码确认出库的数量") + private BigDecimal confirmAmount; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + /** 有效标记 */ + @Excel(name = "有效标记") + private String activeFlag; + + private String materialCode; + + private String materialName; + + /** + * 销售订单销售数量 + */ + private BigDecimal orderAmount; + + private String warehouseName; + + + public void setProductStockSaleorderId(Long productStockSaleorderId) + { + this.productStockSaleorderId = productStockSaleorderId; + } + + public Long getProductStockSaleorderId() + { + return productStockSaleorderId; + } + public void setWarehouseId(Long warehouseId) + { + this.warehouseId = warehouseId; + } + + public Long getWarehouseId() + { + return warehouseId; + } + public void setWarehouseFloor(Long warehouseFloor) + { + this.warehouseFloor = warehouseFloor; + } + + public Long getWarehouseFloor() + { + return warehouseFloor; + } + public void setStockType(String stockType) + { + this.stockType = stockType; + } + + public String getStockType() + { + return stockType; + } + public void setProductId(Long productId) + { + this.productId = productId; + } + + public Long getProductId() + { + return productId; + } + public void setSaleOrderId(Long saleOrderId) + { + this.saleOrderId = saleOrderId; + } + + public Long getSaleOrderId() + { + return saleOrderId; + } + public void setSaleorderCode(String saleorderCode) + { + this.saleorderCode = saleorderCode; + } + + public String getSaleorderCode() + { + return saleorderCode; + } + public void setTotalAmount(BigDecimal totalAmount) + { + this.totalAmount = totalAmount; + } + + public BigDecimal getTotalAmount() + { + return totalAmount; + } + public void setOccupyAmount(BigDecimal occupyAmount) + { + this.occupyAmount = occupyAmount; + } + + public BigDecimal getOccupyAmount() + { + return occupyAmount; + } + public void setFrozenAmount(BigDecimal frozenAmount) + { + this.frozenAmount = frozenAmount; + } + + public BigDecimal getFrozenAmount() + { + return frozenAmount; + } + public void setApplyAmount(BigDecimal applyAmount) + { + this.applyAmount = applyAmount; + } + + public BigDecimal getApplyAmount() + { + return applyAmount; + } + public void setOutstockAmount(BigDecimal outstockAmount) + { + this.outstockAmount = outstockAmount; + } + + public BigDecimal getOutstockAmount() + { + return outstockAmount; + } + public void setConfirmAmount(BigDecimal confirmAmount) + { + this.confirmAmount = confirmAmount; + } + + public BigDecimal getConfirmAmount() + { + return confirmAmount; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + public void setActiveFlag(String activeFlag) + { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() + { + return activeFlag; + } + + 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 BigDecimal getOrderAmount() { + return orderAmount; + } + + public void setOrderAmount(BigDecimal orderAmount) { + this.orderAmount = orderAmount; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("productStockSaleorderId", getProductStockSaleorderId()) + .append("warehouseId", getWarehouseId()) + .append("warehouseFloor", getWarehouseFloor()) + .append("stockType", getStockType()) + .append("productId", getProductId()) + .append("saleOrderId", getSaleOrderId()) + .append("saleorderCode", getSaleorderCode()) + .append("totalAmount", getTotalAmount()) + .append("occupyAmount", getOccupyAmount()) + .append("frozenAmount", getFrozenAmount()) + .append("applyAmount", getApplyAmount()) + .append("outstockAmount", getOutstockAmount()) + .append("confirmAmount", getConfirmAmount()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .append("activeFlag", getActiveFlag()) + .toString(); + } +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockSaleorderMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockSaleorderMapper.java new file mode 100644 index 00000000..4f2189ae --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockSaleorderMapper.java @@ -0,0 +1,77 @@ +package com.hw.wms.mapper; + +import java.util.List; +import com.hw.wms.domain.WmsProductStockSaleorder; + +/** + * 成品订单库存记录Mapper接口 + * + * @author xins + * @date 2024-02-22 + */ +public interface WmsProductStockSaleorderMapper +{ + /** + * 查询成品订单库存记录 + * + * @param productStockSaleorderId 成品订单库存记录主键 + * @return 成品订单库存记录 + */ + public WmsProductStockSaleorder selectWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId); + + /** + * 查询成品订单库存记录列表 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 成品订单库存记录集合 + */ + public List selectWmsProductStockSaleorderList(WmsProductStockSaleorder wmsProductStockSaleorder); + + /** + * 新增成品订单库存记录 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 结果 + */ + public int insertWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder); + + /** + * 修改成品订单库存记录 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 结果 + */ + public int updateWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder); + + /** + * 删除成品订单库存记录 + * + * @param productStockSaleorderId 成品订单库存记录主键 + * @return 结果 + */ + public int deleteWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId); + + /** + * 批量删除成品订单库存记录 + * + * @param productStockSaleorderIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmsProductStockSaleorderByProductStockSaleorderIds(Long[] productStockSaleorderIds); + + + + + + + + + /** + * 查询成品订单库存记录列表,Join material,saleorder + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 成品订单库存记录集合 + */ + public List selectWmsProductStockSaleorderJoinList(WmsProductStockSaleorder wmsProductStockSaleorder); + +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsProductStockSaleorderService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsProductStockSaleorderService.java new file mode 100644 index 00000000..9628be58 --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsProductStockSaleorderService.java @@ -0,0 +1,73 @@ +package com.hw.wms.service; + +import java.util.List; +import com.hw.wms.domain.WmsProductStockSaleorder; + +/** + * 成品订单库存记录Service接口 + * + * @author xins + * @date 2024-02-22 + */ +public interface IWmsProductStockSaleorderService +{ + /** + * 查询成品订单库存记录 + * + * @param productStockSaleorderId 成品订单库存记录主键 + * @return 成品订单库存记录 + */ + public WmsProductStockSaleorder selectWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId); + + /** + * 查询成品订单库存记录列表 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 成品订单库存记录集合 + */ + public List selectWmsProductStockSaleorderList(WmsProductStockSaleorder wmsProductStockSaleorder); + + /** + * 新增成品订单库存记录 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 结果 + */ + public int insertWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder); + + /** + * 修改成品订单库存记录 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 结果 + */ + public int updateWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder); + + /** + * 批量删除成品订单库存记录 + * + * @param productStockSaleorderIds 需要删除的成品订单库存记录主键集合 + * @return 结果 + */ + public int deleteWmsProductStockSaleorderByProductStockSaleorderIds(Long[] productStockSaleorderIds); + + /** + * 删除成品订单库存记录信息 + * + * @param productStockSaleorderId 成品订单库存记录主键 + * @return 结果 + */ + public int deleteWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId); + + + + + + /** + * 根据销售订单查询成品库存列表Join material,warehouse + * + * @param wmsProductStockSaleorder 成品销售订单库存信息 + * @return 成品销售订单库存信息 + */ + public List selectWmsProductStockSaleordersBySaleorder(WmsProductStockSaleorder wmsProductStockSaleorder); +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockSaleorderServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockSaleorderServiceImpl.java new file mode 100644 index 00000000..18b51626 --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockSaleorderServiceImpl.java @@ -0,0 +1,115 @@ +package com.hw.wms.service.impl; + +import java.util.List; + +import com.hw.common.core.exception.ServiceException; +import com.hw.wms.domain.WmsProductStock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.wms.mapper.WmsProductStockSaleorderMapper; +import com.hw.wms.domain.WmsProductStockSaleorder; +import com.hw.wms.service.IWmsProductStockSaleorderService; + +/** + * 成品订单库存记录Service业务层处理 + * + * @author xins + * @date 2024-02-22 + */ +@Service +public class WmsProductStockSaleorderServiceImpl implements IWmsProductStockSaleorderService +{ + @Autowired + private WmsProductStockSaleorderMapper wmsProductStockSaleorderMapper; + + /** + * 查询成品订单库存记录 + * + * @param productStockSaleorderId 成品订单库存记录主键 + * @return 成品订单库存记录 + */ + @Override + public WmsProductStockSaleorder selectWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId) + { + return wmsProductStockSaleorderMapper.selectWmsProductStockSaleorderByProductStockSaleorderId(productStockSaleorderId); + } + + /** + * 查询成品订单库存记录列表 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 成品订单库存记录 + */ + @Override + public List selectWmsProductStockSaleorderList(WmsProductStockSaleorder wmsProductStockSaleorder) + { + return wmsProductStockSaleorderMapper.selectWmsProductStockSaleorderList(wmsProductStockSaleorder); + } + + /** + * 新增成品订单库存记录 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 结果 + */ + @Override + public int insertWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder) + { + return wmsProductStockSaleorderMapper.insertWmsProductStockSaleorder(wmsProductStockSaleorder); + } + + /** + * 修改成品订单库存记录 + * + * @param wmsProductStockSaleorder 成品订单库存记录 + * @return 结果 + */ + @Override + public int updateWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder) + { + return wmsProductStockSaleorderMapper.updateWmsProductStockSaleorder(wmsProductStockSaleorder); + } + + /** + * 批量删除成品订单库存记录 + * + * @param productStockSaleorderIds 需要删除的成品订单库存记录主键 + * @return 结果 + */ + @Override + public int deleteWmsProductStockSaleorderByProductStockSaleorderIds(Long[] productStockSaleorderIds) + { + return wmsProductStockSaleorderMapper.deleteWmsProductStockSaleorderByProductStockSaleorderIds(productStockSaleorderIds); + } + + /** + * 删除成品订单库存记录信息 + * + * @param productStockSaleorderId 成品订单库存记录主键 + * @return 结果 + */ + @Override + public int deleteWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId) + { + return wmsProductStockSaleorderMapper.deleteWmsProductStockSaleorderByProductStockSaleorderId(productStockSaleorderId); + } + + + + /** + * 根据销售订单查询成品库存列表Join material,warehouse + * + * @param wmsProductStockSaleorder 成品销售订单库存信息 + * @return 成品销售订单库存信息 + */ + @Override + public List selectWmsProductStockSaleordersBySaleorder(WmsProductStockSaleorder wmsProductStockSaleorder) { + List list = wmsProductStockSaleorderMapper.selectWmsProductStockSaleorderJoinList(wmsProductStockSaleorder); + if (list == null || list.isEmpty()) { + throw new ServiceException("无此销售订单库存信息"); + } + + return list; + } + +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockServiceImpl.java index f61ba520..b1874713 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockServiceImpl.java @@ -103,7 +103,7 @@ public class WmsProductStockServiceImpl implements IWmsProductStockService { } /** - * 根据销售订单查询成品库存列表Join material,warehouse,totalAmount>0 + * 根据销售订单查询成品库存列表Join material,warehouse,totalAmount>0(暂时不用，废弃，改为从product_stock_saleorder获取) * * @param wmsProductStock 成品库存 * @return 成品库存 diff --git a/hw-modules/hw-wms/src/main/resources/bootstrap.yml b/hw-modules/hw-wms/src/main/resources/bootstrap.yml index 15fc8b2a..c52ce5ee 100644 --- a/hw-modules/hw-wms/src/main/resources/bootstrap.yml +++ b/hw-modules/hw-wms/src/main/resources/bootstrap.yml @@ -16,14 +16,30 @@ spring: # 服务注册地址 server-addr: 175.27.215.92:8848 namespace: jyhb-test - group: DEFAULT_GROUP + group: xins config: # 配置中心地址 server-addr: 175.27.215.92:8848 namespace: jyhb-test - group: DEFAULT_GROUP + group: xins # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# nacos: +# discovery: +# # 服务注册地址 +# server-addr: 127.0.0.1:8848 +# namespace: jyhb +# group: DEFAULT_GROUP +# config: +# # 配置中心地址 +# server-addr: 127.0.0.1:8848 +# namespace: jyhb +# group: DEFAULT_GROUP +# # 配置文件格式 +# file-extension: yml +# # 共享配置 +# shared-configs: +# - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml index f396dc4c..3357de61 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml @@ -8,6 +8,7 @@ + @@ -31,21 +32,15 @@ - - - - - - - select location_id, warehouse_id, location_code, loc_row, layer_num, loc_column, active_flag, manual_flag, qty_limit, instock_flag, outstock_flag, location_status, batch_mix, create_by, create_time, update_by, update_time, remark, del_flag, shelf_order, check_order, pick_order, pick_flag, is_open_kn_flag, location_scrap_type, location_attr, turn_demand, check_code, work_area, volume_limit, weight_limit, box_limit, pallet_limit, length, width, height from wms_base_location + select location_id, warehouse_id, location_code, loc_row, layer_num, loc_column, active_flag, manual_flag, qty_limit, instock_flag, outstock_flag, location_status, batch_mix, create_by, create_time, update_by, update_time, remark, del_flag, shelf_order, check_order, pick_order, pick_flag, is_open_kn_flag, location_scrap_type, volume_limit, weight_limit, length, width, height from wms_base_location - select wbl.location_id, wbl.warehouse_id, wbl.location_code, wbl.loc_row, wbl.layer_num, wbl.loc_column, wbl.active_flag, wbl.manual_flag, + select wbl.location_id, wbl.warehouse_id,wbl.agv_position_code, wbl.location_code, wbl.loc_row, wbl.layer_num, wbl.loc_column, wbl.active_flag, wbl.manual_flag, wbl.qty_limit, wbl.instock_flag, wbl.outstock_flag, wbl.location_status, wbl.remark,wbw.warehouse_name from wms_base_location wbl left join wms_base_warehouse wbw on wbl.warehouse_id = wbw.warehouse_id diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseWarehouseMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseWarehouseMapper.xml index 1a5e26b2..e7e14d71 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseWarehouseMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseWarehouseMapper.xml @@ -11,7 +11,6 @@ - @@ -21,7 +20,10 @@ - + + + + @@ -65,21 +67,15 @@ - - - - - - - select warehouse_id, warehouse_instock_type, warehouse_type, warehouse_code, warehouse_name, warehouse_category_id, warehouse_floor, dept_id, multi_row_type, multi_side_type, batch_mix, product_mix, workbin_flag, warehouse_location, active_flag, audit_flag, return_flag, remark, create_by, create_time, update_by, update_time, del_flag, factory_id, data_source, schame, line_flag from wms_base_warehouse + select warehouse_id, warehouse_instock_type, warehouse_type, warehouse_code, warehouse_name, warehouse_category_id, warehouse_floor, dept_id, multi_row_type, multi_side_type, batch_mix, product_mix, workbin_flag, warehouse_location, active_flag, in_requirement, out_requirement, return_requirement, auto_flag, return_flag, remark, create_by, create_time, update_by, update_time, del_flag, factory_id, data_source, schame, line_flag from wms_base_warehouse select wbw.warehouse_id, wbw.warehouse_instock_type, wbw.warehouse_type, wbw.warehouse_code, wbw.warehouse_name, wbw.warehouse_category_id, wbw.warehouse_floor, wbw.dept_id, wbw.multi_row_type, wbw.multi_side_type, wbw.batch_mix, - wbw.product_mix, wbw.workbin_flag, wbw.warehouse_location, wbw.active_flag, wbw.audit_flag, wbw.return_flag,wbc.category_name - + wbw.product_mix, wbw.workbin_flag, wbw.warehouse_location, wbw.active_flag, wbw.in_requirement, + wbw.out_requirement,wbw.return_requirement,wbw.auto_flag, + wbw.return_flag,wbc.category_name from wms_base_warehouse wbw left join wms_base_category wbc on wbw.warehouse_category_id = wbc.category_id - and warehouse_instock_type = #{warehouseInstockType} and warehouse_type = #{warehouseType} @@ -263,7 +268,8 @@ and workbin_flag = #{workbinFlag} and warehouse_location like concat('%', #{warehouseLocation}, '%') and active_flag = #{activeFlag} - and audit_flag = #{auditFlag} + and in_requirement = #{inRequirement} + and out_requirement = #{outRequirement} and return_flag = #{returnFlag} and factory_id = #{factoryId} @@ -271,7 +277,12 @@ diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockDetailMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockDetailMapper.xml index 5e78951a..d8311dd8 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockDetailMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockDetailMapper.xml @@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_id = #{productId}, plan_amount = #{planAmount}, outstock_amount = #{outstockAmount}, + confirm_amount = #{confirmAmount}, execute_status = #{executeStatus}, erp_status = #{erpStatus}, update_by = #{updateBy}, diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockSaleorderMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockSaleorderMapper.xml new file mode 100644 index 00000000..0da1236c --- /dev/null +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockSaleorderMapper.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select product_stock_saleorder_id, warehouse_id, warehouse_floor, stock_type, product_id, sale_order_id, saleorder_code, total_amount, occupy_amount, frozen_amount, apply_amount, outstock_amount, confirm_amount, create_by, create_date, update_by, update_date, active_flag from wms_product_stock_saleorder + + + + + + + + insert into wms_product_stock_saleorder + + warehouse_id, + warehouse_floor, + stock_type, + product_id, + sale_order_id, + saleorder_code, + total_amount, + occupy_amount, + frozen_amount, + apply_amount, + outstock_amount, + confirm_amount, + create_by, + create_date, + update_by, + update_date, + active_flag, + + + #{warehouseId}, + #{warehouseFloor}, + #{stockType}, + #{productId}, + #{saleOrderId}, + #{saleorderCode}, + #{totalAmount}, + #{occupyAmount}, + #{frozenAmount}, + #{applyAmount}, + #{outstockAmount}, + #{confirmAmount}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + #{activeFlag}, + + + + + update wms_product_stock_saleorder + + warehouse_id = #{warehouseId}, + warehouse_floor = #{warehouseFloor}, + stock_type = #{stockType}, + product_id = #{productId}, + sale_order_id = #{saleOrderId}, + saleorder_code = #{saleorderCode}, + total_amount = #{totalAmount}, + occupy_amount = #{occupyAmount}, + frozen_amount = #{frozenAmount}, + apply_amount = #{applyAmount}, + outstock_amount = #{outstockAmount}, + confirm_amount = #{confirmAmount}, + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + active_flag = #{activeFlag}, + + where product_stock_saleorder_id = #{productStockSaleorderId} + + + + delete from wms_product_stock_saleorder where product_stock_saleorder_id = #{productStockSaleorderId} + + + + delete from wms_product_stock_saleorder where product_stock_saleorder_id in + + #{productStockSaleorderId} + + + + + + + + + + + + + + + diff --git a/hw-ui/src/views/ems/base/dianMeasurement/index.vue b/hw-ui/src/views/ems/base/dianMeasurement/index.vue index c44d2c3e..91cd97ca 100644 --- a/hw-ui/src/views/ems/base/dianMeasurement/index.vue +++ b/hw-ui/src/views/ems/base/dianMeasurement/index.vue @@ -511,7 +511,7 @@ export default { // 遮罩层 loading: true, // 返回条数 - list: null, + list: [], // 显示搜索条件 showSearch: true, // 计量设备信息表格数据 diff --git a/hw-ui/src/views/wms/base/wmslocation/index.vue b/hw-ui/src/views/wms/base/wmslocation/index.vue index 5e981987..c648d6ce 100644 --- a/hw-ui/src/views/wms/base/wmslocation/index.vue +++ b/hw-ui/src/views/wms/base/wmslocation/index.vue @@ -427,8 +427,8 @@ import { import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; -// import toggleMenuLeftImg from '@/assets/images/togglemenu-left.png' -// import toggleMenuRightImg from '@/assets/images/togglemenu-right.png' +import toggleMenuLeftImg from '@/assets/images/togglemenu-left.png' +import toggleMenuRightImg from '@/assets/images/togglemenu-right.png' export default { name: "Wmslocation", diff --git a/hw-ui/src/views/wms/base/wmswarehouse/index.vue b/hw-ui/src/views/wms/base/wmswarehouse/index.vue index 358c0a17..74705cb2 100644 --- a/hw-ui/src/views/wms/base/wmswarehouse/index.vue +++ b/hw-ui/src/views/wms/base/wmswarehouse/index.vue @@ -68,14 +68,14 @@ /> - + + + + + + + + + + + + + + + + + + + - + @@ -378,18 +423,55 @@ - - - + + {{dict.label}} - - + + + + + + {{dict.label}} + + + + + + + + {{dict.label}} + + + + + + + + {{dict.label}} + + + + + + {{dict.label}} - @@ -432,7 +513,8 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { name: "Wmswarehouse", - dicts: ['wms_warehouse_instock_type', 'wms_warehouse_type','wms_multi_row_type','wms_multi_side_type','wms_batch_mix_flag','wms_product_mix_flag','wms_audit_flag', + dicts: ['wms_warehouse_instock_type', 'wms_warehouse_type','wms_multi_row_type','wms_multi_side_type','wms_batch_mix_flag','wms_product_mix_flag', + 'wms_in_requirement','wms_out_requirement','wms_return_requirement','wms_auto_flag', 'wms_return_flag','wms_workbin_flag','wms_warehouse_active_flag'], components: {Treeselect}, data() { @@ -481,7 +563,7 @@ export default { workbinFlag: null, warehouseLocation: null, activeFlag: null, - auditFlag: null, + inRequirement: null, returnFlag: null, factoryId: null, dataSource: null, @@ -494,8 +576,15 @@ export default { WAREHOUSE_TYPE_AGV:'2',//背负agv仓库 WAREHOUSE_TYPE_CTU:'3',//料箱agv仓库 - AUDIT_FLAG_YES:'1', - AUDIT_FLAG_NO:'0', + IN_REQUIREMENT_APPLY:'0', + + OUT_REQUIREMENT_APPLY:'0',//申请出库，agv仓库默认 + OUT_REQUIREMENT_APPLY_AUDIT:'1',//申请审核出库，普通仓库默认 + + RETURN_REQUIREMENT_APPLY_AUDIT:'1',//申请审核退库 + + AUTO_FLAG_MANUAL:'0',//全人工 + BATCH_MIX_NO:'0', @@ -551,8 +640,17 @@ export default { workbinFlag: [ { required: true, message: "激活标识不能为空", trigger: "blur" } ], - auditFlag: [ - { required: true, message: "返库标识(1是，0否)不能为空", trigger: "blur" } + inRequirement: [ + { required: true, message: "入库要求不能为空", trigger: "blur" } + ], + outRequirement: [ + { required: true, message: "出库要求不能为空", trigger: "blur" } + ], + returnRequirement: [ + { required: true, message: "退库要求不能为空", trigger: "blur" } + ], + autoFlag: [ + { required: true, message: "自动标识不能为空", trigger: "blur" } ], activeFlag: [ { required: true, message: "激活标记不能为空", trigger: "blur" } @@ -601,7 +699,7 @@ export default { workbinFlag: this.globalVariables.WORKBIN_FLAG_NO, warehouseLocation: null, activeFlag: this.globalVariables.ACTIVE_FLAG_YES, - auditFlag: this.globalVariables.AUDIT_FLAG_NO, + inRequirement: this.globalVariables.IN_REQUIREMENT_APPLY, returnFlag: this.globalVariables.RETURN_FLAG_NO, remark: null, createBy: null, @@ -714,7 +812,6 @@ export default { warehouseTypeChange(value){ if(value == this.globalVariables.WAREHOUSE_TYPE_AGV){ - this.form.auditFlag = this.globalVariables.AUDIT_FLAG_NO; this.form.productMix = this.globalVariables.PRODUCT_MIX_NO; this.form.batchMix = this.globalVariables.BATCH_MIX_NO; this.disableFlag = true;