Merge remote-tracking branch 'origin/master'

1.3.5
zhouhy 10 months ago
commit ab70c480dc

@ -1,22 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>hw</artifactId>
<groupId>com.hw</groupId>
<artifactId>hw-api</artifactId>
<version>3.6.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hw-api-ems</artifactId>
<description>
hw-api-ems能源接口模块
</description>
<dependencies>
<!-- RuoYi Common Core-->
<dependency>
<groupId>com.hw</groupId>
<artifactId>hw-common-core</artifactId>
</dependency>
</dependencies>
</dependencies>
</project>

@ -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";//否

@ -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<String, String> 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;
}
}

@ -71,4 +71,15 @@ public enum BusinessType
*
*/
APPLY,
/**
*
*/
LOCK,
/**
*
*/
UNLOCK,
}

@ -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));
}
}

@ -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<WmsBaseLocation> list = wmsBaseLocationService.selectWmsBaseLocationList(wmsBaseLocation);
List<WmsBaseLocation> 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<WmsBaseLocation> list = wmsBaseLocationService.selectWmsBaseLocationList(wmsBaseLocation);
List<WmsBaseLocation> list = wmsBaseLocationService.selectWmsBaseLocationJoinList(wmsBaseLocation);
ExcelUtil<WmsBaseLocation> util = new ExcelUtil<WmsBaseLocation>(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<WmsBaseWarehouse> 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));
}
}

@ -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<WmsBaseWarehouse> list = wmsBaseWarehouseService.selectWmsBaseWarehouseList(wmsBaseWarehouse);
List<WmsBaseWarehouse> 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<WmsBaseWarehouse> list = wmsBaseWarehouseService.selectWmsBaseWarehouseList(wmsBaseWarehouse);
List<WmsBaseWarehouse> list = wmsBaseWarehouseService.selectWmsBaseWarehouseJoinList(wmsBaseWarehouse);
ExcelUtil<WmsBaseWarehouse> util = new ExcelUtil<WmsBaseWarehouse>(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<WmsBaseCategory> list = wmsBaseCategoryService.selectWmsBaseCategoryList(wmsBaseCategory);
return success(list);
}
}

@ -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())

@ -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<WmsBaseLocation> 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<WmsBaseLocation> getWmsBaseLocationList()
{
public List<WmsBaseLocation> getWmsBaseLocationList() {
return wmsBaseLocationList;
}
public void setWmsBaseLocationList(List<WmsBaseLocation> wmsBaseLocationList)
{
public void setWmsBaseLocationList(List<WmsBaseLocation> 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();
}
}

@ -76,5 +76,14 @@ public interface WmsBaseLocationMapper
*/
public List<WmsBaseLocation> selectEmptyWmsBaseLocationList(WmsBaseLocation wmsBaseLocation);
/**
* Join warehouse
*
* @param wmsBaseLocation
* @return
*/
public List<WmsBaseLocation> selectWmsBaseLocationJoinList(WmsBaseLocation wmsBaseLocation);
}

@ -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<WmsBaseWarehouse> 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<WmsBaseLocation> wmsBaseLocationList);
/**
*
*
* @param warehouseId ID
* @return
*/
public int deleteWmsBaseLocationByWarehouseId(Long warehouseId);
/**
* Join category
*
* @param wmsBaseWarehouse
* @return
*/
public List<WmsBaseWarehouse> selectWmsBaseWarehouseJoinList(WmsBaseWarehouse wmsBaseWarehouse);
}

@ -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<WmsBaseLocation> selectWmsBaseLocationJoinList(WmsBaseLocation wmsBaseLocation);
/**
*
*
* @param locationId ID
* @return
*/
public int lockWmsBaseLocation(Long locationId);
/**
*
*
* @param locationId ID
* @return
*/
public int unlockWmsBaseLocation(Long locationId);
}

@ -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<WmsBaseWarehouse> selectWmsBaseWarehouseJoinList(WmsBaseWarehouse wmsBaseWarehouse);
}

