kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor(入库计划): 实体修改

Browse Source
This commit is contained in:
LJW 2024-11-08 14:41:14 +08:00
parent 9b88927224
commit 17e93ace05
2 changed files with 178 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
View File

@ -753,7 +753,7 @@ public class BaseKnifeController extends BaseController
// 入库任务 // 入库任务
MdItem mdItem = mdItemService.selectMdItemById(zdTask.getmProductId()); MdItem mdItem = mdItemService.selectMdItemById(zdTask.getmProductId());
WmsInTask wmsInTask = new WmsInTask(); WmsInTask wmsInTask = new WmsInTask();
wmsInTask.setPlanInId(wmsInPlan.getPlanId()); wmsInTask.setPlanInId(wmsInPlan.getPlanId().toString());
wmsInTask.setPlanInCode(generateTaskCode(wmsInPlan.getPlanCode())); wmsInTask.setPlanInCode(generateTaskCode(wmsInPlan.getPlanCode()));
wmsInTask.setMaterialCode(mdItem.getItemCode()); wmsInTask.setMaterialCode(mdItem.getItemCode());
wmsInTask.setTaskInQuantity(zdTask.getProductIdQty()); wmsInTask.setTaskInQuantity(zdTask.getProductIdQty());

268
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInPlan.java
View File

