xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wanghao 1 week ago
parent ac554bdf8d a4d922a8de
commit f0172f92ac
76 changed files with 841 additions and 176 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-api/hwmom-api-mes/src/main/java/org/dromara/mes/api/model/BaseMaterialInfo.java
Unescape Escape View File

@ -51,7 +51,7 @@ public class BaseMaterialInfo {
/**
* 物料大类(1原材料 2半成品 3成品)
*/
private String materialCategories;
private String materialCategoryId;
/**
* 物料小类

2
ruoyi-api/hwmom-api-mes/src/main/java/org/dromara/mes/api/model/bo/BaseMaterialInfoBo.java
Unescape Escape View File

@ -45,7 +45,7 @@ public class BaseMaterialInfoBo implements Serializable {
/**
* 物料大类(1原材料 2半成品 3成品)
*/
private String materialCategories;
private String materialCategoryId;
/**
* 物料小类

53
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMaterialCategory.java
Unescape Escape View File

@ -0,0 +1,53 @@
package org.dromara.wms.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
/**
* 物料大类信息对象 base_material_category
*
* @author xins
* @date 2025-02-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("base_material_category")
public class BaseMaterialCategory extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 大类ID
*/
@TableId(value = "material_category_id", type = IdType.AUTO)
private Long materialCategoryId;
/**
* 大类编号
*/
private String materialCategoryCode;
/**
* 大类名称
*/
private String materialCategoryName;
/**
* 激活标识（1是 0否）
*/
private String activeFlag;
/**
* 备注
*/
private String remark;
}

4
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMaterialInfo.java
Unescape Escape View File