@ -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<WmsBaseLocation> selectWmsBaseLocationList(WmsBaseLocation wmsBaseLocation)
{
public List<WmsBaseLocation> 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<WmsBaseLocation> 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);
}
}

@ -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<WmsBaseWarehouse> selectWmsBaseWarehouseJoinList(WmsBaseWarehouse wmsBaseWarehouse)
{
return wmsBaseWarehouseMapper.selectWmsBaseWarehouseJoinList(wmsBaseWarehouse);
}
}

@ -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);

@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.wms.mapper.WmsBaseLocationMapper">
<resultMap type="WmsBaseLocation" id="WmsBaseLocationResult">
<result property="locationId" column="location_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="locationCode" column="location_code" />
<result property="locRow" column="loc_row" />
<result property="layerNum" column="layer_num" />
<result property="locColumn" column="loc_column" />
<result property="activeFlag" column="active_flag" />
<result property="materialTypeId" column="material_type_id" />
<result property="manualFlag" column="manual_flag" />
<result property="qtyLimit" column="qty_limit" />
<result property="instockFlag" column="instock_flag" />
<result property="outstockFlag" column="outstock_flag" />
<result property="locationStatus" column="location_status" />
<result property="batchMix" column="batch_mix" />
<result property="xCoordinate" column="x_coordinate" />
<result property="yCoordinate" column="y_coordinate" />
<result property="zCoordinate" column="z_coordinate" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -44,15 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
<result property="xPixels" column="x_pixels" />
<result property="yPixels" column="y_pixels" />
<result property="zPixels" column="z_pixels" />
<result property="bord" column="bord" />
<result property="productMix" column="product_mix" />
</resultMap>
<sql id="selectWmsBaseLocationVo">
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
</sql>
<select id="selectWmsBaseLocationList" parameterType="WmsBaseLocation" resultMap="WmsBaseLocationResult">
@ -64,15 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="layerNum != null "> and layer_num = #{layerNum}</if>
<if test="locColumn != null "> and loc_column = #{locColumn}</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="materialTypeId != null "> and material_type_id = #{materialTypeId}</if>
<if test="manualFlag != null and manualFlag != ''"> and manual_flag = #{manualFlag}</if>
<if test="qtyLimit != null "> and qty_limit = #{qtyLimit}</if>
<if test="instockFlag != null and instockFlag != ''"> and instock_flag = #{instockFlag}</if>
<if test="outstockFlag != null and outstockFlag != ''"> and outstock_flag = #{outstockFlag}</if>
<if test="locationStatus != null and locationStatus != ''"> and location_status = #{locationStatus}</if>
<if test="batchMix != null and batchMix != ''"> and batch_mix = #{batchMix}</if>
<if test="xCoordinate != null "> and x_coordinate = #{xCoordinate}</if>
<if test="yCoordinate != null "> and y_coordinate = #{yCoordinate}</if>
<if test="zCoordinate != null "> and z_coordinate = #{zCoordinate}</if>
<if test="shelfOrder != null and shelfOrder != ''"> and shelf_order = #{shelfOrder}</if>
<if test="checkOrder != null and checkOrder != ''"> and check_order = #{checkOrder}</if>
<if test="pickOrder != null and pickOrder != ''"> and pick_order = #{pickOrder}</if>
@ -90,11 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="length != null "> and length = #{length}</if>
<if test="width != null "> and width = #{width}</if>
<if test="height != null "> and height = #{height}</if>
<if test="xPixels != null "> and x_pixels = #{xPixels}</if>
<if test="yPixels != null "> and y_pixels = #{yPixels}</if>
<if test="zPixels != null "> and z_pixels = #{zPixels}</if>
<if test="bord != null and bord != ''"> and bord = #{bord}</if>
<if test="productMix != null and productMix != ''"> and product_mix = #{productMix}</if>
</where>
</select>
@ -112,15 +97,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="layerNum != null">layer_num,</if>
<if test="locColumn != null">loc_column,</if>
<if test="activeFlag != null and activeFlag != ''">active_flag,</if>
<if test="materialTypeId != null">material_type_id,</if>
<if test="manualFlag != null">manual_flag,</if>
<if test="qtyLimit != null">qty_limit,</if>
<if test="instockFlag != null">instock_flag,</if>
<if test="outstockFlag != null">outstock_flag,</if>
<if test="locationStatus != null and locationStatus != ''">location_status,</if>
<if test="batchMix != null">batch_mix,</if>
<if test="xCoordinate != null">x_coordinate,</if>
<if test="yCoordinate != null">y_coordinate,</if>
<if test="zCoordinate != null">z_coordinate,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
@ -144,12 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="length != null">length,</if>
<if test="width != null">width,</if>
<if test="height != null">height,</if>
<if test="xPixels != null">x_pixels,</if>
<if test="yPixels != null">y_pixels,</if>
<if test="zPixels != null">z_pixels,</if>
<if test="bord != null">bord,</if>
<if test="productMix != null">product_mix,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="warehouseId != null">#{warehouseId},</if>
<if test="locationCode != null and locationCode != ''">#{locationCode},</if>
@ -157,15 +134,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="layerNum != null">#{layerNum},</if>
<if test="locColumn != null">#{locColumn},</if>
<if test="activeFlag != null and activeFlag != ''">#{activeFlag},</if>
<if test="materialTypeId != null">#{materialTypeId},</if>
<if test="manualFlag != null">#{manualFlag},</if>
<if test="qtyLimit != null">#{qtyLimit},</if>
<if test="instockFlag != null">#{instockFlag},</if>
<if test="outstockFlag != null">#{outstockFlag},</if>
<if test="locationStatus != null and locationStatus != ''">#{locationStatus},</if>
<if test="batchMix != null">#{batchMix},</if>
<if test="xCoordinate != null">#{xCoordinate},</if>
<if test="yCoordinate != null">#{yCoordinate},</if>
<if test="zCoordinate != null">#{zCoordinate},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
@ -189,12 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="length != null">#{length},</if>
<if test="width != null">#{width},</if>
<if test="height != null">#{height},</if>
<if test="xPixels != null">#{xPixels},</if>
<if test="yPixels != null">#{yPixels},</if>
<if test="zPixels != null">#{zPixels},</if>
<if test="bord != null">#{bord},</if>
<if test="productMix != null">#{productMix},</if>
</trim>
</trim>
</insert>
<update id="updateWmsBaseLocation" parameterType="WmsBaseLocation">
@ -206,15 +175,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="layerNum != null">layer_num = #{layerNum},</if>
<if test="locColumn != null">loc_column = #{locColumn},</if>
<if test="activeFlag != null and activeFlag != ''">active_flag = #{activeFlag},</if>
<if test="materialTypeId != null">material_type_id = #{materialTypeId},</if>
<if test="manualFlag != null">manual_flag = #{manualFlag},</if>
<if test="qtyLimit != null">qty_limit = #{qtyLimit},</if>
<if test="instockFlag != null">instock_flag = #{instockFlag},</if>
<if test="outstockFlag != null">outstock_flag = #{outstockFlag},</if>
<if test="locationStatus != null and locationStatus != ''">location_status = #{locationStatus},</if>
<if test="batchMix != null">batch_mix = #{batchMix},</if>
<if test="xCoordinate != null">x_coordinate = #{xCoordinate},</if>
<if test="yCoordinate != null">y_coordinate = #{yCoordinate},</if>
<if test="zCoordinate != null">z_coordinate = #{zCoordinate},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@ -238,11 +204,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="length != null">length = #{length},</if>
<if test="width != null">width = #{width},</if>
<if test="height != null">height = #{height},</if>
<if test="xPixels != null">x_pixels = #{xPixels},</if>
<if test="yPixels != null">y_pixels = #{yPixels},</if>
<if test="zPixels != null">z_pixels = #{zPixels},</if>
<if test="bord != null">bord = #{bord},</if>
<if test="productMix != null">product_mix = #{productMix},</if>
</trim>
where location_id = #{locationId}
</update>
@ -260,7 +221,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectWmsBaseLocationByLocationCode" parameterType="String" resultMap="WmsBaseLocationResult">
<include refid="selectWmsBaseLocationVo"/>
where location_code = #{locationCode}
@ -268,8 +228,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEmptyWmsBaseLocationList" parameterType="WmsBaseLocation" resultMap="WmsBaseLocationResult">
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
<where>
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"
<if test="layerNum != null "> and layer_num = #{layerNum}</if>
<if test="locColumn != null "> and loc_column = #{locColumn}</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="materialTypeId != null "> and material_type_id = #{materialTypeId}</if>
<if test="qtyLimit != null "> and qty_limit = #{qtyLimit}</if>
<if test="instockFlag != null and instockFlag != ''"> and instock_flag = #{instockFlag}</if>
<if test="outstockFlag != null and outstockFlag != ''"> and outstock_flag = #{outstockFlag}</if>
<if test="locationStatus != null and locationStatus != ''"> and location_status = #{locationStatus}</if>
<if test="batchMix != null and batchMix != ''"> and batch_mix = #{batchMix}</if>
<if test="xCoordinate != null "> and x_coordinate = #{xCoordinate}</if>
<if test="yCoordinate != null "> and y_coordinate = #{yCoordinate}</if>
<if test="zCoordinate != null "> and z_coordinate = #{zCoordinate}</if>
<if test="shelfOrder != null and shelfOrder != ''"> and shelf_order = #{shelfOrder}</if>
<if test="checkOrder != null and checkOrder != ''"> and check_order = #{checkOrder}</if>
<if test="pickOrder != null and pickOrder != ''"> and pick_order = #{pickOrder}</if>
@ -305,11 +261,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="length != null "> and length = #{length}</if>
<if test="width != null "> and width = #{width}</if>
<if test="height != null "> and height = #{height}</if>
<if test="xPixels != null "> and x_pixels = #{xPixels}</if>
<if test="yPixels != null "> and y_pixels = #{yPixels}</if>
<if test="zPixels != null "> and z_pixels = #{zPixels}</if>
<if test="bord != null and bord != ''"> and bord = #{bord}</if>
<if test="productMix != null and productMix != ''"> and product_mix = #{productMix}</if>
</where>
</select>
<select id="selectWmsBaseLocationJoinList" parameterType="WmsBaseLocation" resultMap="WmsBaseLocationResult">
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,
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
<where>
<if test="warehouseId != null "> and wbl.warehouse_id = #{warehouseId}</if>
<if test="locationCode != null and locationCode != ''"> and wbl.location_code = #{locationCode}</if>
<if test="locRow != null "> and wbl.loc_row = #{locRow}</if>
<if test="layerNum != null "> and wbl.layer_num = #{layerNum}</if>
<if test="locColumn != null "> and wbl.loc_column = #{locColumn}</if>
<if test="activeFlag != null and activeFlag != ''"> and wbl.active_flag = #{activeFlag}</if>
<if test="manualFlag != null and manualFlag != ''"> and wbl.manual_flag = #{manualFlag}</if>
<if test="qtyLimit != null "> and wbl.qty_limit = #{qtyLimit}</if>
<if test="instockFlag != null and instockFlag != ''"> and wbl.instock_flag = #{instockFlag}</if>
<if test="outstockFlag != null and outstockFlag != ''"> and wbl.outstock_flag = #{outstockFlag}</if>
<if test="locationStatus != null and locationStatus != ''"> and wbl.location_status = #{locationStatus}</if>
</where>
</select>