@ -1,6 +1,7 @@
package com.ktg.mes.wm.domain; package com.ktg.mes.wm.domain;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ktg.common.annotation.Excel; import com.ktg.common.annotation.Excel;
@ -12,319 +13,340 @@ import com.ktg.common.core.domain.BaseEntity;
* @author yinjinlu * @author yinjinlu
* @date 2024-10-31 * @date 2024-10-31
*/ */
public class WmsInPlan extends BaseEntity public class WmsInPlan extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键 */ /**
private String planId; * 主键
*/
private Long planId;
/** 状态[00-新建 20-执行中 40-关闭 45-手工关闭] */ /**
* 状态[00-新建 20-执行中 40-关闭 45-手工关闭]
*/
@Excel(name = "状态[00-新建 20-执行中 40-关闭 45-手工关闭]") @Excel(name = "状态[00-新建 20-执行中 40-关闭 45-手工关闭]")
private String state; private String state;
/** 来源类型[10-接口 20-手工 30-导入] */ /**
* 来源类型[10-接口 20-手工 30-导入]
*/
@Excel(name = "来源类型[10-接口 20-手工 30-导入]") @Excel(name = "来源类型[10-接口 20-手工 30-导入]")
private String sourceType; private String sourceType;
/** 仓库ID */ /**
* 仓库ID
*/
@Excel(name = "仓库ID") @Excel(name = "仓库ID")
private String wareId; private String wareId;
/** 库位编码 */ /**
* 库位编码
*/
@Excel(name = "库位编码") @Excel(name = "库位编码")
private String cellCode; private String cellCode;
/** 工单号 */ /**
* 工单号
*/
@Excel(name = "工单号") @Excel(name = "工单号")
private String workOrderCode; private String workOrderCode;
/** 计划日期 */ /**
* 计划日期
*/
@Excel(name = "计划日期") @Excel(name = "计划日期")
private String expectDate; private String expectDate;
/** 发布人 */ /**
* 发布人
*/
@Excel(name = "发布人") @Excel(name = "发布人")
private String publishName; private String publishName;
/** 发布时间 */ /**
* 发布时间
*/
@Excel(name = "发布时间") @Excel(name = "发布时间")
private String publishTime; private String publishTime;
/** 关闭人(暂不可用) */ /**
* 关闭人(暂不可用)
*/
@Excel(name = "关闭人(暂不可用)") @Excel(name = "关闭人(暂不可用)")
private String closerId; private String closerId;
/** 关闭日期(暂不可用) */ /**
* 关闭日期(暂不可用)
*/
@Excel(name = "关闭日期(暂不可用)") @Excel(name = "关闭日期(暂不可用)")
private String closeTime; private String closeTime;
/** 关联单据号 */ /**
* 关联单据号
*/
@Excel(name = "关联单据号") @Excel(name = "关联单据号")
private String relBillCode; private String relBillCode;
/** 客户ID. */ /**
* 客户ID.
*/
@Excel(name = "客户ID.") @Excel(name = "客户ID.")
private String customerId; private String customerId;
/** 采购单号. */ /**
* 采购单号.
*/
@Excel(name = "采购单号.") @Excel(name = "采购单号.")
private String poCode; private String poCode;
/** 部门ID. */ /**
* 部门ID.
*/
@Excel(name = "部门ID.") @Excel(name = "部门ID.")
private String departmentId; private String departmentId;
/** 合同号. */ /**
* 合同号.
*/
@Excel(name = "合同号.") @Excel(name = "合同号.")
private String contractNo; private String contractNo;
/** 供应商ID. */ /**
* 供应商ID.
*/
@Excel(name = "供应商ID.") @Excel(name = "供应商ID.")
private String supplierId; private String supplierId;
/** 业务类型id. */ /**
* 业务类型id.
*/
@Excel(name = "业务类型id.") @Excel(name = "业务类型id.")
private String businessTypeId; private String businessTypeId;
/** 来源出库任务. */ /**
* 来源出库任务.
*/
@Excel(name = "来源出库任务.") @Excel(name = "来源出库任务.")
private String srcOutTaskId; private String srcOutTaskId;
/** 激活标识(0激活1冻结) */ /**
* 激活标识(0激活1冻结)
*/
@Excel(name = "激活标识(0激活1冻结)") @Excel(name = "激活标识(0激活1冻结)")
private String isActive; private String isActive;
/** 删除标识(0未删除1删除) */ /**
* 删除标识(0未删除1删除)
*/
@Excel(name = "删除标识(0未删除1删除)") @Excel(name = "删除标识(0未删除1删除)")
private String isDelete; private String isDelete;
/** 计划编码 */ /**
* 计划编码
*/
@Excel(name = "计划编码") @Excel(name = "计划编码")
private String planCode; private String planCode;
/** 入库类型 */ /**
* 入库类型
*/
@Excel(name = "入库类型") @Excel(name = "入库类型")
private String planTypeId; private String planTypeId;
/** 入库计划明细信息 */ /**
* 入库计划明细信息
*/
private List<WmsInPlanDetails> wmsInPlanDetailsList; private List<WmsInPlanDetails> wmsInPlanDetailsList;
public void setPlanId(String planId) public void setPlanId(Long planId) {
{
this.planId = planId; this.planId = planId;
} }
public String getPlanId() public Long getPlanId() {
{
return planId; return planId;
} }
public void setState(String state)
{ public void setState(String state) {
this.state = state; this.state = state;
} }
public String getState() public String getState() {
{
return state; return state;
} }
public void setSourceType(String sourceType)
{ public void setSourceType(String sourceType) {
this.sourceType = sourceType; this.sourceType = sourceType;
} }
public String getSourceType() public String getSourceType() {
{
return sourceType; return sourceType;
} }
public void setWareId(String wareId)
{ public void setWareId(String wareId) {
this.wareId = wareId; this.wareId = wareId;
} }
public String getWareId() public String getWareId() {
{
return wareId; return wareId;
} }
public void setCellCode(String cellCode)
{ public void setCellCode(String cellCode) {
this.cellCode = cellCode; this.cellCode = cellCode;
} }
public String getCellCode() public String getCellCode() {
{
return cellCode; return cellCode;
} }
public void setWorkOrderCode(String workOrderCode)
{ public void setWorkOrderCode(String workOrderCode) {
this.workOrderCode = workOrderCode; this.workOrderCode = workOrderCode;
} }
public String getWorkOrderCode() public String getWorkOrderCode() {
{
return workOrderCode; return workOrderCode;
} }
public void setExpectDate(String expectDate)
{ public void setExpectDate(String expectDate) {
this.expectDate = expectDate; this.expectDate = expectDate;
} }
public String getExpectDate() public String getExpectDate() {
{
return expectDate; return expectDate;
} }
public void setPublishName(String publishName)
{ public void setPublishName(String publishName) {
this.publishName = publishName; this.publishName = publishName;
} }
public String getPublishName() public String getPublishName() {
{
return publishName; return publishName;
} }
public void setPublishTime(String publishTime)
{ public void setPublishTime(String publishTime) {
this.publishTime = publishTime; this.publishTime = publishTime;
} }
public String getPublishTime() public String getPublishTime() {
{
return publishTime; return publishTime;
} }
public void setCloserId(String closerId)
{ public void setCloserId(String closerId) {
this.closerId = closerId; this.closerId = closerId;
} }
public String getCloserId() public String getCloserId() {
{
return closerId; return closerId;
} }
public void setCloseTime(String closeTime)
{ public void setCloseTime(String closeTime) {
this.closeTime = closeTime; this.closeTime = closeTime;
} }
public String getCloseTime() public String getCloseTime() {
{
return closeTime; return closeTime;
} }
public void setRelBillCode(String relBillCode)
{ public void setRelBillCode(String relBillCode) {
this.relBillCode = relBillCode; this.relBillCode = relBillCode;
} }
public String getRelBillCode() public String getRelBillCode() {
{
return relBillCode; return relBillCode;
} }
public void setCustomerId(String customerId)
{ public void setCustomerId(String customerId) {
this.customerId = customerId; this.customerId = customerId;
} }
public String getCustomerId() public String getCustomerId() {
{
return customerId; return customerId;
} }
public void setPoCode(String poCode)
{ public void setPoCode(String poCode) {
this.poCode = poCode; this.poCode = poCode;
} }
public String getPoCode() public String getPoCode() {
{
return poCode; return poCode;
} }
public void setDepartmentId(String departmentId)
{ public void setDepartmentId(String departmentId) {
this.departmentId = departmentId; this.departmentId = departmentId;
} }
public String getDepartmentId() public String getDepartmentId() {
{
return departmentId; return departmentId;
} }
public void setContractNo(String contractNo)
{ public void setContractNo(String contractNo) {
this.contractNo = contractNo; this.contractNo = contractNo;
} }
public String getContractNo() public String getContractNo() {
{
return contractNo; return contractNo;
} }
public void setSupplierId(String supplierId)
{ public void setSupplierId(String supplierId) {
this.supplierId = supplierId; this.supplierId = supplierId;
} }
public String getSupplierId() public String getSupplierId() {
{
return supplierId; return supplierId;
} }
public void setBusinessTypeId(String businessTypeId)
{ public void setBusinessTypeId(String businessTypeId) {
this.businessTypeId = businessTypeId; this.businessTypeId = businessTypeId;
} }
public String getBusinessTypeId() public String getBusinessTypeId() {
{
return businessTypeId; return businessTypeId;
} }
public void setSrcOutTaskId(String srcOutTaskId)
{ public void setSrcOutTaskId(String srcOutTaskId) {
this.srcOutTaskId = srcOutTaskId; this.srcOutTaskId = srcOutTaskId;
} }
public String getSrcOutTaskId() public String getSrcOutTaskId() {
{
return srcOutTaskId; return srcOutTaskId;
} }
public void setIsActive(String isActive)
{ public void setIsActive(String isActive) {
this.isActive = isActive; this.isActive = isActive;
} }
public String getIsActive() public String getIsActive() {
{
return isActive; return isActive;
} }
public void setIsDelete(String isDelete)
{ public void setIsDelete(String isDelete) {
this.isDelete = isDelete; this.isDelete = isDelete;
} }
public String getIsDelete() public String getIsDelete() {
{
return isDelete; return isDelete;
} }
public void setPlanCode(String planCode)
{ public void setPlanCode(String planCode) {
this.planCode = planCode; this.planCode = planCode;
} }
public String getPlanCode() public String getPlanCode() {
{
return planCode; return planCode;
} }
public void setPlanTypeId(String planTypeId)
{ public void setPlanTypeId(String planTypeId) {
this.planTypeId = planTypeId; this.planTypeId = planTypeId;
} }
public String getPlanTypeId() public String getPlanTypeId() {
{
return planTypeId; return planTypeId;
} }
public List<WmsInPlanDetails> getWmsInPlanDetailsList() public List<WmsInPlanDetails> getWmsInPlanDetailsList() {
{
return wmsInPlanDetailsList; return wmsInPlanDetailsList;
} }
public void setWmsInPlanDetailsList(List<WmsInPlanDetails> wmsInPlanDetailsList) public void setWmsInPlanDetailsList(List<WmsInPlanDetails> wmsInPlanDetailsList) {
{
this.wmsInPlanDetailsList = wmsInPlanDetailsList; this.wmsInPlanDetailsList = wmsInPlanDetailsList;
} }