diff --git a/hw-api/hw-api-ems/pom.xml b/hw-api/hw-api-ems/pom.xml index 9e924916..cc04eb22 100644 --- a/hw-api/hw-api-ems/pom.xml +++ b/hw-api/hw-api-ems/pom.xml @@ -1,22 +1,28 @@ - - hw com.hw + hw-api 3.6.3 - ../../pom.xml 4.0.0 hw-api-ems + + + hw-api-ems能源接口模块 + + + + com.hw hw-common-core - + diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WmsConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WmsConstants.java index 3fac8b2c..36b4be91 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WmsConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WmsConstants.java @@ -12,6 +12,11 @@ import java.util.Map; */ public class WmsConstants { + /*仓库激活标识*/ + public static final String WMS_WAREHOUSE_ACTIVE_FLAG_YES = "1"; + + + /*操作类型,适合原材料和成品的出入库以及原材料的退库*/ public static final String WMS_OPERATION_TYPE_AUTO = "0";//agv自动 public static final String WMS_OPERATION_TYPE_MANUAL = "1";//人工 @@ -21,8 +26,7 @@ public class WmsConstants { /*原材料入库记录入库类型*/ public static final String RAW_INSTOCK_INSTOCK_TYPE_PURCHASE = "1";//采购入库 - public static final String RAW_INSTOCK_INSTOCK_TYPE_MOVE = "2";//移库入库 - public static final String RAW_INSTOCK_INSTOCK_TYPE_MERGE = "3";//合库入库 + public static final String RAW_INSTOCK_INSTOCK_TYPE_RETURN = "2";//返库入库 public static final String RAW_INSTOCK_INSTOCK_TYPE_OTHER = "9";//其他入库 @@ -92,9 +96,7 @@ public class WmsConstants { /*成品入库记录入库类型*/ public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_PRODUCT = "1";//生产入库 - public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_MOVE = "2";//移库入库 - public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_MERGE = "3";//合库入库 - public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_OUT_SEMI = "4";//出半成品库 + public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_OUT_SEMI = "2";//出半成品库 public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_OTHER = "9";//其他入库 @@ -164,10 +166,10 @@ public class WmsConstants { /*原材料出库任务类型*/ public static final String WMS_RAW_OUTSTOCK_TASK_TYPE_PRODUCTION_PICKING = "1";//生产领料 - public static final String WMS_RAW_OUTSTOCK_TASK_TYPE_MOVE = "2";//移库出库 - public static final String WMS_RAW_OUTSTOCK_TASK_TYPE_MERGE = "3";//合库出库 public static final String WMS_RAW_OUTSTOCK_TASK_TYPE_OTHER = "9";//其他 + public static final String WMS_RAW_OUTSTOCK_TASK_TYPE_MOVE = "2";//移库出库,暂时不用 + /*原材料库存完整标识*/ public static final String WMS_RAW_STOCK_COMPLETE_FLAG_YES = "1";//是 public static final String WMS_RAW_STOCK_COMPLETE_FLAG_NO = "0";//否 diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/enums/WmsLocationStatus.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/enums/WmsLocationStatus.java new file mode 100644 index 00000000..1508c15d --- /dev/null +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/enums/WmsLocationStatus.java @@ -0,0 +1,43 @@ +package com.hw.common.core.enums; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 库位状态 + * + * @author xins + */ +public enum WmsLocationStatus +{ + NORMAL("1", "正常"), AUTOLOCK("2", "自动锁定"), MANUALLOCK("3", "人工锁定"), + MOVELOCK("4", "移库锁定"), MERGELOCK("5", "合库锁定"); + + private final String code; + private final String info; + + // 属性值与属性名Map + public static final Map locationStatusMap = Arrays.stream(values()).collect( + Collectors.toMap( + WmsLocationStatus::getCode, + WmsLocationStatus::getInfo + ) + ); + + WmsLocationStatus(String code, String info) + { + this.code = code; + this.info = info; + } + + public String getCode() + { + return code; + } + + public String getInfo() + { + return info; + } +} diff --git a/hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java b/hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java index 94fa890c..13db5073 100644 --- a/hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java +++ b/hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java @@ -71,4 +71,15 @@ public enum BusinessType * 申请 */ APPLY, + + /** + * 锁定 + */ + LOCK, + + /** + * 解锁 + */ + UNLOCK, + } diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/common/controller/SysCommonController.java b/hw-modules/hw-system/src/main/java/com/hw/system/common/controller/SysCommonController.java new file mode 100644 index 00000000..3fbf1009 --- /dev/null +++ b/hw-modules/hw-system/src/main/java/com/hw/system/common/controller/SysCommonController.java @@ -0,0 +1,35 @@ +package com.hw.system.common.controller; + +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.system.api.domain.SysDept; +import com.hw.system.service.ISysDeptService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @Description: 通用对其他服务提供的Controller + * @ClassName: SysCommonController + * @Author : xins + * @Date :2024-01-09 14:35 + * @Version :1.0 + */ +@RestController +@RequestMapping("/hwcommon") +public class SysCommonController extends BaseController +{ + @Autowired + private ISysDeptService deptService; + + /** + * 获取部门列表 + */ + @RequiresPermissions("wms:wmswarehouse:list") + @GetMapping("/getDeptTreeForWarehouse") + public AjaxResult deptTree(SysDept dept) + { + return success(deptService.selectDeptTreeList(dept)); + } + +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseLocationController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseLocationController.java index 301fdf67..db8185e4 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseLocationController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseLocationController.java @@ -3,6 +3,10 @@ package com.hw.wms.controller; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; + +import com.hw.common.core.constant.WmsConstants; +import com.hw.wms.domain.WmsBaseWarehouse; +import com.hw.wms.service.IWmsBaseWarehouseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -24,7 +28,7 @@ import com.hw.common.core.web.page.TableDataInfo; /** * 库位Controller - * + * * @author xs * @date 2023-12-20 */ @@ -35,6 +39,9 @@ public class WmsBaseLocationController extends BaseController @Autowired private IWmsBaseLocationService wmsBaseLocationService; + @Autowired + private IWmsBaseWarehouseService wmsBaseWarehouseService; + /** * 查询库位列表 */ @@ -43,7 +50,7 @@ public class WmsBaseLocationController extends BaseController public TableDataInfo list(WmsBaseLocation wmsBaseLocation) { startPage(); - List list = wmsBaseLocationService.selectWmsBaseLocationList(wmsBaseLocation); + List list = wmsBaseLocationService.selectWmsBaseLocationJoinList(wmsBaseLocation); return getDataTable(list); } @@ -55,7 +62,7 @@ public class WmsBaseLocationController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, WmsBaseLocation wmsBaseLocation) { - List list = wmsBaseLocationService.selectWmsBaseLocationList(wmsBaseLocation); + List list = wmsBaseLocationService.selectWmsBaseLocationJoinList(wmsBaseLocation); ExcelUtil util = new ExcelUtil(WmsBaseLocation.class); util.exportExcel(response, list, "库位数据"); } @@ -102,4 +109,38 @@ public class WmsBaseLocationController extends BaseController { return toAjax(wmsBaseLocationService.deleteWmsBaseLocationByLocationIds(locationIds)); } + + + @RequiresPermissions("wms:wmslocation:list") + @GetMapping("/getWarehouses") + public AjaxResult list(WmsBaseWarehouse wmsBaseWarehouse) + { + wmsBaseWarehouse.setActiveFlag(WmsConstants.WMS_WAREHOUSE_ACTIVE_FLAG_YES); + List list = wmsBaseWarehouseService.selectWmsBaseWarehouseList(wmsBaseWarehouse); + return success(list); + } + + + /** + * 锁定库位 + */ + @RequiresPermissions("wms:wmslocation:lock") + @Log(title = "库位", businessType = BusinessType.LOCK) + @GetMapping("/lockWmsLocation/{locationId}") + public AjaxResult lockWmsLocation(@PathVariable Long locationId) + { + return toAjax(wmsBaseLocationService.lockWmsBaseLocation(locationId)); + } + + /** + * 解锁库位 + */ + @RequiresPermissions("wms:wmslocation:lock") + @Log(title = "库位", businessType = BusinessType.UNLOCK) + @GetMapping("/unlockWmsLocation/{locationId}") + public AjaxResult unlockWmsLocation(@PathVariable Long locationId) + { + return toAjax(wmsBaseLocationService.unlockWmsBaseLocation(locationId)); + } + } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseWarehouseController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseWarehouseController.java index cc428b8c..b457bff7 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseWarehouseController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsBaseWarehouseController.java @@ -3,6 +3,9 @@ package com.hw.wms.controller; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; + +import com.hw.wms.domain.WmsBaseCategory; +import com.hw.wms.service.IWmsBaseCategoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -24,7 +27,7 @@ import com.hw.common.core.web.page.TableDataInfo; /** * 仓库Controller - * + * * @author xs * @date 2023-12-20 */ @@ -35,6 +38,9 @@ public class WmsBaseWarehouseController extends BaseController @Autowired private IWmsBaseWarehouseService wmsBaseWarehouseService; + @Autowired + private IWmsBaseCategoryService wmsBaseCategoryService; + /** * 查询仓库列表 */ @@ -43,7 +49,7 @@ public class WmsBaseWarehouseController extends BaseController public TableDataInfo list(WmsBaseWarehouse wmsBaseWarehouse) { startPage(); - List list = wmsBaseWarehouseService.selectWmsBaseWarehouseList(wmsBaseWarehouse); + List list = wmsBaseWarehouseService.selectWmsBaseWarehouseJoinList(wmsBaseWarehouse); return getDataTable(list); } @@ -55,7 +61,7 @@ public class WmsBaseWarehouseController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, WmsBaseWarehouse wmsBaseWarehouse) { - List list = wmsBaseWarehouseService.selectWmsBaseWarehouseList(wmsBaseWarehouse); + List list = wmsBaseWarehouseService.selectWmsBaseWarehouseJoinList(wmsBaseWarehouse); ExcelUtil util = new ExcelUtil(WmsBaseWarehouse.class); util.exportExcel(response, list, "仓库数据"); } @@ -102,4 +108,17 @@ public class WmsBaseWarehouseController extends BaseController { return toAjax(wmsBaseWarehouseService.deleteWmsBaseWarehouseByWarehouseIds(warehouseIds)); } + + + /** + * 查询仓库类别列表，提供给添加、修改、查询仓库等使用 + */ + @RequiresPermissions("wms:wmswarehouse:list") + @GetMapping("/getWarehouseCategories") + public AjaxResult getWarehouseCategories(WmsBaseCategory wmsBaseCategory) + { + List list = wmsBaseCategoryService.selectWmsBaseCategoryList(wmsBaseCategory); + return success(list); + } + } 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 3fb0a4ef..ce9d2a69 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 @@ -9,8 +9,8 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 库位对象 wms_base_location * - * @author xs - * @date 2023-12-20 + * @author xins + * @date 2024-01-09 */ public class WmsBaseLocation extends BaseEntity { @@ -20,9 +20,9 @@ public class WmsBaseLocation extends BaseEntity private Long locationId; /** 仓库ID，关联wms_base_warehouse的warehouse_id */ - @Excel(name = "仓库ID，关联wms_base_warehouse的warehouse_id") private Long warehouseId; + private String warehouseName; /** 库位编码 */ @Excel(name = "库位编码") private String locationCode; @@ -43,42 +43,30 @@ public class WmsBaseLocation extends BaseEntity @Excel(name = "激活标记 1是 0否") private String activeFlag; - /** 存放物料类型,关联material_type的material_type_id */ - @Excel(name = "存放物料类型,关联material_type的material_type_id") - private Long materialTypeId; + /** 人工处理标识（1是,0否），对于agv仓库可选择 */ + @Excel(name = "人工处理标识", readConverterExp = "1=是,0否") + private String manualFlag; /** 数量限制 */ @Excel(name = "数量限制") private BigDecimal qtyLimit; - /** 入库过度库位标识(1:是,2:否) */ + /** 入库过度库位标识(1:是,0:否) */ @Excel(name = "入库过度库位标识(1:是,0:否)") private String instockFlag; - /** 出库过度库位标识(1:是,2:否) */ + /** 出库过度库位标识(1:是,0:否) */ @Excel(name = "出库过度库位标识(1:是,0:否)") private String outstockFlag; - /** 库位状态(1:正常,2:自动锁定,3:人工锁定);在正常时，库位可以使用，如果是自动锁定则需要自动解锁变成正常，如果是人工锁定需要人工解锁变成正常 */ - @Excel(name = "库位状态(1:正常,2:自动锁定,3:人工锁定);在正常时，库位可以使用，如果是自动锁定则需要自动解锁变成正常，如果是人工锁定需要人工解锁变成正常") + /** 库位状态(1:正常,2:自动锁定,3:人工锁定,4:移库锁定，5:合库锁定);在正常时，库位可以使用，如果是自动锁定则需要自动解锁变成正常，如果是人工锁定需要人工解锁变成正常 */ + @Excel(name = "库位状态(1:正常,2:自动锁定,3:人工锁定,4:移库锁定，5:合库锁定);在正常时，库位可以使用，如果是自动锁定则需要自动解锁变成正常，如果是人工锁定需要人工解锁变成正常") private String locationStatus; - /** 允许混放批次 1是 0否(预留，先不显示此字段) */ - @Excel(name = "允许混放批次 1是 0否(预留，先不显示此字段)") + /** 允许混放批次 1是 0否(预留，先不显示此字段);先按仓库的判断 */ + @Excel(name = "允许混放批次 1是 0否(预留，先不显示此字段);先按仓库的判断") private String batchMix; - /** X坐标 */ - @Excel(name = "X坐标") - private BigDecimal xCoordinate; - - /** Y坐标 */ - @Excel(name = "Y坐标") - private BigDecimal yCoordinate; - - /** Z坐标 */ - @Excel(name = "Z坐标") - private BigDecimal zCoordinate; - /** 删除标志 1删除 0显示 */ private String delFlag; @@ -166,8 +154,8 @@ public class WmsBaseLocation extends BaseEntity @Excel(name = "巷道") private String bord; - /** 允许混放产品 1是 0否 */ - @Excel(name = "允许混放产品 1是 0否") + /** 允许混放产品 1是 0否;预留，允许混放不同的产品 */ + @Excel(name = "允许混放产品 1是 0否;预留，允许混放不同的产品") private String productMix; public void setLocationId(Long locationId) @@ -188,6 +176,15 @@ public class WmsBaseLocation extends BaseEntity { return warehouseId; } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + public void setLocationCode(String locationCode) { this.locationCode = locationCode; @@ -233,14 +230,14 @@ public class WmsBaseLocation extends BaseEntity { return activeFlag; } - public void setMaterialTypeId(Long materialTypeId) + public void setManualFlag(String manualFlag) { - this.materialTypeId = materialTypeId; + this.manualFlag = manualFlag; } - public Long getMaterialTypeId() + public String getManualFlag() { - return materialTypeId; + return manualFlag; } public void setQtyLimit(BigDecimal qtyLimit) { @@ -287,33 +284,6 @@ public class WmsBaseLocation extends BaseEntity { return batchMix; } - public void setxCoordinate(BigDecimal xCoordinate) - { - this.xCoordinate = xCoordinate; - } - - public BigDecimal getxCoordinate() - { - return xCoordinate; - } - public void setyCoordinate(BigDecimal yCoordinate) - { - this.yCoordinate = yCoordinate; - } - - public BigDecimal getyCoordinate() - { - return yCoordinate; - } - public void setzCoordinate(BigDecimal zCoordinate) - { - this.zCoordinate = zCoordinate; - } - - public BigDecimal getzCoordinate() - { - return zCoordinate; - } public void setDelFlag(String delFlag) { this.delFlag = delFlag; @@ -532,15 +502,12 @@ public class WmsBaseLocation extends BaseEntity .append("layerNum", getLayerNum()) .append("locColumn", getLocColumn()) .append("activeFlag", getActiveFlag()) - .append("materialTypeId", getMaterialTypeId()) + .append("manualFlag", getManualFlag()) .append("qtyLimit", getQtyLimit()) .append("instockFlag", getInstockFlag()) .append("outstockFlag", getOutstockFlag()) .append("locationStatus", getLocationStatus()) .append("batchMix", getBatchMix()) - .append("xCoordinate", getxCoordinate()) - .append("yCoordinate", getyCoordinate()) - .append("zCoordinate", getzCoordinate()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) 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 8b30a9d5..e8958d0e 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 @@ -1,16 +1,17 @@ package com.hw.wms.domain; -import java.util.List; 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; +import java.util.List; + /** * 仓库对象 wms_base_warehouse - * - * @author xs - * @date 2023-12-28 + * + * @author xins + * @date 2024-01-09 */ public class WmsBaseWarehouse extends BaseEntity { @@ -19,12 +20,12 @@ public class WmsBaseWarehouse extends BaseEntity /** 仓库ID */ private Long warehouseId; - /** 存放类型(1原材料, 2成品) */ - @Excel(name = "存放类型(1原材料, 2成品)") + /** 存放类型(1原材料, 2半成品,3成品) */ + @Excel(name = "存放类型(1原材料, 2半成品,3成品)") private String warehouseInstockType; - /** 仓库类型 0:普通仓库 1:智能仓库 */ - @Excel(name = "仓库类型 0:普通仓库 1:智能仓库") + /** 仓库类型 0:普通仓库 1:背负agv仓库 2料箱agv仓库;背负agv仓库和料箱agv仓库审核标识为否 */ + @Excel(name = "仓库类型 1:普通仓库 2:背负agv仓库 3料箱agv仓库;背负agv仓库和料箱agv仓库审核标识为否") private String warehouseType; /** 仓库编码 */ @@ -36,17 +37,36 @@ public class WmsBaseWarehouse extends BaseEntity private String warehouseName; /** 仓库类别(关联wms_base_category的category_id) */ - @Excel(name = "仓库类别(关联wms_base_category的category_id)") private Long warehouseCategoryId; - /** 管辖部门(关联sys_post的post_id) */ - @Excel(name = "管辖部门(关联sys_post的post_id)") - private Long postId; + /** 仓库类别名称 */ + @Excel(name = "仓库类别") + private String warehouseCategoryName; + + /** 楼层 */ + @Excel(name = "楼层") + private Long warehouseFloor; + + /** 管辖部门(关联sys_deptt的dept_id) */ + @Excel(name = "管辖部门(关联sys_deptt的dept_id)") + private Long deptId; /** 多排库类型(1单排库,2双排库) */ @Excel(name = "多排库类型(1单排库,2双排库)") private String multiRowType; + /** 多边库类型(1单面库，2双面库);料箱agv是两面的，叉车agv在两面库的中间进行输送，尽量一次让叉车输送同一面的额任务 */ + @Excel(name = "多边库类型(1单面库，2双面库);料箱agv是两面的，叉车agv在两面库的中间进行输送，尽量一次让叉车输送同一面的额任务") + private String multiSideType; + + /** 允许混放批次(1是,0否) */ + @Excel(name = "允许混放批次(1是,0否)") + private String batchMix; + + /** 允许混放产品 1是 0否;预留，允许混放不同的产品 */ + @Excel(name = "允许混放产品 1是 0否;预留，允许混放不同的产品") + private String productMix; + /** 料箱标识(0否,1是) */ @Excel(name = "料箱标识(0否,1是)") private String workbinFlag; @@ -59,6 +79,14 @@ public class WmsBaseWarehouse extends BaseEntity @Excel(name = "激活标记 1是 0否") private String activeFlag; + /** 审核标识 （1是，0否） */ + @Excel(name = "审核标识 ", readConverterExp = "1=是，0否") + private String auditFlag; + + /** 返库标识(1是，0否) */ + @Excel(name = "返库标识(1是，0否)") + private String returnFlag; + /** 删除标志 1删除 0显示 */ private String delFlag; @@ -81,158 +109,219 @@ public class WmsBaseWarehouse extends BaseEntity /** 库位信息 */ 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; } - public void setPostId(Long postId) + + public String getWarehouseCategoryName() { + return warehouseCategoryName; + } + + public void setWarehouseCategoryName(String warehouseCategoryName) { + this.warehouseCategoryName = warehouseCategoryName; + } + + public void setWarehouseFloor(Long warehouseFloor) { - this.postId = postId; + this.warehouseFloor = warehouseFloor; } - public Long getPostId() + public Long getWarehouseFloor() { - return postId; + return warehouseFloor; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + 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 setWorkbinFlag(String workbinFlag) + public void setMultiSideType(String multiSideType) + { + this.multiSideType = multiSideType; + } + + public String getMultiSideType() + { + return multiSideType; + } + public void setBatchMix(String batchMix) + { + this.batchMix = batchMix; + } + + public String getBatchMix() + { + return batchMix; + } + public void setProductMix(String productMix) + { + this.productMix = productMix; + } + + public String getProductMix() + { + return productMix; + } + 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 setDelFlag(String delFlag) + public void setAuditFlag(String auditFlag) + { + this.auditFlag = auditFlag; + } + + public String getAuditFlag() + { + return auditFlag; + } + public void setReturnFlag(String returnFlag) + { + this.returnFlag = returnFlag; + } + + public String getReturnFlag() + { + return returnFlag; + } + 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; } - public List getWmsBaseLocationList() - { + public List getWmsBaseLocationList() { return wmsBaseLocationList; } - public void setWmsBaseLocationList(List wmsBaseLocationList) - { + public void setWmsBaseLocationList(List wmsBaseLocationList) { this.wmsBaseLocationList = wmsBaseLocationList; } @@ -245,11 +334,17 @@ public class WmsBaseWarehouse extends BaseEntity .append("warehouseCode", getWarehouseCode()) .append("warehouseName", getWarehouseName()) .append("warehouseCategoryId", getWarehouseCategoryId()) - .append("postId", getPostId()) + .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()) @@ -260,7 +355,6 @@ public class WmsBaseWarehouse extends BaseEntity .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/mapper/WmsBaseLocationMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java index 12a59c0f..dc5a9acd 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java @@ -76,5 +76,14 @@ public interface WmsBaseLocationMapper */ public List selectEmptyWmsBaseLocationList(WmsBaseLocation wmsBaseLocation); + /** + * 查询库位列表Join warehouse + * + * @param wmsBaseLocation 库位 + * @return 库位集合 + */ + public List selectWmsBaseLocationJoinList(WmsBaseLocation wmsBaseLocation); + + } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseWarehouseMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseWarehouseMapper.java index 0905d900..e33c7912 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseWarehouseMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseWarehouseMapper.java @@ -2,60 +2,96 @@ package com.hw.wms.mapper; import java.util.List; import com.hw.wms.domain.WmsBaseWarehouse; +import com.hw.wms.domain.WmsBaseLocation; /** - * 仓库Mapper接口 - * - * @author xs - * @date 2023-12-20 + * 仓库信息Mapper接口 + * + * @author xins + * @date 2024-01-09 */ -public interface WmsBaseWarehouseMapper +public interface WmsBaseWarehouseMapper { /** - * 查询仓库 - * - * @param warehouseId 仓库主键 - * @return 仓库 + * 查询仓库信息 + * + * @param warehouseId 仓库信息主键 + * @return 仓库信息 */ public WmsBaseWarehouse selectWmsBaseWarehouseByWarehouseId(Long warehouseId); /** - * 查询仓库列表 - * - * @param wmsBaseWarehouse 仓库 - * @return 仓库集合 + * 查询仓库信息列表 + * + * @param wmsBaseWarehouse 仓库信息 + * @return 仓库信息集合 */ public List selectWmsBaseWarehouseList(WmsBaseWarehouse wmsBaseWarehouse); /** - * 新增仓库 - * - * @param wmsBaseWarehouse 仓库 + * 新增仓库信息 + * + * @param wmsBaseWarehouse 仓库信息 * @return 结果 */ public int insertWmsBaseWarehouse(WmsBaseWarehouse wmsBaseWarehouse); /** - * 修改仓库 - * - * @param wmsBaseWarehouse 仓库 + * 修改仓库信息 + * + * @param wmsBaseWarehouse 仓库信息 * @return 结果 */ public int updateWmsBaseWarehouse(WmsBaseWarehouse wmsBaseWarehouse); /** - * 删除仓库 - * - * @param warehouseId 仓库主键 + * 删除仓库信息 + * + * @param warehouseId 仓库信息主键 * @return 结果 */ public int deleteWmsBaseWarehouseByWarehouseId(Long warehouseId); /** - * 批量删除仓库 - * + * 批量删除仓库信息 + * * @param warehouseIds 需要删除的数据主键集合 * @return 结果 */ public int deleteWmsBaseWarehouseByWarehouseIds(Long[] warehouseIds); + + /** + * 批量删除库位 + * + * @param warehouseIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmsBaseLocationByWarehouseIds(Long[] warehouseIds); + + /** + * 批量新增库位 + * + * @param wmsBaseLocationList 库位列表 + * @return 结果 + */ + public int batchWmsBaseLocation(List wmsBaseLocationList); + + + /** + * 通过仓库信息主键删除库位信息 + * + * @param warehouseId 仓库信息ID + * @return 结果 + */ + public int deleteWmsBaseLocationByWarehouseId(Long warehouseId); + + /** + * 查询仓库信息列表Join category + * + * @param wmsBaseWarehouse 仓库信息 + * @return 仓库信息集合 + */ + public List selectWmsBaseWarehouseJoinList(WmsBaseWarehouse wmsBaseWarehouse); + + } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsBaseLocationService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsBaseLocationService.java index 4311cac8..a91b8446 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsBaseLocationService.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsBaseLocationService.java @@ -1,19 +1,21 @@ package com.hw.wms.service; import java.util.List; + +import com.hw.common.core.utils.DateUtils; import com.hw.wms.domain.WmsBaseLocation; /** * 库位Service接口 - * + * * @author xs * @date 2023-12-20 */ -public interface IWmsBaseLocationService +public interface IWmsBaseLocationService { /** * 查询库位 - * + * * @param locationId 库位主键 * @return 库位 */ @@ -21,7 +23,7 @@ public interface IWmsBaseLocationService /** * 查询库位列表 - * + * * @param wmsBaseLocation 库位 * @return 库位集合 */ @@ -29,7 +31,7 @@ public interface IWmsBaseLocationService /** * 新增库位 - * + * * @param wmsBaseLocation 库位 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IWmsBaseLocationService /** * 修改库位 - * + * * @param wmsBaseLocation 库位 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IWmsBaseLocationService /** * 批量删除库位 - * + * * @param locationIds 需要删除的库位主键集合 * @return 结果 */ @@ -53,9 +55,33 @@ public interface IWmsBaseLocationService /** * 删除库位信息 - * + * * @param locationId 库位主键 * @return 结果 */ public int deleteWmsBaseLocationByLocationId(Long locationId); + + /** + * 查询库位列表Join warehouse + * + * @param wmsBaseLocation 库位 + * @return 库位 + */ + public List selectWmsBaseLocationJoinList(WmsBaseLocation wmsBaseLocation); + + /** + * 锁定库位 + * + * @param locationId 库位ID + * @return 结果 + */ + public int lockWmsBaseLocation(Long locationId); + + /** + * 解锁库位 + * + * @param locationId 库位ID + * @return 结果 + */ + public int unlockWmsBaseLocation(Long locationId); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsBaseWarehouseService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsBaseWarehouseService.java index 01f53e8d..c6aeb634 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsBaseWarehouseService.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsBaseWarehouseService.java @@ -5,15 +5,15 @@ import com.hw.wms.domain.WmsBaseWarehouse; /** * 仓库Service接口 - * + * * @author xs * @date 2023-12-20 */ -public interface IWmsBaseWarehouseService +public interface IWmsBaseWarehouseService { /** * 查询仓库 - * + * * @param warehouseId 仓库主键 * @return 仓库 */ @@ -21,7 +21,7 @@ public interface IWmsBaseWarehouseService /** * 查询仓库列表 - * + * * @param wmsBaseWarehouse 仓库 * @return 仓库集合 */ @@ -29,7 +29,7 @@ public interface IWmsBaseWarehouseService /** * 新增仓库 - * + * * @param wmsBaseWarehouse 仓库 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IWmsBaseWarehouseService /** * 修改仓库 - * + * * @param wmsBaseWarehouse 仓库 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IWmsBaseWarehouseService /** * 批量删除仓库 - * + * * @param warehouseIds 需要删除的仓库主键集合 * @return 结果 */ @@ -53,9 +53,18 @@ public interface IWmsBaseWarehouseService /** * 删除仓库信息 - * + * * @param warehouseId 仓库主键 * @return 结果 */ public int deleteWmsBaseWarehouseByWarehouseId(Long warehouseId); + + + /** + * 查询仓库列表Join category + * + * @param wmsBaseWarehouse 仓库 + * @return 仓库 + */ + public List selectWmsBaseWarehouseJoinList(WmsBaseWarehouse wmsBaseWarehouse); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsBaseLocationServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsBaseLocationServiceImpl.java index 8804c64f..8055fa5e 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsBaseLocationServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsBaseLocationServiceImpl.java @@ -1,6 +1,10 @@ package com.hw.wms.service.impl; import java.util.List; + +import com.hw.common.core.constant.WmsConstants; +import com.hw.common.core.enums.WmsLocationStatus; +import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,87 +14,139 @@ import com.hw.wms.service.IWmsBaseLocationService; /** * 库位Service业务层处理 - * + * * @author xs * @date 2023-12-20 */ @Service -public class WmsBaseLocationServiceImpl implements IWmsBaseLocationService -{ +public class WmsBaseLocationServiceImpl implements IWmsBaseLocationService { @Autowired private WmsBaseLocationMapper wmsBaseLocationMapper; /** * 查询库位 - * + * * @param locationId 库位主键 * @return 库位 */ @Override - public WmsBaseLocation selectWmsBaseLocationByLocationId(Long locationId) - { + public WmsBaseLocation selectWmsBaseLocationByLocationId(Long locationId) { return wmsBaseLocationMapper.selectWmsBaseLocationByLocationId(locationId); } /** * 查询库位列表 - * + * * @param wmsBaseLocation 库位 * @return 库位 */ @Override - public List selectWmsBaseLocationList(WmsBaseLocation wmsBaseLocation) - { + public List selectWmsBaseLocationList(WmsBaseLocation wmsBaseLocation) { return wmsBaseLocationMapper.selectWmsBaseLocationList(wmsBaseLocation); } /** * 新增库位 - * + * * @param wmsBaseLocation 库位 * @return 结果 */ @Override - public int insertWmsBaseLocation(WmsBaseLocation wmsBaseLocation) - { + public int insertWmsBaseLocation(WmsBaseLocation wmsBaseLocation) { wmsBaseLocation.setCreateTime(DateUtils.getNowDate()); return wmsBaseLocationMapper.insertWmsBaseLocation(wmsBaseLocation); } /** * 修改库位 - * + * * @param wmsBaseLocation 库位 * @return 结果 */ @Override - public int updateWmsBaseLocation(WmsBaseLocation wmsBaseLocation) - { + public int updateWmsBaseLocation(WmsBaseLocation wmsBaseLocation) { wmsBaseLocation.setUpdateTime(DateUtils.getNowDate()); return wmsBaseLocationMapper.updateWmsBaseLocation(wmsBaseLocation); } /** * 批量删除库位 - * + * * @param locationIds 需要删除的库位主键 * @return 结果 */ @Override - public int deleteWmsBaseLocationByLocationIds(Long[] locationIds) - { + public int deleteWmsBaseLocationByLocationIds(Long[] locationIds) { return wmsBaseLocationMapper.deleteWmsBaseLocationByLocationIds(locationIds); } /** * 删除库位信息 - * + * * @param locationId 库位主键 * @return 结果 */ @Override - public int deleteWmsBaseLocationByLocationId(Long locationId) - { + public int deleteWmsBaseLocationByLocationId(Long locationId) { return wmsBaseLocationMapper.deleteWmsBaseLocationByLocationId(locationId); } + + + /** + * 查询库位列表Join warehouse + * + * @param wmsBaseLocation 库位 + * @return 库位 + */ + @Override + public List selectWmsBaseLocationJoinList(WmsBaseLocation wmsBaseLocation) { + return wmsBaseLocationMapper.selectWmsBaseLocationJoinList(wmsBaseLocation); + } + + + /** + * 锁定库位 + * + * @param locationId 库位ID + * @return 结果 + */ + @Override + public int lockWmsBaseLocation(Long locationId) { +// wmsBaseLocation.setCreateTime(DateUtils.getNowDate()); +// return wmsBaseLocationMapper.insertWmsBaseLocation(wmsBaseLocation); + WmsBaseLocation baseLocation = wmsBaseLocationMapper.selectWmsBaseLocationByLocationId(locationId); + String locationStatus = baseLocation.getLocationStatus(); + if(locationStatus.equals(WmsLocationStatus.MANUALLOCK.getCode())){ + return 1; + } + if(!locationStatus.equals(WmsLocationStatus.NORMAL.getCode())){ + throw new ServiceException("库位状态为"+WmsLocationStatus.locationStatusMap.get(locationStatus)+"，不能锁定"); + } + + baseLocation.setLocationStatus(WmsLocationStatus.MANUALLOCK.getCode()); + return wmsBaseLocationMapper.updateWmsBaseLocation(baseLocation); + } + + /** + * 解锁库位 + * + * @param locationId 库位ID + * @return 结果 + */ + @Override + public int unlockWmsBaseLocation(Long locationId) { + WmsBaseLocation baseLocation = wmsBaseLocationMapper.selectWmsBaseLocationByLocationId(locationId); + String locationStatus = baseLocation.getLocationStatus(); + if(locationStatus.equals(WmsLocationStatus.NORMAL.getCode())){ + return 1; + } + if(!locationStatus.equals(WmsLocationStatus.MANUALLOCK.getCode())){ + throw new ServiceException("库位状态为"+WmsLocationStatus.locationStatusMap.get(locationStatus)+"，不能解锁"); + } + + baseLocation.setLocationStatus(WmsLocationStatus.NORMAL.getCode()); + return wmsBaseLocationMapper.updateWmsBaseLocation(baseLocation); + } + + } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsBaseWarehouseServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsBaseWarehouseServiceImpl.java index d8fc1163..d3745716 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsBaseWarehouseServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsBaseWarehouseServiceImpl.java @@ -10,19 +10,19 @@ import com.hw.wms.service.IWmsBaseWarehouseService; /** * 仓库Service业务层处理 - * + * * @author xs * @date 2023-12-20 */ @Service -public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService +public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService { @Autowired private WmsBaseWarehouseMapper wmsBaseWarehouseMapper; /** * 查询仓库 - * + * * @param warehouseId 仓库主键 * @return 仓库 */ @@ -34,7 +34,7 @@ public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService /** * 查询仓库列表 - * + * * @param wmsBaseWarehouse 仓库 * @return 仓库 */ @@ -46,7 +46,7 @@ public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService /** * 新增仓库 - * + * * @param wmsBaseWarehouse 仓库 * @return 结果 */ @@ -59,7 +59,7 @@ public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService /** * 修改仓库 - * + * * @param wmsBaseWarehouse 仓库 * @return 结果 */ @@ -72,7 +72,7 @@ public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService /** * 批量删除仓库 - * + * * @param warehouseIds 需要删除的仓库主键 * @return 结果 */ @@ -84,7 +84,7 @@ public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService /** * 删除仓库信息 - * + * * @param warehouseId 仓库主键 * @return 结果 */ @@ -93,4 +93,18 @@ public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService { return wmsBaseWarehouseMapper.deleteWmsBaseWarehouseByWarehouseId(warehouseId); } + + + /** + * 查询仓库列表Join category + * + * @param wmsBaseWarehouse 仓库 + * @return 仓库 + */ + @Override + public List selectWmsBaseWarehouseJoinList(WmsBaseWarehouse wmsBaseWarehouse) + { + return wmsBaseWarehouseMapper.selectWmsBaseWarehouseJoinList(wmsBaseWarehouse); + } + } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java index 9acc87d3..dd0c9214 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java @@ -688,7 +688,7 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService { WmsRawInstock rawInstock = new WmsRawInstock(); rawInstock.setWarehouseId(wmsAgvRawOutstockVo.getWarehouseId()); rawInstock.setOperationType(WmsConstants.WMS_OPERATION_TYPE_AUTO); - rawInstock.setInstockType(WmsConstants.RAW_INSTOCK_INSTOCK_TYPE_MOVE); +// rawInstock.setInstockType(WmsConstants.RAW_INSTOCK_INSTOCK_TYPE_MOVE); rawInstock.setAuditStatus(WmsConstants.WMS_AUDIT_STATUS_PASS); rawInstock.setExecuteStatus(WmsConstants.WMS_EXECUTE_STATUS_TOEXECUTE); rawInstock.setApplyDate(currentDate); 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 e06eff92..f396dc4c 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 @@ -1,26 +1,24 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + - + - - - @@ -44,15 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - select location_id, warehouse_id, location_code, loc_row, layer_num, loc_column, active_flag, material_type_id, qty_limit, instock_flag, outstock_flag, location_status, batch_mix, x_coordinate, y_coordinate, z_coordinate, 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, x_pixels, y_pixels, z_pixels, bord, product_mix 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, location_attr, turn_demand, check_code, work_area, volume_limit, weight_limit, box_limit, pallet_limit, length, width, height from wms_base_location @@ -112,15 +97,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" layer_num, loc_column, active_flag, - material_type_id, + manual_flag, qty_limit, instock_flag, outstock_flag, location_status, batch_mix, - x_coordinate, - y_coordinate, - z_coordinate, create_by, create_time, update_by, @@ -144,12 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" length, width, height, - x_pixels, - y_pixels, - z_pixels, - bord, - product_mix, - + #{warehouseId}, #{locationCode}, @@ -157,15 +134,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{layerNum}, #{locColumn}, #{activeFlag}, - #{materialTypeId}, + #{manualFlag}, #{qtyLimit}, #{instockFlag}, #{outstockFlag}, #{locationStatus}, #{batchMix}, - #{xCoordinate}, - #{yCoordinate}, - #{zCoordinate}, #{createBy}, #{createTime}, #{updateBy}, @@ -189,12 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{length}, #{width}, #{height}, - #{xPixels}, - #{yPixels}, - #{zPixels}, - #{bord}, - #{productMix}, - + @@ -206,15 +175,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" layer_num = #{layerNum}, loc_column = #{locColumn}, active_flag = #{activeFlag}, - material_type_id = #{materialTypeId}, + manual_flag = #{manualFlag}, qty_limit = #{qtyLimit}, instock_flag = #{instockFlag}, outstock_flag = #{outstockFlag}, location_status = #{locationStatus}, batch_mix = #{batchMix}, - x_coordinate = #{xCoordinate}, - y_coordinate = #{yCoordinate}, - z_coordinate = #{zCoordinate}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, @@ -238,11 +204,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" length = #{length}, width = #{width}, height = #{height}, - x_pixels = #{xPixels}, - y_pixels = #{yPixels}, - z_pixels = #{zPixels}, - bord = #{bord}, - product_mix = #{productMix}, where location_id = #{locationId} @@ -260,7 +221,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select location_id, warehouse_id, location_code, loc_row, layer_num, loc_column, active_flag, - material_type_id, qty_limit, instock_flag, outstock_flag, location_status, - batch_mix, x_coordinate, y_coordinate, z_coordinate from wms_base_location wbl + qty_limit, instock_flag, outstock_flag, location_status, + batch_mix from wms_base_location wbl and not exists (select 1 from wms_raw_stock wrs where wrs.location_code = wbl.location_code and wrs.total_amount>0 ) @@ -279,15 +239,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and layer_num = #{layerNum} and loc_column = #{locColumn} and active_flag = #{activeFlag} - and material_type_id = #{materialTypeId} and qty_limit = #{qtyLimit} and instock_flag = #{instockFlag} and outstock_flag = #{outstockFlag} and location_status = #{locationStatus} and batch_mix = #{batchMix} - and x_coordinate = #{xCoordinate} - and y_coordinate = #{yCoordinate} - and z_coordinate = #{zCoordinate} and shelf_order = #{shelfOrder} and check_order = #{checkOrder} and pick_order = #{pickOrder} @@ -305,11 +261,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and length = #{length} and width = #{width} and height = #{height} - and x_pixels = #{xPixels} - and y_pixels = #{yPixels} - and z_pixels = #{zPixels} - and bord = #{bord} - and product_mix = #{productMix} + + + + + + + + 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 78dad058..4448e718 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,11 +11,18 @@ - + + + + + + + + @@ -40,15 +47,12 @@ - + - - - @@ -72,15 +76,10 @@ - - - - - - select warehouse_id, warehouse_instock_type, warehouse_type, warehouse_code, warehouse_name, warehouse_category_id, post_id, multi_row_type, workbin_flag, warehouse_location, active_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, 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 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 + + 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} + and warehouse_code = #{warehouseCode} + and warehouse_name like concat('%', #{warehouseName}, '%') + and warehouse_category_id = #{warehouseCategoryId} + and warehouse_floor = #{warehouseFloor} + and dept_id = #{deptId} + and multi_row_type = #{multiRowType} + and multi_side_type = #{multiSideType} + and batch_mix = #{batchMix} + and product_mix = #{productMix} + and workbin_flag = #{workbinFlag} + and warehouse_location like concat('%', #{warehouseLocation}, '%') + and active_flag = #{activeFlag} + and audit_flag = #{auditFlag} + and return_flag = #{returnFlag} + and factory_id = #{factoryId} + + + diff --git a/hw-ui/src/router/index.js b/hw-ui/src/router/index.js index 71907b69..c685c3f2 100644 --- a/hw-ui/src/router/index.js +++ b/hw-ui/src/router/index.js @@ -87,7 +87,22 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] - } + }, + { + path: '/warehouse/allocateMaterial', + component: Layout, + hidden: true, + permissions: ['wms:wmswarehouse:edit'], + children: [ + { + path: 'index/:warehouseId(\\d+)', + component: () => import('@/views/wms/base/wmswarehouse/allocateMaterial'), + name: 'AllocateMaterial', + meta: { title: '仓库物料配置', activeMenu: '/wms/base/wmswarehouse' } + } + ] + }, + ] // 动态路由，基于用户权限动态去加载 diff --git a/hw-ui/src/settings.js b/hw-ui/src/settings.js index 6a0b09f4..fd24806d 100644 --- a/hw-ui/src/settings.js +++ b/hw-ui/src/settings.js @@ -12,7 +12,7 @@ module.exports = { /** * 是否显示顶部导航 */ - topNav: false, + topNav: true, /** * 是否显示 tagsView diff --git a/pom.xml b/pom.xml index dd1e67f9..ff0a5cf1 100644 --- a/pom.xml +++ b/pom.xml @@ -220,6 +220,13 @@ ${hw.version} + + + com.hw + hw-api-ems + ${hw.version} + + @@ -230,7 +237,6 @@ hw-modules hw-api hw-common - hw-api/hw-api-ems pom