@ -11,11 +11,18 @@
<result property="warehouseCode" column="warehouse_code" />
<result property="warehouseName" column="warehouse_name" />
<result property="warehouseCategoryId" column="warehouse_category_id" />
<result property="postId" column="post_id" />
<result property="warehouseCategoryName" column="category_name" />
<result property="warehouseFloor" column="warehouse_floor" />
<result property="deptId" column="dept_id" />
<result property="multiRowType" column="multi_row_type" />
<result property="multiSideType" column="multi_side_type" />
<result property="batchMix" column="batch_mix" />
<result property="productMix" column="product_mix" />
<result property="workbinFlag" column="workbin_flag" />
<result property="warehouseLocation" column="warehouse_location" />
<result property="activeFlag" column="active_flag" />
<result property="auditFlag" column="audit_flag" />
<result property="returnFlag" column="return_flag" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@ -40,15 +47,12 @@
<result property="layerNum" column="sub_layer_num" />
<result property="locColumn" column="sub_loc_column" />
<result property="activeFlag" column="sub_active_flag" />
<result property="materialTypeId" column="sub_material_type_id" />
<result property="manualFlag" column="sub_manual_flag" />
<result property="qtyLimit" column="sub_qty_limit" />
<result property="instockFlag" column="sub_instock_flag" />
<result property="outstockFlag" column="sub_outstock_flag" />
<result property="locationStatus" column="sub_location_status" />
<result property="batchMix" column="sub_batch_mix" />
<result property="xCoordinate" column="sub_x_coordinate" />
<result property="yCoordinate" column="sub_y_coordinate" />
<result property="zCoordinate" column="sub_z_coordinate" />
<result property="createBy" column="sub_create_by" />
<result property="createTime" column="sub_create_time" />
<result property="updateBy" column="sub_update_by" />
@ -72,15 +76,10 @@
<result property="length" column="sub_length" />
<result property="width" column="sub_width" />
<result property="height" column="sub_height" />
<result property="xPixels" column="sub_x_pixels" />
<result property="yPixels" column="sub_y_pixels" />
<result property="zPixels" column="sub_z_pixels" />
<result property="bord" column="sub_bord" />
<result property="productMix" column="sub_product_mix" />
</resultMap>
<sql id="selectWmsBaseWarehouseVo">
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
</sql>
<select id="selectWmsBaseWarehouseList" parameterType="WmsBaseWarehouse" resultMap="WmsBaseWarehouseResult">
@ -91,11 +90,17 @@
<if test="warehouseCode != null and warehouseCode != ''"> and warehouse_code = #{warehouseCode}</if>
<if test="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="warehouseCategoryId != null "> and warehouse_category_id = #{warehouseCategoryId}</if>
<if test="postId != null "> and post_id = #{postId}</if>
<if test="warehouseFloor != null "> and warehouse_floor = #{warehouseFloor}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="multiRowType != null and multiRowType != ''"> and multi_row_type = #{multiRowType}</if>
<if test="multiSideType != null and multiSideType != ''"> and multi_side_type = #{multiSideType}</if>
<if test="batchMix != null and batchMix != ''"> and batch_mix = #{batchMix}</if>
<if test="productMix != null and productMix != ''"> and product_mix = #{productMix}</if>
<if test="workbinFlag != null and workbinFlag != ''"> and workbin_flag = #{workbinFlag}</if>
<if test="warehouseLocation != null and warehouseLocation != ''"> and warehouse_location = #{warehouseLocation}</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="auditFlag != null and auditFlag != ''"> and audit_flag = #{auditFlag}</if>
<if test="returnFlag != null and returnFlag != ''"> and return_flag = #{returnFlag}</if>
<if test="factoryId != null "> and factory_id = #{factoryId}</if>
<if test="dataSource != null and dataSource != ''"> and data_source = #{dataSource}</if>
<if test="schame != null and schame != ''"> and schame = #{schame}</if>
@ -104,8 +109,8 @@
</select>
<select id="selectWmsBaseWarehouseByWarehouseId" parameterType="Long" resultMap="WmsBaseWarehouseWmsBaseLocationResult">
select a.warehouse_id, a.warehouse_instock_type, a.warehouse_type, a.warehouse_code, a.warehouse_name, a.warehouse_category_id, a.post_id, a.multi_row_type, a.workbin_flag, a.warehouse_location, a.active_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.factory_id, a.data_source, a.schame, a.line_flag,
b.location_id as sub_location_id, b.warehouse_id as sub_warehouse_id, b.location_code as sub_location_code, b.loc_row as sub_loc_row, b.layer_num as sub_layer_num, b.loc_column as sub_loc_column, b.active_flag as sub_active_flag, b.material_type_id as sub_material_type_id, b.qty_limit as sub_qty_limit, b.instock_flag as sub_instock_flag, b.outstock_flag as sub_outstock_flag, b.location_status as sub_location_status, b.batch_mix as sub_batch_mix, b.x_coordinate as sub_x_coordinate, b.y_coordinate as sub_y_coordinate, b.z_coordinate as sub_z_coordinate, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark, b.del_flag as sub_del_flag, b.shelf_order as sub_shelf_order, b.check_order as sub_check_order, b.pick_order as sub_pick_order, b.pick_flag as sub_pick_flag, b.is_open_kn_flag as sub_is_open_kn_flag, b.location_scrap_type as sub_location_scrap_type, b.location_attr as sub_location_attr, b.turn_demand as sub_turn_demand, b.check_code as sub_check_code, b.work_area as sub_work_area, b.volume_limit as sub_volume_limit, b.weight_limit as sub_weight_limit, b.box_limit as sub_box_limit, b.pallet_limit as sub_pallet_limit, b.length as sub_length, b.width as sub_width, b.height as sub_height, b.x_pixels as sub_x_pixels, b.y_pixels as sub_y_pixels, b.z_pixels as sub_z_pixels, b.bord as sub_bord, b.product_mix as sub_product_mix
select a.warehouse_id, a.warehouse_instock_type, a.warehouse_type, a.warehouse_code, a.warehouse_name, a.warehouse_category_id, a.warehouse_floor, a.dept_id, a.multi_row_type, a.multi_side_type, a.batch_mix, a.product_mix, a.workbin_flag, a.warehouse_location, a.active_flag, a.audit_flag, a.return_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.factory_id, a.data_source, a.schame, a.line_flag,
b.location_id as sub_location_id, b.warehouse_id as sub_warehouse_id, b.location_code as sub_location_code, b.loc_row as sub_loc_row, b.layer_num as sub_layer_num, b.loc_column as sub_loc_column, b.active_flag as sub_active_flag, b.manual_flag as sub_manual_flag, b.qty_limit as sub_qty_limit, b.instock_flag as sub_instock_flag, b.outstock_flag as sub_outstock_flag, b.location_status as sub_location_status, b.batch_mix as sub_batch_mix, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark, b.del_flag as sub_del_flag, b.shelf_order as sub_shelf_order, b.check_order as sub_check_order, b.pick_order as sub_pick_order, b.pick_flag as sub_pick_flag, b.is_open_kn_flag as sub_is_open_kn_flag, b.location_scrap_type as sub_location_scrap_type, b.location_attr as sub_location_attr, b.turn_demand as sub_turn_demand, b.check_code as sub_check_code, b.work_area as sub_work_area, b.volume_limit as sub_volume_limit, b.weight_limit as sub_weight_limit, b.box_limit as sub_box_limit, b.pallet_limit as sub_pallet_limit, b.length as sub_length, b.width as sub_width, b.height as sub_height, b.x_pixels as sub_x_pixels, b.y_pixels as sub_y_pixels, b.z_pixels as sub_z_pixels, b.bord as sub_bord, b.product_mix as sub_product_mix
from wms_base_warehouse a
left join wms_base_location b on b.warehouse_id = a.warehouse_id
where a.warehouse_id = #{warehouseId}
@ -119,11 +124,17 @@
<if test="warehouseCode != null and warehouseCode != ''">warehouse_code,</if>
<if test="warehouseName != null and warehouseName != ''">warehouse_name,</if>
<if test="warehouseCategoryId != null">warehouse_category_id,</if>
<if test="postId != null">post_id,</if>
<if test="warehouseFloor != null">warehouse_floor,</if>
<if test="deptId != null">dept_id,</if>
<if test="multiRowType != null and multiRowType != ''">multi_row_type,</if>
<if test="multiSideType != null and multiSideType != ''">multi_side_type,</if>
<if test="batchMix != null and batchMix != ''">batch_mix,</if>
<if test="productMix != null">product_mix,</if>
<if test="workbinFlag != null">workbin_flag,</if>
<if test="warehouseLocation != null">warehouse_location,</if>
<if test="activeFlag != null and activeFlag != ''">active_flag,</if>
<if test="auditFlag != null">audit_flag,</if>
<if test="returnFlag != null and returnFlag != ''">return_flag,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@ -141,11 +152,17 @@
<if test="warehouseCode != null and warehouseCode != ''">#{warehouseCode},</if>
<if test="warehouseName != null and warehouseName != ''">#{warehouseName},</if>
<if test="warehouseCategoryId != null">#{warehouseCategoryId},</if>
<if test="postId != null">#{postId},</if>
<if test="warehouseFloor != null">#{warehouseFloor},</if>
<if test="deptId != null">#{deptId},</if>
<if test="multiRowType != null and multiRowType != ''">#{multiRowType},</if>
<if test="multiSideType != null and multiSideType != ''">#{multiSideType},</if>
<if test="batchMix != null and batchMix != ''">#{batchMix},</if>
<if test="productMix != null">#{productMix},</if>
<if test="workbinFlag != null">#{workbinFlag},</if>
<if test="warehouseLocation != null">#{warehouseLocation},</if>
<if test="activeFlag != null and activeFlag != ''">#{activeFlag},</if>
<if test="auditFlag != null">#{auditFlag},</if>
<if test="returnFlag != null and returnFlag != ''">#{returnFlag},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@ -167,11 +184,17 @@
<if test="warehouseCode != null and warehouseCode != ''">warehouse_code = #{warehouseCode},</if>
<if test="warehouseName != null and warehouseName != ''">warehouse_name = #{warehouseName},</if>
<if test="warehouseCategoryId != null">warehouse_category_id = #{warehouseCategoryId},</if>
<if test="postId != null">post_id = #{postId},</if>
<if test="warehouseFloor != null">warehouse_floor = #{warehouseFloor},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="multiRowType != null and multiRowType != ''">multi_row_type = #{multiRowType},</if>
<if test="multiSideType != null and multiSideType != ''">multi_side_type = #{multiSideType},</if>
<if test="batchMix != null and batchMix != ''">batch_mix = #{batchMix},</if>
<if test="productMix != null">product_mix = #{productMix},</if>
<if test="workbinFlag != null">workbin_flag = #{workbinFlag},</if>
<if test="warehouseLocation != null">warehouse_location = #{warehouseLocation},</if>
<if test="activeFlag != null and activeFlag != ''">active_flag = #{activeFlag},</if>
<if test="auditFlag != null">audit_flag = #{auditFlag},</if>
<if test="returnFlag != null and returnFlag != ''">return_flag = #{returnFlag},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
@ -209,9 +232,41 @@
</delete>
<insert id="batchWmsBaseLocation">
insert into wms_base_location( 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) values
insert into wms_base_location( 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) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.locationId}, #{item.warehouseId}, #{item.locationCode}, #{item.locRow}, #{item.layerNum}, #{item.locColumn}, #{item.activeFlag}, #{item.materialTypeId}, #{item.qtyLimit}, #{item.instockFlag}, #{item.outstockFlag}, #{item.locationStatus}, #{item.batchMix}, #{item.xCoordinate}, #{item.yCoordinate}, #{item.zCoordinate}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.delFlag}, #{item.shelfOrder}, #{item.checkOrder}, #{item.pickOrder}, #{item.pickFlag}, #{item.isOpenKnFlag}, #{item.locationScrapType}, #{item.locationAttr}, #{item.turnDemand}, #{item.checkCode}, #{item.workArea}, #{item.volumeLimit}, #{item.weightLimit}, #{item.boxLimit}, #{item.palletLimit}, #{item.length}, #{item.width}, #{item.height}, #{item.xPixels}, #{item.yPixels}, #{item.zPixels}, #{item.bord}, #{item.productMix})
( #{item.locationId}, #{item.warehouseId}, #{item.locationCode}, #{item.locRow}, #{item.layerNum}, #{item.locColumn}, #{item.activeFlag}, #{item.manualFlag}, #{item.qtyLimit}, #{item.instockFlag}, #{item.outstockFlag}, #{item.locationStatus}, #{item.batchMix}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.delFlag}, #{item.shelfOrder}, #{item.checkOrder}, #{item.pickOrder}, #{item.pickFlag}, #{item.isOpenKnFlag}, #{item.locationScrapType}, #{item.locationAttr}, #{item.turnDemand}, #{item.checkCode}, #{item.workArea}, #{item.volumeLimit}, #{item.weightLimit}, #{item.boxLimit}, #{item.palletLimit}, #{item.length}, #{item.width}, #{item.height})
</foreach>
</insert>
<select id="selectWmsBaseWarehouseJoinList" parameterType="WmsBaseWarehouse" resultMap="WmsBaseWarehouseResult">
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
<where>
<if test="warehouseInstockType != null and warehouseInstockType != ''"> and warehouse_instock_type = #{warehouseInstockType}</if>
<if test="warehouseType != null and warehouseType != ''"> and warehouse_type = #{warehouseType}</if>
<if test="warehouseCode != null and warehouseCode != ''"> and warehouse_code = #{warehouseCode}</if>
<if test="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="warehouseCategoryId != null "> and warehouse_category_id = #{warehouseCategoryId}</if>
<if test="warehouseFloor != null "> and warehouse_floor = #{warehouseFloor}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="multiRowType != null and multiRowType != ''"> and multi_row_type = #{multiRowType}</if>
<if test="multiSideType != null and multiSideType != ''"> and multi_side_type = #{multiSideType}</if>
<if test="batchMix != null and batchMix != ''"> and batch_mix = #{batchMix}</if>
<if test="productMix != null and productMix != ''"> and product_mix = #{productMix}</if>
<if test="workbinFlag != null and workbinFlag != ''"> and workbin_flag = #{workbinFlag}</if>
<if test="warehouseLocation != null and warehouseLocation != ''"> and warehouse_location like concat('%', #{warehouseLocation}, '%')</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="auditFlag != null and auditFlag != ''"> and audit_flag = #{auditFlag}</if>
<if test="returnFlag != null and returnFlag != ''"> and return_flag = #{returnFlag}</if>
<if test="factoryId != null "> and factory_id = #{factoryId}</if>
</where>
</select>
</mapper>

@ -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' }
}
]
},
]
// 动态路由,基于用户权限动态去加载

@ -12,7 +12,7 @@ module.exports = {
/**
* 是否显示顶部导航
*/
topNav: false,
topNav: true,
/**
* 是否显示 tagsView

@ -220,6 +220,13 @@
<version>${hw.version}</version>
</dependency>
<!-- ems能源接口 -->
<dependency>
<groupId>com.hw</groupId>
<artifactId>hw-api-ems</artifactId>
<version>${hw.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -230,7 +237,6 @@
<module>hw-modules</module>
<module>hw-api</module>
<module>hw-common</module>
<module>hw-api/hw-api-ems</module>
</modules>
<packaging>pom</packaging>

Loading…
Cancel
Save