@ -56,9 +56,9 @@ public class BaseMaterialInfo extends TenantEntity {
private Long materialTypeId;
/**
* 物料大类(1原材料 2半成品 3成品)
* 物料大类(字典改为数据库表)
*/
private String materialCategories;
private String materialCategoryId;
/**
* 物料小类

9
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrder.java
Unescape Escape View File

@ -36,7 +36,8 @@ public class WmsAllocateOrder{
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 出库仓库ID
@ -126,5 +127,9 @@ public class WmsAllocateOrder{
@TableField(exist = false)
private String targetWarehouseCode;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseWarehouse.java
Unescape Escape View File

@ -40,7 +40,8 @@ public class WmsBaseWarehouse extends TenantEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 仓库位置
@ -59,4 +60,9 @@ public class WmsBaseWarehouse extends TenantEntity {
@TableField(exist = false)
private String workshopName;//字段映射
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

9
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockDetail.java
Unescape Escape View File

@ -87,7 +87,8 @@ public class WmsInstockDetail{
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 租户id
*/
@ -122,4 +123,10 @@ public class WmsInstockDetail{
private BigDecimal printedNum;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockOrder.java
Unescape Escape View File

@ -36,7 +36,8 @@ public class WmsInstockOrder{
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 工单类型(1采购订单,2生产订单,3手工,4系统生成)
@ -101,4 +102,11 @@ public class WmsInstockOrder{
private String tenantId;
@TableField(exist = false)
private String warehouseCode;//字段映射
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java
Unescape Escape View File

@ -82,7 +82,10 @@ public class WmsInstockPrint{
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
@TableField(fill = FieldFill.INSERT)
private String createBy;
@ -109,5 +112,10 @@ public class WmsInstockPrint{
*/
private String tenantId;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockRecord.java
Unescape Escape View File

@ -75,7 +75,8 @@ public class WmsInstockRecord extends TenantEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* erp同步状态
@ -87,5 +88,10 @@ public class WmsInstockRecord extends TenantEntity {
*/
private Double erpSynchronousQty;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInventory.java
Unescape Escape View File

@ -46,7 +46,8 @@ public class WmsInventory{
/**
* 物料大类
*/
private Long materialCategories;
@TableField("material_categories")
private Long materialCategoryId;
/**
* 库存数量
@ -101,4 +102,11 @@ public class WmsInventory{
@TableField(exist = false)
private Long outstockDetailId;//字段映射
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInventoryCheck.java
Unescape Escape View File

@ -35,7 +35,8 @@ public class WmsInventoryCheck extends TenantEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 计划仓库ID
@ -86,5 +87,10 @@ public class WmsInventoryCheck extends TenantEntity {
@TableField(exist = false)
private String warehouseCode;//字段映射
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInventoryCheckRecord.java
Unescape Escape View File

@ -32,7 +32,8 @@ public class WmsInventoryCheckRecord {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 盘点单号
@ -148,5 +149,10 @@ public class WmsInventoryCheckRecord {
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

9
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java
Unescape Escape View File

@ -35,7 +35,8 @@ public class WmsMoveOrder{
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 仓库ID
@ -114,4 +115,10 @@ public class WmsMoveOrder{
private String materialCode;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

9
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockDetail.java
Unescape Escape View File

@ -51,7 +51,8 @@ public class WmsOutstockDetail {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 租户id
*/
@ -88,4 +89,10 @@ public class WmsOutstockDetail {
private String unitName;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java
Unescape Escape View File

@ -46,7 +46,8 @@ public class WmsOutstockOrder {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)
@ -104,5 +105,10 @@ public class WmsOutstockOrder {
@TableField(exist = false)
private String warehouseCode;//字段映射
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java
Unescape Escape View File

@ -63,7 +63,8 @@ public class WmsOutstockRecord extends TenantEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* erp同步状态
@ -94,4 +95,11 @@ public class WmsOutstockRecord extends TenantEntity {
private String returnFlag;
@TableField(exist = false)
private Long warehouseId;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPurchaseOrder.java
Unescape Escape View File

@ -66,7 +66,8 @@ public class WmsPurchaseOrder {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 审核人
@ -118,5 +119,10 @@ public class WmsPurchaseOrder {
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

9
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsReturnOrder.java
Unescape Escape View File

@ -37,7 +37,8 @@ public class WmsReturnOrder {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 批次条码
@ -133,4 +134,10 @@ public class WmsReturnOrder {
private String materialCode;
/**
* 物料大类
*/
@TableField(exist = false)
private String materialCategoryName;//字段映射
}

54
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/BaseMaterialCategoryBo.java
Unescape Escape View File

@ -0,0 +1,54 @@
package org.dromara.wms.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.wms.domain.BaseMaterialCategory;
/**
* 物料大类信息业务对象 base_material_category
*
* @author xins
* @date 2025-02-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = BaseMaterialCategory.class, reverseConvertGenerate = false)
public class BaseMaterialCategoryBo extends BaseEntity {
/**
* 大类ID
*/
// @NotNull(message = "大类ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long materialCategoryId;
/**
* 大类编号
*/
@NotBlank(message = "大类编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategoryCode;
/**
* 大类名称
*/
@NotBlank(message = "大类名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategoryName;
/**
* 激活标识（1是 0否）
*/
@NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class })
private String activeFlag;
/**
* 备注
*/
/* @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })*/
private String remark;
}

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/BaseMaterialInfoBo.java
Unescape Escape View File

@ -60,7 +60,7 @@ public class BaseMaterialInfoBo extends BaseEntity {
/**
* 物料大类(1原材料 2半成品 3成品)
*/
private String materialCategories;
private String materialCategoryId;
/**
* 物料小类

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsAllocateOrderBo.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class WmsAllocateOrderBo extends BaseEntity {
* 物料大类
*/
// @NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategories;
private String materialCategoryId;
/**
* 出库仓库ID

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseWarehouseBo.java
Unescape Escape View File

@ -42,7 +42,7 @@ public class WmsBaseWarehouseBo extends BaseEntity {
* 物料大类
*/
@NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategories;
private String materialCategoryId;
/**
* 仓库位置

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockDetailBo.java
Unescape Escape View File

@ -105,7 +105,7 @@ public class WmsInstockDetailBo{
* 物料大类
*/
@NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategories;
private String materialCategoryId;
/**
* 租户id
*/

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockOrderBo.java
Unescape Escape View File

@ -39,7 +39,7 @@ public class WmsInstockOrderBo extends BaseEntity {
* 物料大类
*/
@NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategories;
private String materialCategoryId;
/**
* 工单类型(1采购订单,2生产订单,3手工,4系统生成)

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java
Unescape Escape View File

@ -94,7 +94,7 @@ public class WmsInstockPrintBo extends BaseEntity {
* 物料大类
*/
// @NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategories;
private String materialCategoryId;
private String tenantId;
private List<WmsInstockPrintVo> vos;

4
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockRecordBo.java
Unescape Escape View File

@ -1,5 +1,6 @@
package org.dromara.wms.domain.bo;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.wms.domain.WmsInstockRecord;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
@ -63,7 +64,8 @@ public class WmsInstockRecordBo extends BaseEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* erp同步状态

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInventoryBo.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class WmsInventoryBo extends BaseEntity {
* 物料大类
*/
@NotNull(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private Long materialCategories;
private Long materialCategoryId;
/**
* 库存数量

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInventoryCheckBo.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class WmsInventoryCheckBo extends BaseEntity {
* 物料大类
*/
private String materialCategories;
private String materialCategoryId;
/**
* 计划仓库ID

4
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInventoryCheckRecordBo.java
Unescape Escape View File

@ -1,5 +1,6 @@
package org.dromara.wms.domain.bo;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@ -32,7 +33,8 @@ public class WmsInventoryCheckRecordBo extends BaseEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 盘点单号

4
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsMoveOrderBo.java
Unescape Escape View File

@ -1,5 +1,6 @@
package org.dromara.wms.domain.bo;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@ -35,7 +36,8 @@ public class WmsMoveOrderBo extends BaseEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 仓库ID

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockDetailBo.java
Unescape Escape View File

@ -55,7 +55,7 @@ public class WmsOutstockDetailBo extends BaseEntity {
* 物料大类
*/
// @NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategories;
private String materialCategoryId;
private String tenantId;
private String materialCode;

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class WmsOutstockOrderBo extends BaseEntity {
* 物料大类
*/
// @NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategories;
private String materialCategoryId;
/**
* 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)

4
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java
Unescape Escape View File

@ -1,5 +1,6 @@
package org.dromara.wms.domain.bo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ibm.icu.math.BigDecimal;
import org.dromara.wms.domain.WmsOutstockRecord;
import org.dromara.common.mybatis.core.domain.BaseEntity;
@ -59,7 +60,8 @@ public class WmsOutstockRecordBo extends BaseEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* erp同步状态

4
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPurchaseOrderBo.java
Unescape Escape View File

@ -1,5 +1,6 @@
package org.dromara.wms.domain.bo;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.wms.domain.WmsPurchaseOrder;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
@ -66,7 +67,8 @@ public class WmsPurchaseOrderBo extends BaseEntity {
/**
* 物料大类
*/
private String materialCategories;
@TableField("material_categories")
private String materialCategoryId;
/**
* 审核人

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsReturnOrderBo.java
Unescape Escape View File

@ -40,7 +40,7 @@ public class WmsReturnOrderBo extends BaseEntity{
* 物料大类
*/
// @NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCategories;
private String materialCategoryId;
/**
* 批次条码

61
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/BaseMaterialCategoryVo.java
Unescape Escape View File

@ -0,0 +1,61 @@
package org.dromara.wms.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wms.domain.BaseMaterialCategory;
import java.io.Serial;
import java.io.Serializable;
/**
* 物料大类信息视图对象 base_material_category
*
* @author xins
* @date 2025-02-21
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = BaseMaterialCategory.class)
public class BaseMaterialCategoryVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 大类ID
*/
@ExcelProperty(value = "大类ID")
private Long materialCategoryId;
/**
* 大类编号
*/
@ExcelProperty(value = "大类编号")
private String materialCategoryCode;
/**
* 大类名称
*/
@ExcelProperty(value = "大类名称")
private String materialCategoryName;
/**
* 激活标识（1是 0否）
*/
@ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=是,0=否")
private String activeFlag;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

5
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/BaseMaterialInfoVo.java
Unescape Escape View File

@ -76,9 +76,8 @@ public class BaseMaterialInfoVo implements Serializable {
/**
* 物料大类(1原材料 2半成品 3成品)
*/
@ExcelProperty(value = "物料大类(1原材料 2半成品 3成品)", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "mes_material_categories")
private String materialCategories;
@ExcelProperty(value = "物料大类")
private String materialCategoryId;
/**
* 物料小类

7
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsAllocateOrderVo.java
Unescape Escape View File

@ -49,7 +49,7 @@ public class WmsAllocateOrderVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 出库仓库ID
@ -149,5 +149,8 @@ public class WmsAllocateOrderVo implements Serializable {
private String planWarehouseCode;
private String targetWarehouseCode;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseWarehouseVo.java
Unescape Escape View File

@ -50,8 +50,8 @@ public class WmsBaseWarehouseVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "material_mategories")
private String materialCategories;
@ExcelDictFormat(dictType = "material_mategoryId")
private String materialCategoryId;
/**
* 仓库位置
@ -97,4 +97,10 @@ public class WmsBaseWarehouseVo implements Serializable {
private Date updateTime;
private String workshopName;//字段映射
/**
* 大类名称
*/
@ExcelProperty(value = "大类名称")
private String materialCategoryName;//字段映射
}

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockDetailVo.java
Unescape Escape View File

@ -107,7 +107,11 @@ public class WmsInstockDetailVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 创建人
*/
@TableField(fill = FieldFill.INSERT)
private String createBy;
@ -137,5 +141,9 @@ public class WmsInstockDetailVo implements Serializable {
*/
private String tenantId;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

6
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockOrderVo.java
Unescape Escape View File

@ -48,7 +48,7 @@ public class WmsInstockOrderVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 工单类型(1采购订单,2生产订单,3手工,4系统生成)
@ -98,5 +98,9 @@ public class WmsInstockOrderVo implements Serializable {
private String warehouseCode;//字段映射
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java
Unescape Escape View File

@ -100,7 +100,7 @@ public class WmsInstockPrintVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 租户id
*/
@ -117,4 +117,10 @@ public class WmsInstockPrintVo implements Serializable {
private Double instockQty;
private Long warehouseId;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

7
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockRecordVo.java
Unescape Escape View File

@ -80,7 +80,7 @@ public class WmsInstockRecordVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 入库人
@ -114,4 +114,9 @@ public class WmsInstockRecordVo implements Serializable {
private Date updateTime;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

6
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInventoryCheckRecordVo.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class WmsInventoryCheckRecordVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 盘点单号
@ -181,5 +181,9 @@ public class WmsInventoryCheckRecordVo implements Serializable {
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInventoryCheckVo.java
Unescape Escape View File

@ -49,7 +49,7 @@ public class WmsInventoryCheckVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 计划仓库ID
@ -132,4 +132,10 @@ public class WmsInventoryCheckVo implements Serializable {
private Date updateTime;
private String warehouseCode;//字段映射
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

7
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInventoryVo.java
Unescape Escape View File

@ -59,7 +59,7 @@ public class WmsInventoryVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private Long materialCategories;
private Long materialCategoryId;
/**
* 库存数量
@ -119,4 +119,9 @@ public class WmsInventoryVo implements Serializable {
private BigDecimal minStockAmount;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

7
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsMoveOrderVo.java
Unescape Escape View File

@ -49,7 +49,7 @@ public class WmsMoveOrderVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 仓库ID
@ -139,4 +139,9 @@ public class WmsMoveOrderVo implements Serializable {
@TableField(exist = false)
private String materialCode;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

7
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class WmsOutstockDetailVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 租户id
*/
@ -94,4 +94,9 @@ public class WmsOutstockDetailVo implements Serializable {
private String materialName;
private double outSum;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

6
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class WmsOutstockOrderVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)
@ -124,5 +124,9 @@ public class WmsOutstockOrderVo implements Serializable {
private Date updateTime;
private String warehouseCode;//字段映射
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java
Unescape Escape View File

@ -74,9 +74,8 @@ public class WmsOutstockRecordVo implements Serializable {
/**
* 物料大类
*/
@ExcelProperty(value = "物料大类", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "mes_material_categories")
private String materialCategories;
@ExcelProperty(value = "物料大类")
private String materialCategoryId;
/**
* 出库人
@ -112,4 +111,9 @@ public class WmsOutstockRecordVo implements Serializable {
private String returnFlag;
private Long warehouseId;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

5
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderVo.java
Unescape Escape View File

@ -113,9 +113,8 @@ public class WmsPurchaseOrderVo implements Serializable {
/**
* 物料大类
*/
@ExcelProperty(value = "物料大类", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "material_mategories")
private String materialCategories;
@ExcelProperty(value = "物料大类")
private String materialCategoryId;
/**
* 审核人

7
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsReturnOrderVo.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class WmsReturnOrderVo implements Serializable {
* 物料大类
*/
@ExcelProperty(value = "物料大类")
private String materialCategories;
private String materialCategoryId;
/**
* 批次条码
@ -158,4 +158,9 @@ public class WmsReturnOrderVo implements Serializable {
private String materialCode;
/**
* 物料大类
*/
private String materialCategoryName;//字段映射
}

17
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/BaseMaterialCategoryMapper.java
Unescape Escape View File

@ -0,0 +1,17 @@
package org.dromara.wms.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.vo.BaseMaterialCategoryVo;
import org.springframework.stereotype.Repository;
/**
* 物料大类信息Mapper接口
*
* @author xins
* @date 2025-02-21
*/
@Repository
public interface BaseMaterialCategoryMapper extends BaseMapperPlus<BaseMaterialCategory, BaseMaterialCategoryVo> {
}

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockPrintMapper.java
Unescape Escape View File

@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface WmsInstockPrintMapper extends BaseMapperPlus<WmsInstockPrint, WmsInstockPrintVo> {
@Select("select top 1 material_spe,batch_code,material_categories,material_code,material_name,unit_name, " +
@Select("select top 1 material_spe,batch_code,material_categoryId,material_code,material_name,unit_name, " +
" material_id,instock_print_id,apportion_qty,instock_code,material_qty " +
"from wms_instock_print where batch_code=#{code}")
WmsInstockPrintVo inSelectCode(String code);

68
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IBaseMaterialCategoryService.java
Unescape Escape View File

@ -0,0 +1,68 @@
package org.dromara.wms.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wms.domain.bo.BaseMaterialCategoryBo;
import org.dromara.wms.domain.vo.BaseMaterialCategoryVo;
import java.util.Collection;
import java.util.List;
/**
* 物料大类信息Service接口
*
* @author xins
* @date 2025-02-21
*/
public interface IBaseMaterialCategoryService {
/**
* 查询物料大类信息
*
* @param materialCategoryId 主键
* @return 物料大类信息
*/
BaseMaterialCategoryVo queryById(Long materialCategoryId);
/**
* 分页查询物料大类信息列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 物料大类信息分页列表
*/
TableDataInfo<BaseMaterialCategoryVo> queryPageList(BaseMaterialCategoryBo bo, PageQuery pageQuery);
/**
* 查询符合条件的物料大类信息列表
*
* @param bo 查询条件
* @return 物料大类信息列表
*/
List<BaseMaterialCategoryVo> queryList(BaseMaterialCategoryBo bo);
/**
* 新增物料大类信息
*
* @param bo 物料大类信息
* @return 是否新增成功
*/
Boolean insertByBo(BaseMaterialCategoryBo bo);
/**
* 修改物料大类信息
*
* @param bo 物料大类信息
* @return 是否修改成功
*/
Boolean updateByBo(BaseMaterialCategoryBo bo);
/**
* 校验并批量删除物料大类信息信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

134
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialCategoryServiceImpl.java
Unescape Escape View File

@ -0,0 +1,134 @@
package org.dromara.wms.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.bo.BaseMaterialCategoryBo;
import org.dromara.wms.domain.vo.BaseMaterialCategoryVo;
import org.dromara.wms.mapper.BaseMaterialCategoryMapper;
import org.dromara.wms.service.IBaseMaterialCategoryService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 物料大类信息Service业务层处理
*
* @author xins
* @date 2025-02-21
*/
@RequiredArgsConstructor
@Service
public class BaseMaterialCategoryServiceImpl implements IBaseMaterialCategoryService {
private final BaseMaterialCategoryMapper baseMapper;
/**
* 查询物料大类信息
*
* @param materialCategoryId 主键
* @return 物料大类信息
*/
@Override
public BaseMaterialCategoryVo queryById(Long materialCategoryId){
return baseMapper.selectVoById(materialCategoryId);
}
/**
* 分页查询物料大类信息列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 物料大类信息分页列表
*/
@Override
public TableDataInfo<BaseMaterialCategoryVo> queryPageList(BaseMaterialCategoryBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<BaseMaterialCategory> lqw = buildQueryWrapper(bo);
Page<BaseMaterialCategoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的物料大类信息列表
*
* @param bo 查询条件
* @return 物料大类信息列表
*/
@Override
public List<BaseMaterialCategoryVo> queryList(BaseMaterialCategoryBo bo) {
MPJLambdaWrapper<BaseMaterialCategory> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<BaseMaterialCategory> buildQueryWrapper(BaseMaterialCategoryBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseMaterialCategory> lqw = JoinWrappers.lambda(BaseMaterialCategory.class)
.selectAll(BaseMaterialCategory.class)
.eq(bo.getMaterialCategoryId() != null, BaseMaterialCategory::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryCode()), BaseMaterialCategory::getMaterialCategoryCode, bo.getMaterialCategoryCode())
.like(StringUtils.isNotBlank(bo.getMaterialCategoryName()), BaseMaterialCategory::getMaterialCategoryName, bo.getMaterialCategoryName())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseMaterialCategory::getActiveFlag, bo.getActiveFlag())
.orderByDesc(BaseMaterialCategory::getCreateTime);
return lqw;
}
/**
* 新增物料大类信息
*
* @param bo 物料大类信息
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(BaseMaterialCategoryBo bo) {
BaseMaterialCategory add = MapstructUtils.convert(bo, BaseMaterialCategory.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setMaterialCategoryId(add.getMaterialCategoryId());
}
return flag;
}
/**
* 修改物料大类信息
*
* @param bo 物料大类信息
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(BaseMaterialCategoryBo bo) {
BaseMaterialCategory update = MapstructUtils.convert(bo, BaseMaterialCategory.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(BaseMaterialCategory entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除物料大类信息信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

6
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java
Unescape Escape View File

@ -78,7 +78,7 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
lqw.eq(StringUtils.isNotBlank(bo.getOldMaterialCode()), BaseMaterialInfo::getOldMaterialCode, bo.getOldMaterialCode());
lqw.like(StringUtils.isNotBlank(bo.getMaterialName()), BaseMaterialInfo::getMaterialName, bo.getMaterialName());
lqw.eq(bo.getMaterialTypeId() != null, BaseMaterialInfo::getMaterialTypeId, bo.getMaterialTypeId());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), BaseMaterialInfo::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), BaseMaterialInfo::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialSubclass()), BaseMaterialInfo::getMaterialSubclass, bo.getMaterialSubclass());
lqw.eq(StringUtils.isNotBlank(bo.getBatchFlag()), BaseMaterialInfo::getBatchFlag, bo.getBatchFlag());
lqw.eq(bo.getBatchAmount() != null, BaseMaterialInfo::getBatchAmount, bo.getBatchAmount());
@ -159,8 +159,8 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
@Override
public List<BaseMaterialInfoVo> materialList(BaseMaterialInfo materialInfo) {
LambdaQueryWrapper<BaseMaterialInfo> wrapper = new LambdaQueryWrapper<>();
if (materialInfo.getMaterialCategories()!=null){
wrapper.eq(BaseMaterialInfo::getMaterialCategories,materialInfo.getMaterialCategories());
if (materialInfo.getMaterialCategoryId()!=null){
wrapper.eq(BaseMaterialInfo::getMaterialCategoryId,materialInfo.getMaterialCategoryId());
}
return baseMapper.selectVoList(wrapper);
}

18
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderServiceImpl.java
Unescape Escape View File

@ -11,10 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialInfo;
import org.dromara.wms.domain.WmsAllocateOrder;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsReturnOrder;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.bo.WmsAllocateOrderBo;
import org.dromara.wms.domain.bo.WmsReturnOrderBo;
import org.dromara.wms.domain.vo.WmsAllocateOrderVo;
@ -77,13 +74,22 @@ public class WmsAllocateOrderServiceImpl implements IWmsAllocateOrderService {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsAllocateOrder> lqw = JoinWrappers.lambda(WmsAllocateOrder.class)
.selectAll(WmsAllocateOrder.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsAllocateOrder::getMaterialCategoryId)
.selectAs("a",WmsBaseWarehouse::getWarehouseCode,WmsAllocateOrderVo::getPlanWarehouseCode)
.selectAs("b",WmsBaseWarehouse::getWarehouseCode,WmsAllocateOrderVo::getTargetWarehouseCode)
.leftJoin(WmsBaseWarehouse.class,"a",WmsBaseWarehouse::getWarehouseId,WmsAllocateOrder::getPlanWarehouseId)
.leftJoin(WmsBaseWarehouse.class,"b",WmsBaseWarehouse::getWarehouseId,WmsAllocateOrder::getTargetWarehouseId);
lqw.eq(bo.getAoId() != null, WmsAllocateOrder::getAoId, bo.getAoId());
lqw.eq(StringUtils.isNotBlank(bo.getAllocateOrderCode()), WmsAllocateOrder::getAllocateOrderCode, bo.getAllocateOrderCode());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsAllocateOrder::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsAllocateOrder::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(bo.getPlanWarehouseId() != null, WmsAllocateOrder::getPlanWarehouseId, bo.getPlanWarehouseId());
lqw.eq(StringUtils.isNotBlank(bo.getOrderStatus()), WmsAllocateOrder::getOrderStatus, bo.getOrderStatus());
lqw.eq(bo.getTargetWarehouseId() != null, WmsAllocateOrder::getTargetWarehouseId, bo.getTargetWarehouseId());
@ -115,7 +121,7 @@ public class WmsAllocateOrderServiceImpl implements IWmsAllocateOrderService {
LambdaQueryWrapper<WmsAllocateOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getAoId() != null, WmsAllocateOrder::getAoId, bo.getAoId());
lqw.eq(StringUtils.isNotBlank(bo.getAllocateOrderCode()), WmsAllocateOrder::getAllocateOrderCode, bo.getAllocateOrderCode());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsAllocateOrder::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsAllocateOrder::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(bo.getPlanWarehouseId() != null, WmsAllocateOrder::getPlanWarehouseId, bo.getPlanWarehouseId());
lqw.eq(StringUtils.isNotBlank(bo.getOrderStatus()), WmsAllocateOrder::getOrderStatus, bo.getOrderStatus());
lqw.eq(bo.getTargetWarehouseId() != null, WmsAllocateOrder::getTargetWarehouseId, bo.getTargetWarehouseId());

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseWarehouseServiceImpl.java
Unescape Escape View File

@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
import org.dromara.wms.domain.bo.WmsBaseWarehouseBo;
import org.dromara.wms.domain.vo.WmsBaseWarehouseVo;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.mapper.WmsBaseWarehouseMapper;
import org.dromara.wms.service.IWmsBaseWarehouseService;
@ -79,9 +81,13 @@ public class WmsBaseWarehouseServiceImpl implements IWmsBaseWarehouseService {
.select(ProdBaseWorkshopInfo1::getWorkshopName)
.leftJoin(ProdBaseWorkshopInfo1.class, ProdBaseWorkshopInfo1::getWorkshopId, WmsBaseWarehouse::getWorkshopId)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsBaseWarehouse::getMaterialCategoryId)
.eq(StringUtils.isNotBlank(bo.getWarehouseCode()), WmsBaseWarehouse::getWarehouseCode, bo.getWarehouseCode())
.like(StringUtils.isNotBlank(bo.getWarehouseName()), WmsBaseWarehouse::getWarehouseName, bo.getWarehouseName())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsBaseWarehouse::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsBaseWarehouse::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(bo.getWorkshopId() != null, WmsBaseWarehouse::getWorkshopId, bo.getWorkshopId())
.eq(StringUtils.isNotBlank(bo.getWarehouseType()), WmsBaseWarehouse::getWarehouseType, bo.getWarehouseType())
.orderByDesc(WmsBaseWarehouse::getCreateTime);

46
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java
Unescape Escape View File

@ -1,6 +1,8 @@
package org.dromara.wms.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -14,6 +16,7 @@ import org.dromara.wms.domain.*;
import org.dromara.wms.domain.bo.BaseMaterialInfoBo;
import org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo;
import org.dromara.wms.domain.bo.WmsInstockDetailBo;
import org.dromara.wms.domain.bo.WmsInstockPrintBo;
import org.dromara.wms.domain.vo.BaseMaterialInfoVo;
import org.dromara.wms.domain.vo.WmsInstockDetailVo;
import org.dromara.wms.domain.vo.WmsInstockOrderVo;
@ -71,7 +74,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
*/
@Override
public TableDataInfo<WmsInstockDetailVo> queryPageList(WmsInstockDetailBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsInstockDetail> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<WmsInstockDetail> lqw = buildQueryWrapper(bo);
lqw.orderByDesc(WmsInstockDetail::getCreateTime);
Page<WmsInstockDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
@ -85,26 +88,35 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
*/
@Override
public List<WmsInstockDetailVo> queryList(WmsInstockDetailBo bo) {
LambdaQueryWrapper<WmsInstockDetail> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<WmsInstockDetail> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsInstockDetail> buildQueryWrapper(WmsInstockDetailBo bo) {
private MPJLambdaWrapper<WmsInstockDetail> buildQueryWrapper(WmsInstockDetailBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsInstockDetail> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getInstockDetailId() != null, WmsInstockDetail::getInstockDetailId, bo.getInstockDetailId());
lqw.eq(bo.getInstockId() != null, WmsInstockDetail::getInstockId, bo.getInstockId());
lqw.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockDetail::getInstockCode, bo.getInstockCode());
lqw.eq(bo.getDnDId() != null, WmsInstockDetail::getDnDId, bo.getDnDId());
lqw.eq(bo.getPoDId() != null, WmsInstockDetail::getPoDId, bo.getPoDId());
lqw.eq(bo.getMaterialId() != null, WmsInstockDetail::getMaterialId, bo.getMaterialId());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCode()), WmsInstockDetail::getMaterialCode, bo.getMaterialCode());
lqw.like(StringUtils.isNotBlank(bo.getMaterialName()), WmsInstockDetail::getMaterialName, bo.getMaterialName());
lqw.eq(bo.getInstockQty() != null, WmsInstockDetail::getInstockQty, bo.getInstockQty());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialSpe()), WmsInstockDetail::getMaterialSpe, bo.getMaterialSpe());
lqw.like(StringUtils.isNotBlank(bo.getUnitName()), WmsInstockDetail::getUnitName, bo.getUnitName());
lqw.eq(StringUtils.isNotBlank(bo.getCodeYesNo()), WmsInstockDetail::getCodeYesNo, bo.getCodeYesNo());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsInstockDetail::getMaterialCategories, bo.getMaterialCategories());
MPJLambdaWrapper<WmsInstockDetail> lqw = JoinWrappers.lambda(WmsInstockDetail.class)
.selectAll(WmsInstockDetail.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInstockDetail::getMaterialCategoryId)
.eq(bo.getInstockDetailId() != null, WmsInstockDetail::getInstockDetailId, bo.getInstockDetailId())
.eq(bo.getInstockId() != null, WmsInstockDetail::getInstockId, bo.getInstockId())
.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockDetail::getInstockCode, bo.getInstockCode())
.eq(bo.getDnDId() != null, WmsInstockDetail::getDnDId, bo.getDnDId())
.eq(bo.getPoDId() != null, WmsInstockDetail::getPoDId, bo.getPoDId())
.eq(bo.getMaterialId() != null, WmsInstockDetail::getMaterialId, bo.getMaterialId())
.eq(StringUtils.isNotBlank(bo.getMaterialCode()), WmsInstockDetail::getMaterialCode, bo.getMaterialCode())
.like(StringUtils.isNotBlank(bo.getMaterialName()), WmsInstockDetail::getMaterialName, bo.getMaterialName())
.eq(bo.getInstockQty() != null, WmsInstockDetail::getInstockQty, bo.getInstockQty())
.eq(StringUtils.isNotBlank(bo.getMaterialSpe()), WmsInstockDetail::getMaterialSpe, bo.getMaterialSpe())
.like(StringUtils.isNotBlank(bo.getUnitName()), WmsInstockDetail::getUnitName, bo.getUnitName())
.eq(StringUtils.isNotBlank(bo.getCodeYesNo()), WmsInstockDetail::getCodeYesNo, bo.getCodeYesNo())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockDetail::getMaterialCategoryId, bo.getMaterialCategoryId())
.orderByDesc(WmsInstockDetail::getCreateTime);
return lqw;
}

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
Unescape Escape View File

@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsConfiguration;
import org.dromara.wms.domain.WmsInstockOrder;
@ -103,12 +104,17 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
private MPJLambdaWrapper<WmsInstockOrder> buildJoinQueryWrapper(WmsInstockOrderBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsInstockOrder> lqw = JoinWrappers.lambda(WmsInstockOrder.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInstockOrder::getMaterialCategoryId)
.selectAll(WmsInstockOrder.class)
.select(WmsBaseWarehouse::getWarehouseCode)
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsInstockOrder::getWarehouseId);
lqw.eq(bo.getInstockId() != null, WmsInstockOrder::getInstockId, bo.getInstockId());
lqw.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockOrder::getInstockCode, bo.getInstockCode());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsInstockOrder::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(StringUtils.isNotBlank(bo.getInstockType()), WmsInstockOrder::getInstockType, bo.getInstockType());
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), WmsInstockOrder::getOrderNo, bo.getOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsInstockOrder::getAuditBy, bo.getAuditBy());
@ -123,7 +129,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
LambdaQueryWrapper<WmsInstockOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getInstockId() != null, WmsInstockOrder::getInstockId, bo.getInstockId());
lqw.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockOrder::getInstockCode, bo.getInstockCode());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsInstockOrder::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(StringUtils.isNotBlank(bo.getInstockType()), WmsInstockOrder::getInstockType, bo.getInstockType());
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), WmsInstockOrder::getOrderNo, bo.getOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsInstockOrder::getAuditBy, bo.getAuditBy());

46
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockPrintServiceImpl.java
Unescape Escape View File

@ -1,5 +1,7 @@
package org.dromara.wms.service.impl;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -9,6 +11,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsInstockDetail;
import org.dromara.wms.domain.WmsInstockPrint;
import org.dromara.wms.domain.bo.WmsInstockDetailBo;
@ -55,7 +59,8 @@ public class WmsInstockPrintServiceImpl implements IWmsInstockPrintService {
*/
@Override
public TableDataInfo<WmsInstockPrintVo> queryPageList(WmsInstockPrintBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsInstockPrint> lqw = buildQueryWrapper(bo);
/* LambdaQueryWrapper<WmsInstockPrint> lqw = buildQueryWrapper(bo);*/
MPJLambdaWrapper<WmsInstockPrint> lqw = buildQueryWrapper(bo);
lqw.orderByDesc(WmsInstockPrint::getCreateTime);
Page<WmsInstockPrintVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
@ -69,7 +74,7 @@ public class WmsInstockPrintServiceImpl implements IWmsInstockPrintService {
*/
@Override
public List<WmsInstockPrintVo> queryList(WmsInstockPrintBo bo) {
LambdaQueryWrapper<WmsInstockPrint> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<WmsInstockPrint> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
@ -80,24 +85,33 @@ public class WmsInstockPrintServiceImpl implements IWmsInstockPrintService {
return baseMapper.selectCount(wrapper);
}
private LambdaQueryWrapper<WmsInstockPrint> buildQueryWrapper(WmsInstockPrintBo bo) {
private MPJLambdaWrapper<WmsInstockPrint> buildQueryWrapper(WmsInstockPrintBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsInstockPrint> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getInstockPrintId() != null, WmsInstockPrint::getInstockPrintId, bo.getInstockPrintId());
lqw.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockPrint::getInstockCode, bo.getInstockCode());
lqw.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsInstockPrint::getBatchCode, bo.getBatchCode());
lqw.eq(bo.getMaterialQty() != null, WmsInstockPrint::getMaterialQty, bo.getMaterialQty());
lqw.eq(bo.getApportionQty() != null, WmsInstockPrint::getApportionQty, bo.getApportionQty());
lqw.eq(bo.getMaterialId() != null, WmsInstockPrint::getMaterialId, bo.getMaterialId());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCode()), WmsInstockPrint::getMaterialCode, bo.getMaterialCode());
lqw.like(StringUtils.isNotBlank(bo.getMaterialName()), WmsInstockPrint::getMaterialName, bo.getMaterialName());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialSpe()), WmsInstockPrint::getMaterialSpe, bo.getMaterialSpe());
lqw.like(StringUtils.isNotBlank(bo.getUnitName()), WmsInstockPrint::getUnitName, bo.getUnitName());
lqw.eq(StringUtils.isNotBlank(bo.getCodeYesNo()), WmsInstockPrint::getCodeYesNo, bo.getCodeYesNo());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsInstockPrint::getMaterialCategories, bo.getMaterialCategories());
MPJLambdaWrapper<WmsInstockPrint> lqw = JoinWrappers.lambda(WmsInstockPrint.class)
.selectAll(WmsInstockPrint.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInstockPrint::getMaterialCategoryId)
.eq(bo.getInstockPrintId() != null, WmsInstockPrint::getInstockPrintId, bo.getInstockPrintId())
.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockPrint::getInstockCode, bo.getInstockCode())
.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsInstockPrint::getBatchCode, bo.getBatchCode())
.eq(bo.getMaterialQty() != null, WmsInstockPrint::getMaterialQty, bo.getMaterialQty())
.eq(bo.getApportionQty() != null, WmsInstockPrint::getApportionQty, bo.getApportionQty())
.eq(bo.getMaterialId() != null, WmsInstockPrint::getMaterialId, bo.getMaterialId())
.eq(StringUtils.isNotBlank(bo.getMaterialCode()), WmsInstockPrint::getMaterialCode, bo.getMaterialCode())
.like(StringUtils.isNotBlank(bo.getMaterialName()), WmsInstockPrint::getMaterialName, bo.getMaterialName())
.eq(StringUtils.isNotBlank(bo.getMaterialSpe()), WmsInstockPrint::getMaterialSpe, bo.getMaterialSpe())
.like(StringUtils.isNotBlank(bo.getUnitName()), WmsInstockPrint::getUnitName, bo.getUnitName())
.eq(StringUtils.isNotBlank(bo.getCodeYesNo()), WmsInstockPrint::getCodeYesNo, bo.getCodeYesNo())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockPrint::getMaterialCategoryId, bo.getMaterialCategoryId())
.orderByDesc(WmsInstockPrint::getCreateTime);
return lqw;
}
/**
* 新增入库单-物料打印条码
*

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockRecordServiceImpl.java
Unescape Escape View File

@ -10,6 +10,8 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.springframework.stereotype.Service;
import org.dromara.wms.domain.bo.WmsInstockRecordBo;
import org.dromara.wms.domain.vo.WmsInstockRecordVo;
@ -74,13 +76,19 @@ public class WmsInstockRecordServiceImpl implements IWmsInstockRecordService {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsInstockRecord> lqw = JoinWrappers.lambda(WmsInstockRecord.class)
.selectAll(WmsInstockRecord.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInstockRecord::getMaterialCategoryId)
.eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockRecord::getInstockCode, bo.getInstockCode())
.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsInstockRecord::getBatchCode, bo.getBatchCode())
.eq(bo.getWarehouseId() != null, WmsInstockRecord::getWarehouseId, bo.getWarehouseId())
.like(StringUtils.isNotBlank(bo.getLocationCode()), WmsInstockRecord::getLocationCode, bo.getLocationCode())
.like(StringUtils.isNotBlank(bo.getMaterialCode()), WmsInstockRecord::getMaterialCode, bo.getMaterialCode())
.like(StringUtils.isNotBlank(bo.getMaterialName()), WmsInstockRecord::getMaterialName, bo.getMaterialName())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsInstockRecord::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockRecord::getMaterialCategoryId, bo.getMaterialCategoryId())
.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
WmsInstockRecord::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime"))
.eq(StringUtils.isNotBlank(bo.getErpSynchronousStatus()), WmsInstockRecord::getErpSynchronousStatus, bo.getErpSynchronousStatus())

11
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckRecordServiceImpl.java
Unescape Escape View File

@ -10,6 +10,8 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsInventoryCheckRecord;
import org.dromara.wms.domain.bo.WmsInventoryCheckRecordBo;
import org.dromara.wms.domain.vo.WmsInventoryCheckRecordVo;
@ -74,8 +76,15 @@ public class WmsInventoryCheckRecordServiceImpl implements IWmsInventoryCheckRec
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsInventoryCheckRecord> lqw = JoinWrappers.lambda(WmsInventoryCheckRecord.class)
.selectAll(WmsInventoryCheckRecord.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInventoryCheckRecord::getMaterialCategoryId)
.eq(bo.getIcRecordId() != null, WmsInventoryCheckRecord::getIcRecordId, bo.getIcRecordId())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsInventoryCheckRecord::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInventoryCheckRecord::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(StringUtils.isNotBlank(bo.getCheckCode()), WmsInventoryCheckRecord::getCheckCode, bo.getCheckCode())
.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsInventoryCheckRecord::getBatchCode, bo.getBatchCode())
.eq(bo.getMaterialId() != null, WmsInventoryCheckRecord::getMaterialId, bo.getMaterialId())

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryCheckServiceImpl.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialCategory;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsInstockOrder;
import org.dromara.wms.domain.WmsInventoryCheck;
@ -85,9 +86,14 @@ public class WmsInventoryCheckServiceImpl implements IWmsInventoryCheckService {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsInventoryCheck> lqw = JoinWrappers.lambda(WmsInventoryCheck.class)
.selectAll(WmsInventoryCheck.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInventoryCheck::getMaterialCategoryId)
.eq(bo.getInventoryCheckId() != null, WmsInventoryCheck::getInventoryCheckId, bo.getInventoryCheckId())
.eq(StringUtils.isNotBlank(bo.getCheckCode()), WmsInventoryCheck::getCheckCode, bo.getCheckCode())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsInventoryCheck::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInventoryCheck::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(bo.getPlanWarehouseId() != null, WmsInventoryCheck::getPlanWarehouseId, bo.getPlanWarehouseId())
.eq(StringUtils.isNotBlank(bo.getCheckType()), WmsInventoryCheck::getCheckType, bo.getCheckType())
.eq(StringUtils.isNotBlank(bo.getCheckStatus()), WmsInventoryCheck::getCheckStatus, bo.getCheckStatus())
@ -108,7 +114,7 @@ public class WmsInventoryCheckServiceImpl implements IWmsInventoryCheckService {
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsInventoryCheck::getPlanWarehouseId);
lqw.eq(bo.getInventoryCheckId() != null, WmsInventoryCheck::getInventoryCheckId, bo.getInventoryCheckId())
.eq(StringUtils.isNotBlank(bo.getCheckCode()), WmsInventoryCheck::getCheckCode, bo.getCheckCode())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsInventoryCheck::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInventoryCheck::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(bo.getPlanWarehouseId() != null, WmsInventoryCheck::getPlanWarehouseId, bo.getPlanWarehouseId())
.eq(StringUtils.isNotBlank(bo.getCheckType()), WmsInventoryCheck::getCheckType, bo.getCheckType())
.eq(StringUtils.isNotBlank(bo.getCheckStatus()), WmsInventoryCheck::getCheckStatus, bo.getCheckStatus())

41
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryServiceImpl.java
Unescape Escape View File

@ -11,10 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialInfo;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsConfiguration;
import org.dromara.wms.domain.WmsInventory;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.bo.WmsConfigurationBo;
import org.dromara.wms.domain.bo.WmsInventoryBo;
import org.dromara.wms.domain.bo.WmsMoveOrderBo;
@ -74,24 +71,34 @@ public class WmsInventoryServiceImpl implements IWmsInventoryService {
*/
@Override
public List<WmsInventoryVo> queryList(WmsInventoryBo bo) {
LambdaQueryWrapper<WmsInventory> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<WmsInventory> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsInventory> buildQueryWrapper(WmsInventoryBo bo) {
private MPJLambdaWrapper<WmsInventory> buildQueryWrapper(WmsInventoryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsInventory> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getInventoryId() != null, WmsInventory::getInventoryId, bo.getInventoryId());
lqw.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsInventory::getBatchCode, bo.getBatchCode());
lqw.eq(bo.getMaterialId() != null, WmsInventory::getMaterialId, bo.getMaterialId());
lqw.eq(StringUtils.isNotBlank(bo.getLocationCode()), WmsInventory::getLocationCode, bo.getLocationCode());
lqw.eq(bo.getMaterialCategories() != null, WmsInventory::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(bo.getInventoryQty() != null, WmsInventory::getInventoryQty, bo.getInventoryQty());
lqw.eq(StringUtils.isNotBlank(bo.getLockState()), WmsInventory::getLockState, bo.getLockState());
lqw.eq(StringUtils.isNotBlank(bo.getInventoryStatus()), WmsInventory::getInventoryStatus, bo.getInventoryStatus());
lqw.eq(bo.getStoreId() != null, WmsInventory::getStoreId, bo.getStoreId());
MPJLambdaWrapper<WmsInventory> lqw = JoinWrappers.lambda(WmsInventory.class)
.selectAll(WmsInventory.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInventory::getMaterialCategoryId)
.eq(bo.getInventoryId() != null, WmsInventory::getInventoryId, bo.getInventoryId())
.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsInventory::getBatchCode, bo.getBatchCode())
.eq(bo.getMaterialId() != null, WmsInventory::getMaterialId, bo.getMaterialId())
.eq(StringUtils.isNotBlank(bo.getLocationCode()), WmsInventory::getLocationCode, bo.getLocationCode())
.eq(bo.getMaterialCategoryId() != null, WmsInventory::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(bo.getInventoryQty() != null, WmsInventory::getInventoryQty, bo.getInventoryQty())
.eq(StringUtils.isNotBlank(bo.getLockState()), WmsInventory::getLockState, bo.getLockState())
.eq(StringUtils.isNotBlank(bo.getInventoryStatus()), WmsInventory::getInventoryStatus, bo.getInventoryStatus())
.eq(bo.getStoreId() != null, WmsInventory::getStoreId, bo.getStoreId())
.orderByDesc(WmsInventory::getCreateTime);
return lqw;
}
private MPJLambdaWrapper<WmsInventory> buildJoinQueryWrapper(WmsInventoryBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsInventory> lqw = JoinWrappers.lambda(WmsInventory.class)
@ -102,7 +109,7 @@ public class WmsInventoryServiceImpl implements IWmsInventoryService {
lqw.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsInventory::getBatchCode, bo.getBatchCode());
lqw.eq(bo.getMaterialId() != null, WmsInventory::getMaterialId, bo.getMaterialId());
lqw.eq(StringUtils.isNotBlank(bo.getLocationCode()), WmsInventory::getLocationCode, bo.getLocationCode());
lqw.eq(bo.getMaterialCategories() != null, WmsInventory::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(bo.getMaterialCategoryId() != null, WmsInventory::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(bo.getInventoryQty() != null, WmsInventory::getInventoryQty, bo.getInventoryQty());
lqw.eq(StringUtils.isNotBlank(bo.getLockState()), WmsInventory::getLockState, bo.getLockState());
lqw.eq(StringUtils.isNotBlank(bo.getInventoryStatus()), WmsInventory::getInventoryStatus, bo.getInventoryStatus());

12
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java
Unescape Escape View File

@ -12,10 +12,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialInfo;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsInventory;
import org.dromara.wms.domain.WmsMoveOrder;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.bo.WmsInventoryBo;
import org.dromara.wms.domain.bo.WmsMoveOrderBo;
import org.dromara.wms.domain.vo.WmsInventoryVo;
@ -85,12 +82,17 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService {
private MPJLambdaWrapper<WmsMoveOrder> buildQueryWrapper(WmsMoveOrderBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsMoveOrder> lqw = JoinWrappers.lambda(WmsMoveOrder.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsMoveOrder::getMaterialCategoryId)
.selectAll(WmsMoveOrder.class).select(WmsBaseWarehouse::getWarehouseCode).select(BaseMaterialInfo::getMaterialCode)
.leftJoin(WmsBaseWarehouse.class,WmsBaseWarehouse::getWarehouseId,WmsMoveOrder::getWarehouseId)
.leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsMoveOrder::getMaterialId)
.eq(bo.getMoveId() != null, WmsMoveOrder::getMoveId, bo.getMoveId())
.eq(bo.getMaterialId() != null, WmsMoveOrder::getMaterialId, bo.getMaterialId())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsMoveOrder::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsMoveOrder::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(bo.getWarehouseId() != null, WmsMoveOrder::getWarehouseId, bo.getWarehouseId())
.like(bo.getPlanLocationCode() != null, WmsMoveOrder::getPlanLocationCode, bo.getPlanLocationCode())
.eq(StringUtils.isNotBlank(bo.getOrderStatus()), WmsMoveOrder::getOrderStatus, bo.getOrderStatus())

34
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java
Unescape Escape View File

@ -12,10 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialInfo;
import org.dromara.wms.domain.WmsInstockDetail;
import org.dromara.wms.domain.WmsInventory;
import org.dromara.wms.domain.WmsOutstockDetail;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.bo.BaseMaterialInfoBo;
import org.dromara.wms.domain.bo.WmsInstockDetailBo;
import org.dromara.wms.domain.bo.WmsOutstockDetailBo;
@ -81,21 +78,30 @@ public class WmsOutstockDetailServiceImpl implements IWmsOutstockDetailService {
*/
@Override
public List<WmsOutstockDetailVo> queryList(WmsOutstockDetailBo bo) {
LambdaQueryWrapper<WmsOutstockDetail> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<WmsOutstockDetail> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsOutstockDetail> buildQueryWrapper(WmsOutstockDetailBo bo) {
private MPJLambdaWrapper<WmsOutstockDetail> buildQueryWrapper(WmsOutstockDetailBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsOutstockDetail> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getOutstockDetailId() != null, WmsOutstockDetail::getOutstockDetailId, bo.getOutstockDetailId());
lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockDetail::getOutstockCode, bo.getOutstockCode());
lqw.eq(bo.getOutstockId() != null, WmsOutstockDetail::getOutstockId, bo.getOutstockId());
lqw.eq(bo.getMaterialId() != null, WmsOutstockDetail::getMaterialId, bo.getMaterialId());
lqw.eq(bo.getOutstockQty() != null, WmsOutstockDetail::getOutstockQty, bo.getOutstockQty());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsOutstockDetail::getMaterialCategories, bo.getMaterialCategories());
MPJLambdaWrapper<WmsOutstockDetail> lqw = JoinWrappers.lambda(WmsOutstockDetail.class)
.selectAll(WmsOutstockDetail.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockDetail::getMaterialCategoryId)
.eq(bo.getOutstockDetailId() != null, WmsOutstockDetail::getOutstockDetailId, bo.getOutstockDetailId())
.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockDetail::getOutstockCode, bo.getOutstockCode())
.eq(bo.getOutstockId() != null, WmsOutstockDetail::getOutstockId, bo.getOutstockId())
.eq(bo.getMaterialId() != null, WmsOutstockDetail::getMaterialId, bo.getMaterialId())
.eq(bo.getOutstockQty() != null, WmsOutstockDetail::getOutstockQty, bo.getOutstockQty())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsOutstockDetail::getMaterialCategoryId, bo.getMaterialCategoryId())
.orderByDesc(WmsOutstockDetail::getCreateTime);
return lqw;
}
private MPJLambdaWrapper<WmsOutstockDetail> buildJoinQueryWrapper(WmsOutstockDetailBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsOutstockDetail> lqw = JoinWrappers.lambda(WmsOutstockDetail.class)
@ -107,7 +113,7 @@ public class WmsOutstockDetailServiceImpl implements IWmsOutstockDetailService {
.eq(bo.getOutstockId() != null, WmsOutstockDetail::getOutstockId, bo.getOutstockId())
.eq(bo.getMaterialId() != null, WmsOutstockDetail::getMaterialId, bo.getMaterialId())
.eq(bo.getOutstockQty() != null, WmsOutstockDetail::getOutstockQty, bo.getOutstockQty())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsOutstockDetail::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsOutstockDetail::getMaterialCategoryId, bo.getMaterialCategoryId())
.orderByAsc(WmsOutstockDetail::getCreateTime);
return lqw;
}

20
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java
Unescape Escape View File

@ -11,10 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialInfo;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsOutstockDetail;
import org.dromara.wms.domain.WmsOutstockOrder;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.bo.WmsOutstockDetailBo;
import org.dromara.wms.domain.bo.WmsOutstockOrderBo;
import org.dromara.wms.domain.vo.WmsOutstockOrderVo;
@ -79,13 +76,18 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsOutstockOrder> lqw = JoinWrappers.lambda(WmsOutstockOrder.class)
.selectAll(WmsOutstockOrder.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockOrder::getMaterialCategoryId)
.select(WmsBaseWarehouse::getWarehouseCode)
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId);
lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId());
lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId());
lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockOrder::getOutstockCode, bo.getOutstockCode());
lqw.eq(StringUtils.isNotBlank(bo.getOutstockType()), WmsOutstockOrder::getOutstockType, bo.getOutstockType());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsOutstockOrder::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsOutstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(StringUtils.isNotBlank(bo.getOrderType()), WmsOutstockOrder::getOrderType, bo.getOrderType());
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), WmsOutstockOrder::getOrderNo, bo.getOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsOutstockOrder::getAuditBy, bo.getAuditBy());
@ -103,18 +105,18 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
*/
@Override
public List<WmsOutstockOrderVo> queryList(WmsOutstockOrderBo bo) {
LambdaQueryWrapper<WmsOutstockOrder> lqw = buildQueryWrapper(bo);
MPJLambdaWrapper<WmsOutstockOrder> lqw = buildJoinQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsOutstockOrder> buildQueryWrapper(WmsOutstockOrderBo bo) {
/* private LambdaQueryWrapper<WmsOutstockOrder> buildQueryWrapper(WmsOutstockOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsOutstockOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId());
lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId());
lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockOrder::getOutstockCode, bo.getOutstockCode());
lqw.eq(StringUtils.isNotBlank(bo.getOutstockType()), WmsOutstockOrder::getOutstockType, bo.getOutstockType());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsOutstockOrder::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsOutstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(StringUtils.isNotBlank(bo.getOrderType()), WmsOutstockOrder::getOrderType, bo.getOrderType());
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), WmsOutstockOrder::getOrderNo, bo.getOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsOutstockOrder::getAuditBy, bo.getAuditBy());
@ -122,7 +124,7 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsOutstockOrder::getAuditStatus, bo.getAuditStatus());
lqw.eq(StringUtils.isNotBlank(bo.getAuditComments()), WmsOutstockOrder::getAuditComments, bo.getAuditComments());
return lqw;
}
}*/
/**
* 新增出库单

11
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java
Unescape Escape View File

@ -9,8 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.wms.domain.BaseMaterialInfo;
import org.dromara.wms.domain.WmsReturnOrder;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.bo.WmsReturnOrderBo;
import org.dromara.wms.service.IWmsReturnOrderService;
import org.springframework.beans.BeanUtils;
@ -18,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.wms.domain.bo.WmsOutstockRecordBo;
import org.dromara.wms.domain.vo.WmsOutstockRecordVo;
import org.dromara.wms.domain.WmsOutstockRecord;
import org.dromara.wms.mapper.WmsOutstockRecordMapper;
import org.dromara.wms.service.IWmsOutstockRecordService;
@ -84,11 +82,16 @@ public class WmsOutstockRecordServiceImpl implements IWmsOutstockRecordService {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsOutstockRecord> lqw = JoinWrappers.lambda(WmsOutstockRecord.class)
.selectAll(WmsOutstockRecord.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockRecord::getMaterialCategoryId)
.select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName,BaseMaterialInfo::getMaterialUnit,BaseMaterialInfo::getMaterialSpec)
.leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsOutstockRecord::getMaterialId)
.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockRecord::getOutstockCode, bo.getOutstockCode())
.like(StringUtils.isNotBlank(bo.getLocationCode()), WmsOutstockRecord::getLocationCode, bo.getLocationCode())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsOutstockRecord::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsOutstockRecord::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(StringUtils.isNotBlank(bo.getErpSynchronousStatus()), WmsOutstockRecord::getErpSynchronousStatus, bo.getErpSynchronousStatus())
.orderByDesc(WmsOutstockRecord::getCreateTime);
return lqw;

11
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java
Unescape Escape View File

@ -11,8 +11,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseSupplierInfo;
import org.dromara.wms.domain.WmsInstockOrder;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.vo.WmsInstockOrderVo;
import org.dromara.wms.mapper.WmsInstockOrderMapper;
import org.dromara.wms.service.IWmsPurchaseOrderDetailService;
@ -20,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.dromara.wms.domain.bo.WmsPurchaseOrderBo;
import org.dromara.wms.domain.vo.WmsPurchaseOrderVo;
import org.dromara.wms.domain.WmsPurchaseOrder;
import org.dromara.wms.mapper.WmsPurchaseOrderMapper;
import org.dromara.wms.service.IWmsPurchaseOrderService;
@ -90,6 +88,11 @@ public class WmsPurchaseOrderServiceImpl implements IWmsPurchaseOrderService {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsPurchaseOrder> lqw = JoinWrappers.lambda(WmsPurchaseOrder.class)
.selectAll(WmsPurchaseOrder.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsPurchaseOrder::getMaterialCategoryId)
.select(BaseSupplierInfo::getSupplierCode)
.leftJoin(BaseSupplierInfo.class,BaseSupplierInfo::getSupplierId,WmsPurchaseOrder::getSupplierId)
.eq(StringUtils.isNotBlank(bo.getPoNo()), WmsPurchaseOrder::getPoNo, bo.getPoNo())
@ -98,7 +101,7 @@ public class WmsPurchaseOrderServiceImpl implements IWmsPurchaseOrderService {
.eq(bo.getSupplierId() != null, WmsPurchaseOrder::getSupplierId, bo.getSupplierId())
.eq(StringUtils.isNotBlank(bo.getPoType()), WmsPurchaseOrder::getPoType, bo.getPoType())
.eq(bo.getErpId() != null, WmsPurchaseOrder::getErpId, bo.getErpId())
.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsPurchaseOrder::getMaterialCategories, bo.getMaterialCategories())
.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsPurchaseOrder::getMaterialCategoryId, bo.getMaterialCategoryId())
.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsPurchaseOrder::getAuditBy, bo.getAuditBy())
.eq(bo.getAuditTime() != null, WmsPurchaseOrder::getAuditTime, bo.getAuditTime())
.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsPurchaseOrder::getAuditStatus, bo.getAuditStatus())

14
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsReturnOrderServiceImpl.java
Unescape Escape View File

@ -11,10 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.BaseMaterialInfo;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsOutstockRecord;
import org.dromara.wms.domain.WmsReturnOrder;
import org.dromara.wms.domain.*;
import org.dromara.wms.domain.bo.WmsOutstockRecordBo;
import org.dromara.wms.domain.bo.WmsReturnOrderBo;
import org.dromara.wms.domain.vo.WmsReturnOrderVo;
@ -80,13 +77,18 @@ public class WmsReturnOrderServiceImpl implements IWmsReturnOrderService {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsReturnOrder> lqw = JoinWrappers.lambda(WmsReturnOrder.class)
.selectAll(WmsReturnOrder.class)
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsReturnOrder::getMaterialCategoryId)
.select(BaseMaterialInfo::getMaterialCode)
.select(WmsBaseWarehouse::getWarehouseCode)
.leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsReturnOrder::getMaterialId)
.leftJoin(WmsBaseWarehouse.class,WmsBaseWarehouse::getWarehouseId,WmsReturnOrder::getWarehouseId);
lqw.eq(bo.getRoId() != null, WmsReturnOrder::getRoId, bo.getRoId());
lqw.eq(bo.getMaterialId() != null, WmsReturnOrder::getMaterialId, bo.getMaterialId());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsReturnOrder::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsReturnOrder::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsReturnOrder::getBatchCode, bo.getBatchCode());
lqw.eq(bo.getPlanAmount() != null, WmsReturnOrder::getPlanAmount, bo.getPlanAmount());
lqw.eq(bo.getWarehouseId() != null, WmsReturnOrder::getWarehouseId, bo.getWarehouseId());
@ -108,7 +110,7 @@ public class WmsReturnOrderServiceImpl implements IWmsReturnOrderService {
LambdaQueryWrapper<WmsReturnOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getRoId() != null, WmsReturnOrder::getRoId, bo.getRoId());
lqw.eq(bo.getMaterialId() != null, WmsReturnOrder::getMaterialId, bo.getMaterialId());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsReturnOrder::getMaterialCategories, bo.getMaterialCategories());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsReturnOrder::getMaterialCategoryId, bo.getMaterialCategoryId());
lqw.eq(StringUtils.isNotBlank(bo.getBatchCode()), WmsReturnOrder::getBatchCode, bo.getBatchCode());
lqw.eq(bo.getPlanAmount() != null, WmsReturnOrder::getPlanAmount, bo.getPlanAmount());
lqw.eq(bo.getWarehouseId() != null, WmsReturnOrder::getWarehouseId, bo.getWarehouseId());

7
ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/BaseMaterialCategoryMapper.xml
Unescape Escape View File

@ -0,0 +1,7 @@
<?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">
<mapper namespace="org.dromara.wms.mapper.BaseMaterialCategoryMapper">
</mapper>

2
ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml
Unescape Escape View File

@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update wms_instock_order
<trim prefix="SET" suffixOverrides=",">
<if test="instockCode != null">instock_code = #{instockCode},</if>
<if test="materialCategories != null and materialCategories != ''">material_categories = #{materialCategories},</if>
<if test="materialCategoryId != null and materialCategoryId != ''">material_categories = #{materialCategoryId},</if>
<if test="instockType != null and instockType != ''">instock_type = #{instockType},</if>
<if test="auditBy != null">audit_by = #{auditBy},</if>
<if test="auditComments != null">audit_comments = #{auditComments},</if>

4
ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml
Unescape Escape View File

@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- <if test="entity.materialId != null ">and x.material_id = #{entity.materialId}</if>-->
<if test="entity.warehouseId != null and entity.warehouseId != ''">and x.warehouse_id = #{entity.warehouseId}</if>
<if test="entity.lockState != null and entity.lockState != ''">and x.lock_state = #{entity.lockState}</if>
<if test="entity.materialCategories != null and entity.materialCategories != ''">and x.material_categories = #{entity.materialCategories}</if>
<if test="entity.materialCategoryId != null and entity.materialCategoryId != ''">and x.material_categories = #{entity.materialCategoryId}</if>
<if test="entity.inventoryStatus != null and entity.inventoryStatus != ''">and x.inventory_status = #{entity.inventoryStatus}</if>
<if test="entity.locationCode != null and entity.locationCode != ''">and x.location_code like concat('%',#{entity.locationCode},'%')</if>
<if test="entity.batchCode != null and entity.batchCode != ''">and x.batch_code like concat('%',#{entity.batchCode},'%')</if>
@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- <if test="entity.materialId != null ">and x.material_id = #{entity.materialId}</if>-->
<if test="entity.warehouseId != null and entity.warehouseId != ''">and x.warehouse_id = #{entity.warehouseId}</if>
<if test="entity.lockState != null and entity.lockState != ''">and x.lock_state = #{entity.lockState}</if>
<if test="entity.materialCategories != null and entity.materialCategories != ''">and x.material_categories = #{entity.materialCategories}</if>
<if test="entity.materialCategoryId != null and entity.materialCategoryId != ''">and x.material_categories = #{entity.materialCategoryId}</if>
<if test="entity.inventoryStatus != null and entity.inventoryStatus != ''">and x.inventory_status = #{entity.inventoryStatus}</if>
<if test="entity.locationCode != null and entity.locationCode != ''">and x.location_code like concat('%',#{entity.locationCode},'%')</if>
<if test="entity.batchCode != null and entity.batchCode != ''">and x.batch_code like concat('%',#{entity.batchCode},'%')</if>

Write Preview
Loading…
Cancel
Save