Commit c1f41793 by 宋祥

1.委外入库质检回写入库和加工,增加质检人

parent 5482fb35
package com.baosight.hggp.hg.zl.domain; package com.baosight.hggp.hg.zl.domain;
import com.baosight.iplat4j.core.data.DaoEPBase;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.util.NumberUtils; import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.util.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.baosight.iplat4j.core.util.StringUtils;
/** /**
* Project: <br> * Project: <br>
...@@ -17,12 +16,12 @@ import java.util.Map; ...@@ -17,12 +16,12 @@ import java.util.Map;
* Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br> * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
* *
* @version 1.0 * @version 1.0
* @history 2024-09-29 11:24:26 create * @history 2024-10-08 13:57:42 create
*/ */
public class HGZL011 extends DaoEPBase { public class HGZL011 extends DaoEPBase {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final String FIELD_ID = "id"; public static final String FIELD_ID = "id";
public static final String FIELD_ACCOUNT_CODE = "accountCode"; /* 企业编码*/ public static final String FIELD_ACCOUNT_CODE = "accountCode"; /* 企业编码*/
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/ public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/
...@@ -56,7 +55,10 @@ public class HGZL011 extends DaoEPBase { ...@@ -56,7 +55,10 @@ public class HGZL011 extends DaoEPBase {
public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /* 存货类型大类*/ public static final String FIELD_INVENT_TYPE_DETAIL = "inventTypeDetail"; /* 存货类型大类*/
public static final String FIELD_APPLY_CODE = "applyCode"; /* 领料单号*/ public static final String FIELD_APPLY_CODE = "applyCode"; /* 领料单号*/
public static final String FIELD_APPLY_LINE_CODE = "applyLineCode"; /* 领料单行号*/ public static final String FIELD_APPLY_LINE_CODE = "applyLineCode"; /* 领料单行号*/
public static final String FIELD_QUALITY_USER_ID = "qualityUserId"; /* 质检人ID*/
public static final String FIELD_QUALITY_USER_NAME = "qualityUserName"; /* 质检人名称*/
public static final String FIELD_QUALITY_TIME = "qualityTime"; /* 时间时间*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/ public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/ public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/
...@@ -90,13 +92,16 @@ public class HGZL011 extends DaoEPBase { ...@@ -90,13 +92,16 @@ public class HGZL011 extends DaoEPBase {
public static final String COL_INVENT_TYPE_DETAIL = "INVENT_TYPE_DETAIL"; /* 存货类型大类*/ public static final String COL_INVENT_TYPE_DETAIL = "INVENT_TYPE_DETAIL"; /* 存货类型大类*/
public static final String COL_APPLY_CODE = "APPLY_CODE"; /* 领料单号*/ public static final String COL_APPLY_CODE = "APPLY_CODE"; /* 领料单号*/
public static final String COL_APPLY_LINE_CODE = "APPLY_LINE_CODE"; /* 领料单行号*/ public static final String COL_APPLY_LINE_CODE = "APPLY_LINE_CODE"; /* 领料单行号*/
public static final String COL_QUALITY_USER_ID = "QUALITY_USER_ID"; /* 质检人ID*/
public static final String COL_QUALITY_USER_NAME = "QUALITY_USER_NAME"; /* 质检人名称*/
public static final String COL_QUALITY_TIME = "QUALITY_TIME"; /* 时间时间*/
public static final String QUERY = "HGZL011.query"; public static final String QUERY = "HGZL011.query";
public static final String COUNT = "HGZL011.count"; public static final String COUNT = "HGZL011.count";
public static final String INSERT = "HGZL011.insert"; public static final String INSERT = "HGZL011.insert";
public static final String UPDATE = "HGZL011.update"; public static final String UPDATE = "HGZL011.update";
public static final String DELETE = "HGZL011.delete"; public static final String DELETE = "HGZL011.delete";
private Long id = new Long(0); private Long id = new Long(0);
private String accountCode = " "; /* 企业编码*/ private String accountCode = " "; /* 企业编码*/
private String depCode = " "; /* 部门编码*/ private String depCode = " "; /* 部门编码*/
...@@ -130,180 +135,195 @@ public class HGZL011 extends DaoEPBase { ...@@ -130,180 +135,195 @@ public class HGZL011 extends DaoEPBase {
private Integer inventTypeDetail = new Integer(0); /* 存货类型大类*/ private Integer inventTypeDetail = new Integer(0); /* 存货类型大类*/
private String applyCode = " "; /* 领料单号*/ private String applyCode = " "; /* 领料单号*/
private String applyLineCode = " "; /* 领料单行号*/ private String applyLineCode = " "; /* 领料单行号*/
private String qualityUserId = " "; /* 质检人ID*/
private String qualityUserName = " "; /* 质检人名称*/
private String qualityTime = " "; /* 时间时间*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
public void initMetaData() { public void initMetaData() {
EiColumn eiColumn; EiColumn eiColumn;
eiColumn = new EiColumn(FIELD_ID); eiColumn = new EiColumn(FIELD_ID);
eiColumn.setPrimaryKey(true); eiColumn.setPrimaryKey(true);
eiColumn.setDescName(" "); eiColumn.setDescName(" ");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_ACCOUNT_CODE); eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
eiColumn.setDescName("企业编码"); eiColumn.setDescName("企业编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEP_CODE); eiColumn = new EiColumn(FIELD_DEP_CODE);
eiColumn.setDescName("部门编码"); eiColumn.setDescName("部门编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY); eiColumn = new EiColumn(FIELD_CREATED_BY);
eiColumn.setDescName("记录创建者"); eiColumn.setDescName("记录创建者");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_NAME); eiColumn = new EiColumn(FIELD_CREATED_NAME);
eiColumn.setDescName("记录创建名称"); eiColumn.setDescName("记录创建名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_TIME); eiColumn = new EiColumn(FIELD_CREATED_TIME);
eiColumn.setDescName("记录创建时间"); eiColumn.setDescName("记录创建时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_BY); eiColumn = new EiColumn(FIELD_UPDATED_BY);
eiColumn.setDescName("记录修改者"); eiColumn.setDescName("记录修改者");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_NAME); eiColumn = new EiColumn(FIELD_UPDATED_NAME);
eiColumn.setDescName("记录修改名称"); eiColumn.setDescName("记录修改名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_TIME); eiColumn = new EiColumn(FIELD_UPDATED_TIME);
eiColumn.setDescName("记录修改时间"); eiColumn.setDescName("记录修改时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELETE_FLAG); eiColumn = new EiColumn(FIELD_DELETE_FLAG);
eiColumn.setDescName("0-未删除,1-已删除"); eiColumn.setDescName("0-未删除,1-已删除");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS); eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态:0-质检中,1-质检完成"); eiColumn.setDescName("状态:0-质检中,1-质检完成");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_NO); eiColumn = new EiColumn(FIELD_QUALITY_NO);
eiColumn.setDescName("质检单号"); eiColumn.setDescName("质检单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_DATE); eiColumn = new EiColumn(FIELD_QUALITY_DATE);
eiColumn.setDescName("单据日期"); eiColumn.setDescName("单据日期");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_CODE); eiColumn = new EiColumn(FIELD_COMPANY_CODE);
eiColumn.setDescName("公司编码"); eiColumn.setDescName("公司编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_NAME); eiColumn = new EiColumn(FIELD_COMPANY_NAME);
eiColumn.setDescName("公司名称"); eiColumn.setDescName("公司名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_TYPE); eiColumn = new EiColumn(FIELD_INVENT_TYPE);
eiColumn.setDescName("存货类型"); eiColumn.setDescName("存货类型");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_CODE); eiColumn = new EiColumn(FIELD_INVENT_CODE);
eiColumn.setDescName("存货编码"); eiColumn.setDescName("存货编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_NAME); eiColumn = new EiColumn(FIELD_INVENT_NAME);
eiColumn.setDescName("存货名称"); eiColumn.setDescName("存货名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC_ID); eiColumn = new EiColumn(FIELD_SPEC_ID);
eiColumn.setDescName("规格ID"); eiColumn.setDescName("规格ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC); eiColumn = new EiColumn(FIELD_SPEC);
eiColumn.setDescName("规格"); eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_MATERIAL); eiColumn = new EiColumn(FIELD_MATERIAL);
eiColumn.setDescName("材质"); eiColumn.setDescName("材质");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UNIT); eiColumn = new EiColumn(FIELD_UNIT);
eiColumn.setDescName("单位"); eiColumn.setDescName("单位");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_LENGTH); eiColumn = new EiColumn(FIELD_LENGTH);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("长度"); eiColumn.setDescName("长度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_WIDTH); eiColumn = new EiColumn(FIELD_WIDTH);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("宽度"); eiColumn.setDescName("宽度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_THICK); eiColumn = new EiColumn(FIELD_THICK);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("厚度"); eiColumn.setDescName("厚度");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_APPLY_QTY); eiColumn = new EiColumn(FIELD_APPLY_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("领料数量"); eiColumn.setDescName("领料数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_APPLY_UNIT_WEIGHT); eiColumn = new EiColumn(FIELD_APPLY_UNIT_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("领料单重"); eiColumn.setDescName("领料单重");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_APPLY_WEIGHT); eiColumn = new EiColumn(FIELD_APPLY_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("领料重量"); eiColumn.setDescName("领料重量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_QTY); eiColumn = new EiColumn(FIELD_QUALITY_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("合格数量"); eiColumn.setDescName("合格数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UN_QUALITY_QTY); eiColumn = new EiColumn(FIELD_UN_QUALITY_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("不合格数量"); eiColumn.setDescName("不合格数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL); eiColumn = new EiColumn(FIELD_INVENT_TYPE_DETAIL);
eiColumn.setDescName("存货类型大类"); eiColumn.setDescName("存货类型大类");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_APPLY_CODE); eiColumn = new EiColumn(FIELD_APPLY_CODE);
eiColumn.setDescName("领料单号"); eiColumn.setDescName("领料单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_APPLY_LINE_CODE); eiColumn = new EiColumn(FIELD_APPLY_LINE_CODE);
eiColumn.setDescName("领料单行号"); eiColumn.setDescName("领料单行号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_USER_ID);
eiColumn.setDescName("质检人ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_USER_NAME);
eiColumn.setDescName("质检人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_TIME);
eiColumn.setDescName("时间时间");
eiMetadata.addMeta(eiColumn);
} }
/** /**
* the constructor. * the constructor.
*/ */
public HGZL011() { public HGZL011() {
initMetaData(); initMetaData();
} }
/** /**
* get the id . * get the id .
* @return the id * @return the id
...@@ -311,7 +331,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -311,7 +331,7 @@ public class HGZL011 extends DaoEPBase {
public Long getId() { public Long getId() {
return this.id; return this.id;
} }
/** /**
* set the id . * set the id .
* *
...@@ -327,7 +347,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -327,7 +347,7 @@ public class HGZL011 extends DaoEPBase {
public String getAccountCode() { public String getAccountCode() {
return this.accountCode; return this.accountCode;
} }
/** /**
* set the accountCode - 企业编码. * set the accountCode - 企业编码.
* *
...@@ -343,7 +363,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -343,7 +363,7 @@ public class HGZL011 extends DaoEPBase {
public String getDepCode() { public String getDepCode() {
return this.depCode; return this.depCode;
} }
/** /**
* set the depCode - 部门编码. * set the depCode - 部门编码.
* *
...@@ -359,7 +379,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -359,7 +379,7 @@ public class HGZL011 extends DaoEPBase {
public String getCreatedBy() { public String getCreatedBy() {
return this.createdBy; return this.createdBy;
} }
/** /**
* set the createdBy - 记录创建者. * set the createdBy - 记录创建者.
* *
...@@ -375,7 +395,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -375,7 +395,7 @@ public class HGZL011 extends DaoEPBase {
public String getCreatedName() { public String getCreatedName() {
return this.createdName; return this.createdName;
} }
/** /**
* set the createdName - 记录创建名称. * set the createdName - 记录创建名称.
* *
...@@ -391,7 +411,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -391,7 +411,7 @@ public class HGZL011 extends DaoEPBase {
public String getCreatedTime() { public String getCreatedTime() {
return this.createdTime; return this.createdTime;
} }
/** /**
* set the createdTime - 记录创建时间. * set the createdTime - 记录创建时间.
* *
...@@ -407,7 +427,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -407,7 +427,7 @@ public class HGZL011 extends DaoEPBase {
public String getUpdatedBy() { public String getUpdatedBy() {
return this.updatedBy; return this.updatedBy;
} }
/** /**
* set the updatedBy - 记录修改者. * set the updatedBy - 记录修改者.
* *
...@@ -423,7 +443,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -423,7 +443,7 @@ public class HGZL011 extends DaoEPBase {
public String getUpdatedName() { public String getUpdatedName() {
return this.updatedName; return this.updatedName;
} }
/** /**
* set the updatedName - 记录修改名称. * set the updatedName - 记录修改名称.
* *
...@@ -439,7 +459,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -439,7 +459,7 @@ public class HGZL011 extends DaoEPBase {
public String getUpdatedTime() { public String getUpdatedTime() {
return this.updatedTime; return this.updatedTime;
} }
/** /**
* set the updatedTime - 记录修改时间. * set the updatedTime - 记录修改时间.
* *
...@@ -455,7 +475,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -455,7 +475,7 @@ public class HGZL011 extends DaoEPBase {
public Integer getDeleteFlag() { public Integer getDeleteFlag() {
return this.deleteFlag; return this.deleteFlag;
} }
/** /**
* set the deleteFlag - 0-未删除,1-已删除. * set the deleteFlag - 0-未删除,1-已删除.
* *
...@@ -471,7 +491,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -471,7 +491,7 @@ public class HGZL011 extends DaoEPBase {
public Integer getStatus() { public Integer getStatus() {
return this.status; return this.status;
} }
/** /**
* set the status - 状态:0-质检中,1-质检完成. * set the status - 状态:0-质检中,1-质检完成.
* *
...@@ -487,7 +507,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -487,7 +507,7 @@ public class HGZL011 extends DaoEPBase {
public String getQualityNo() { public String getQualityNo() {
return this.qualityNo; return this.qualityNo;
} }
/** /**
* set the qualityNo - 质检单号. * set the qualityNo - 质检单号.
* *
...@@ -503,7 +523,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -503,7 +523,7 @@ public class HGZL011 extends DaoEPBase {
public String getQualityDate() { public String getQualityDate() {
return this.qualityDate; return this.qualityDate;
} }
/** /**
* set the qualityDate - 单据日期. * set the qualityDate - 单据日期.
* *
...@@ -519,7 +539,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -519,7 +539,7 @@ public class HGZL011 extends DaoEPBase {
public String getCompanyCode() { public String getCompanyCode() {
return this.companyCode; return this.companyCode;
} }
/** /**
* set the companyCode - 公司编码. * set the companyCode - 公司编码.
* *
...@@ -535,7 +555,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -535,7 +555,7 @@ public class HGZL011 extends DaoEPBase {
public String getCompanyName() { public String getCompanyName() {
return this.companyName; return this.companyName;
} }
/** /**
* set the companyName - 公司名称. * set the companyName - 公司名称.
* *
...@@ -551,7 +571,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -551,7 +571,7 @@ public class HGZL011 extends DaoEPBase {
public String getInventType() { public String getInventType() {
return this.inventType; return this.inventType;
} }
/** /**
* set the inventType - 存货类型. * set the inventType - 存货类型.
* *
...@@ -567,7 +587,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -567,7 +587,7 @@ public class HGZL011 extends DaoEPBase {
public String getInventCode() { public String getInventCode() {
return this.inventCode; return this.inventCode;
} }
/** /**
* set the inventCode - 存货编码. * set the inventCode - 存货编码.
* *
...@@ -583,7 +603,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -583,7 +603,7 @@ public class HGZL011 extends DaoEPBase {
public String getInventName() { public String getInventName() {
return this.inventName; return this.inventName;
} }
/** /**
* set the inventName - 存货名称. * set the inventName - 存货名称.
* *
...@@ -599,7 +619,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -599,7 +619,7 @@ public class HGZL011 extends DaoEPBase {
public Long getSpecId() { public Long getSpecId() {
return this.specId; return this.specId;
} }
/** /**
* set the specId - 规格ID. * set the specId - 规格ID.
* *
...@@ -615,7 +635,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -615,7 +635,7 @@ public class HGZL011 extends DaoEPBase {
public String getSpec() { public String getSpec() {
return this.spec; return this.spec;
} }
/** /**
* set the spec - 规格. * set the spec - 规格.
* *
...@@ -631,7 +651,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -631,7 +651,7 @@ public class HGZL011 extends DaoEPBase {
public String getMaterial() { public String getMaterial() {
return this.material; return this.material;
} }
/** /**
* set the material - 材质. * set the material - 材质.
* *
...@@ -647,7 +667,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -647,7 +667,7 @@ public class HGZL011 extends DaoEPBase {
public String getUnit() { public String getUnit() {
return this.unit; return this.unit;
} }
/** /**
* set the unit - 单位. * set the unit - 单位.
* *
...@@ -663,7 +683,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -663,7 +683,7 @@ public class HGZL011 extends DaoEPBase {
public BigDecimal getLength() { public BigDecimal getLength() {
return this.length; return this.length;
} }
/** /**
* set the length - 长度. * set the length - 长度.
* *
...@@ -679,7 +699,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -679,7 +699,7 @@ public class HGZL011 extends DaoEPBase {
public BigDecimal getWidth() { public BigDecimal getWidth() {
return this.width; return this.width;
} }
/** /**
* set the width - 宽度. * set the width - 宽度.
* *
...@@ -695,7 +715,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -695,7 +715,7 @@ public class HGZL011 extends DaoEPBase {
public BigDecimal getThick() { public BigDecimal getThick() {
return this.thick; return this.thick;
} }
/** /**
* set the thick - 厚度. * set the thick - 厚度.
* *
...@@ -711,7 +731,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -711,7 +731,7 @@ public class HGZL011 extends DaoEPBase {
public BigDecimal getApplyQty() { public BigDecimal getApplyQty() {
return this.applyQty; return this.applyQty;
} }
/** /**
* set the applyQty - 领料数量. * set the applyQty - 领料数量.
* *
...@@ -727,7 +747,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -727,7 +747,7 @@ public class HGZL011 extends DaoEPBase {
public BigDecimal getApplyUnitWeight() { public BigDecimal getApplyUnitWeight() {
return this.applyUnitWeight; return this.applyUnitWeight;
} }
/** /**
* set the applyUnitWeight - 领料单重. * set the applyUnitWeight - 领料单重.
* *
...@@ -743,7 +763,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -743,7 +763,7 @@ public class HGZL011 extends DaoEPBase {
public BigDecimal getApplyWeight() { public BigDecimal getApplyWeight() {
return this.applyWeight; return this.applyWeight;
} }
/** /**
* set the applyWeight - 领料重量. * set the applyWeight - 领料重量.
* *
...@@ -759,7 +779,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -759,7 +779,7 @@ public class HGZL011 extends DaoEPBase {
public BigDecimal getQualityQty() { public BigDecimal getQualityQty() {
return this.qualityQty; return this.qualityQty;
} }
/** /**
* set the qualityQty - 合格数量. * set the qualityQty - 合格数量.
* *
...@@ -775,7 +795,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -775,7 +795,7 @@ public class HGZL011 extends DaoEPBase {
public BigDecimal getUnQualityQty() { public BigDecimal getUnQualityQty() {
return this.unQualityQty; return this.unQualityQty;
} }
/** /**
* set the unQualityQty - 不合格数量. * set the unQualityQty - 不合格数量.
* *
...@@ -791,7 +811,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -791,7 +811,7 @@ public class HGZL011 extends DaoEPBase {
public Integer getInventTypeDetail() { public Integer getInventTypeDetail() {
return this.inventTypeDetail; return this.inventTypeDetail;
} }
/** /**
* set the inventTypeDetail - 存货类型大类. * set the inventTypeDetail - 存货类型大类.
* *
...@@ -807,7 +827,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -807,7 +827,7 @@ public class HGZL011 extends DaoEPBase {
public String getApplyCode() { public String getApplyCode() {
return this.applyCode; return this.applyCode;
} }
/** /**
* set the applyCode - 领料单号. * set the applyCode - 领料单号.
* *
...@@ -823,7 +843,7 @@ public class HGZL011 extends DaoEPBase { ...@@ -823,7 +843,7 @@ public class HGZL011 extends DaoEPBase {
public String getApplyLineCode() { public String getApplyLineCode() {
return this.applyLineCode; return this.applyLineCode;
} }
/** /**
* set the applyLineCode - 领料单行号. * set the applyLineCode - 领料单行号.
* *
...@@ -833,13 +853,61 @@ public class HGZL011 extends DaoEPBase { ...@@ -833,13 +853,61 @@ public class HGZL011 extends DaoEPBase {
this.applyLineCode = applyLineCode; this.applyLineCode = applyLineCode;
} }
/** /**
* get the qualityUserId - 质检人ID.
* @return the qualityUserId
*/
public String getQualityUserId() {
return this.qualityUserId;
}
/**
* set the qualityUserId - 质检人ID.
*
* @param qualityUserId - 质检人ID
*/
public void setQualityUserId(String qualityUserId) {
this.qualityUserId = qualityUserId;
}
/**
* get the qualityUserName - 质检人名称.
* @return the qualityUserName
*/
public String getQualityUserName() {
return this.qualityUserName;
}
/**
* set the qualityUserName - 质检人名称.
*
* @param qualityUserName - 质检人名称
*/
public void setQualityUserName(String qualityUserName) {
this.qualityUserName = qualityUserName;
}
/**
* get the qualityTime - 时间时间.
* @return the qualityTime
*/
public String getQualityTime() {
return this.qualityTime;
}
/**
* set the qualityTime - 时间时间.
*
* @param qualityTime - 时间时间
*/
public void setQualityTime(String qualityTime) {
this.qualityTime = qualityTime;
}
/**
* get the value from Map. * get the value from Map.
* *
* @param map - source data map * @param map - source data map
*/ */
@Override @Override
public void fromMap(Map map) { public void fromMap(Map map) {
setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id)); setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode)); setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode)); setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
...@@ -873,14 +941,17 @@ public class HGZL011 extends DaoEPBase { ...@@ -873,14 +941,17 @@ public class HGZL011 extends DaoEPBase {
setInventTypeDetail(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail)); setInventTypeDetail(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE_DETAIL)), inventTypeDetail));
setApplyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_APPLY_CODE)), applyCode)); setApplyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_APPLY_CODE)), applyCode));
setApplyLineCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_APPLY_LINE_CODE)), applyLineCode)); setApplyLineCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_APPLY_LINE_CODE)), applyLineCode));
setQualityUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_QUALITY_USER_ID)), qualityUserId));
setQualityUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_QUALITY_USER_NAME)), qualityUserName));
setQualityTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_QUALITY_TIME)), qualityTime));
} }
/** /**
* set the value to Map. * set the value to Map.
*/ */
@Override @Override
public Map toMap() { public Map toMap() {
Map map = new HashMap(); Map map = new HashMap();
map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID))); map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE))); map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
...@@ -915,7 +986,10 @@ public class HGZL011 extends DaoEPBase { ...@@ -915,7 +986,10 @@ public class HGZL011 extends DaoEPBase {
map.put(FIELD_INVENT_TYPE_DETAIL, StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL))); map.put(FIELD_INVENT_TYPE_DETAIL, StringUtils.toString(inventTypeDetail, eiMetadata.getMeta(FIELD_INVENT_TYPE_DETAIL)));
map.put(FIELD_APPLY_CODE, StringUtils.toString(applyCode, eiMetadata.getMeta(FIELD_APPLY_CODE))); map.put(FIELD_APPLY_CODE, StringUtils.toString(applyCode, eiMetadata.getMeta(FIELD_APPLY_CODE)));
map.put(FIELD_APPLY_LINE_CODE, StringUtils.toString(applyLineCode, eiMetadata.getMeta(FIELD_APPLY_LINE_CODE))); map.put(FIELD_APPLY_LINE_CODE, StringUtils.toString(applyLineCode, eiMetadata.getMeta(FIELD_APPLY_LINE_CODE)));
map.put(FIELD_QUALITY_USER_ID, StringUtils.toString(qualityUserId, eiMetadata.getMeta(FIELD_QUALITY_USER_ID)));
map.put(FIELD_QUALITY_USER_NAME, StringUtils.toString(qualityUserName, eiMetadata.getMeta(FIELD_QUALITY_USER_NAME)));
map.put(FIELD_QUALITY_TIME, StringUtils.toString(qualityTime, eiMetadata.getMeta(FIELD_QUALITY_TIME)));
return map; return map;
} }
} }
package com.baosight.hggp.hg.zl.domain; package com.baosight.hggp.hg.zl.domain;
import com.baosight.iplat4j.core.data.DaoEPBase;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.util.NumberUtils; import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.util.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.baosight.iplat4j.core.util.StringUtils;
/** /**
* Project: <br> * Project: <br>
...@@ -17,12 +16,12 @@ import java.util.Map; ...@@ -17,12 +16,12 @@ import java.util.Map;
* Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br> * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
* *
* @version 1.0 * @version 1.0
* @history 2024-09-30 11:01:14 create * @history 2024-10-08 13:57:45 create
*/ */
public class HGZL012 extends DaoEPBase { public class HGZL012 extends DaoEPBase {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final String FIELD_ID = "id"; public static final String FIELD_ID = "id";
public static final String FIELD_ACCOUNT_CODE = "accountCode"; /* 企业编码*/ public static final String FIELD_ACCOUNT_CODE = "accountCode"; /* 企业编码*/
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/ public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/
...@@ -51,7 +50,10 @@ public class HGZL012 extends DaoEPBase { ...@@ -51,7 +50,10 @@ public class HGZL012 extends DaoEPBase {
public static final String FIELD_UN_QUALITY_QTY = "unQualityQty"; /* 不合格数量*/ public static final String FIELD_UN_QUALITY_QTY = "unQualityQty"; /* 不合格数量*/
public static final String FIELD_DEPOSIT_CODE = "depositCode"; /* 委外入库单号*/ public static final String FIELD_DEPOSIT_CODE = "depositCode"; /* 委外入库单号*/
public static final String FIELD_DEPOSIT_LINE_CODE = "depositLineCode"; /* 委外入库行号*/ public static final String FIELD_DEPOSIT_LINE_CODE = "depositLineCode"; /* 委外入库行号*/
public static final String FIELD_QUALITY_USER_ID = "qualityUserId"; /* 质检人ID*/
public static final String FIELD_QUALITY_USER_NAME = "qualityUserName"; /* 质检人名称*/
public static final String FIELD_QUALITY_TIME = "qualityTime"; /* 时间时间*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/ public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/ public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/
...@@ -80,13 +82,16 @@ public class HGZL012 extends DaoEPBase { ...@@ -80,13 +82,16 @@ public class HGZL012 extends DaoEPBase {
public static final String COL_UN_QUALITY_QTY = "UN_QUALITY_QTY"; /* 不合格数量*/ public static final String COL_UN_QUALITY_QTY = "UN_QUALITY_QTY"; /* 不合格数量*/
public static final String COL_DEPOSIT_CODE = "DEPOSIT_CODE"; /* 委外入库单号*/ public static final String COL_DEPOSIT_CODE = "DEPOSIT_CODE"; /* 委外入库单号*/
public static final String COL_DEPOSIT_LINE_CODE = "DEPOSIT_LINE_CODE"; /* 委外入库行号*/ public static final String COL_DEPOSIT_LINE_CODE = "DEPOSIT_LINE_CODE"; /* 委外入库行号*/
public static final String COL_QUALITY_USER_ID = "QUALITY_USER_ID"; /* 质检人ID*/
public static final String COL_QUALITY_USER_NAME = "QUALITY_USER_NAME"; /* 质检人名称*/
public static final String COL_QUALITY_TIME = "QUALITY_TIME"; /* 时间时间*/
public static final String QUERY = "HGZL012.query"; public static final String QUERY = "HGZL012.query";
public static final String COUNT = "HGZL012.count"; public static final String COUNT = "HGZL012.count";
public static final String INSERT = "HGZL012.insert"; public static final String INSERT = "HGZL012.insert";
public static final String UPDATE = "HGZL012.update"; public static final String UPDATE = "HGZL012.update";
public static final String DELETE = "HGZL012.delete"; public static final String DELETE = "HGZL012.delete";
private Long id = new Long(0); private Long id = new Long(0);
private String accountCode = " "; /* 企业编码*/ private String accountCode = " "; /* 企业编码*/
private String depCode = " "; /* 部门编码*/ private String depCode = " "; /* 部门编码*/
...@@ -115,151 +120,166 @@ public class HGZL012 extends DaoEPBase { ...@@ -115,151 +120,166 @@ public class HGZL012 extends DaoEPBase {
private BigDecimal unQualityQty = new BigDecimal(0.000); /* 不合格数量*/ private BigDecimal unQualityQty = new BigDecimal(0.000); /* 不合格数量*/
private String depositCode = " "; /* 委外入库单号*/ private String depositCode = " "; /* 委外入库单号*/
private Long depositLineCode = new Long(0); /* 委外入库行号*/ private Long depositLineCode = new Long(0); /* 委外入库行号*/
private String qualityUserId = " "; /* 质检人ID*/
private String qualityUserName = " "; /* 质检人名称*/
private String qualityTime = " "; /* 时间时间*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
public void initMetaData() { public void initMetaData() {
EiColumn eiColumn; EiColumn eiColumn;
eiColumn = new EiColumn(FIELD_ID); eiColumn = new EiColumn(FIELD_ID);
eiColumn.setPrimaryKey(true); eiColumn.setPrimaryKey(true);
eiColumn.setDescName(" "); eiColumn.setDescName(" ");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_ACCOUNT_CODE); eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
eiColumn.setDescName("企业编码"); eiColumn.setDescName("企业编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEP_CODE); eiColumn = new EiColumn(FIELD_DEP_CODE);
eiColumn.setDescName("部门编码"); eiColumn.setDescName("部门编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY); eiColumn = new EiColumn(FIELD_CREATED_BY);
eiColumn.setDescName("记录创建者"); eiColumn.setDescName("记录创建者");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_NAME); eiColumn = new EiColumn(FIELD_CREATED_NAME);
eiColumn.setDescName("记录创建名称"); eiColumn.setDescName("记录创建名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_TIME); eiColumn = new EiColumn(FIELD_CREATED_TIME);
eiColumn.setDescName("记录创建时间"); eiColumn.setDescName("记录创建时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_BY); eiColumn = new EiColumn(FIELD_UPDATED_BY);
eiColumn.setDescName("记录修改者"); eiColumn.setDescName("记录修改者");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_NAME); eiColumn = new EiColumn(FIELD_UPDATED_NAME);
eiColumn.setDescName("记录修改名称"); eiColumn.setDescName("记录修改名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_TIME); eiColumn = new EiColumn(FIELD_UPDATED_TIME);
eiColumn.setDescName("记录修改时间"); eiColumn.setDescName("记录修改时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELETE_FLAG); eiColumn = new EiColumn(FIELD_DELETE_FLAG);
eiColumn.setDescName("0-未删除,1-已删除"); eiColumn.setDescName("0-未删除,1-已删除");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS); eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态:0-质检中,1-质检完成"); eiColumn.setDescName("状态:0-质检中,1-质检完成");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_NO); eiColumn = new EiColumn(FIELD_QUALITY_NO);
eiColumn.setDescName("质检单号"); eiColumn.setDescName("质检单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_DATE); eiColumn = new EiColumn(FIELD_QUALITY_DATE);
eiColumn.setDescName("单据日期"); eiColumn.setDescName("单据日期");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_CODE); eiColumn = new EiColumn(FIELD_COMPANY_CODE);
eiColumn.setDescName("公司编码"); eiColumn.setDescName("公司编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_NAME); eiColumn = new EiColumn(FIELD_COMPANY_NAME);
eiColumn.setDescName("公司名称"); eiColumn.setDescName("公司名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_TYPE); eiColumn = new EiColumn(FIELD_INVENT_TYPE);
eiColumn.setDescName("存货类型"); eiColumn.setDescName("存货类型");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_CODE); eiColumn = new EiColumn(FIELD_INVENT_CODE);
eiColumn.setDescName("存货编码"); eiColumn.setDescName("存货编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INVENT_NAME); eiColumn = new EiColumn(FIELD_INVENT_NAME);
eiColumn.setDescName("存货名称"); eiColumn.setDescName("存货名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC_ID); eiColumn = new EiColumn(FIELD_SPEC_ID);
eiColumn.setDescName("规格ID"); eiColumn.setDescName("规格ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SPEC); eiColumn = new EiColumn(FIELD_SPEC);
eiColumn.setDescName("规格"); eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UNIT); eiColumn = new EiColumn(FIELD_UNIT);
eiColumn.setDescName("单位"); eiColumn.setDescName("单位");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_APPLY_QTY); eiColumn = new EiColumn(FIELD_APPLY_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("入库数量"); eiColumn.setDescName("入库数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_APPLY_UNIT_WEIGHT); eiColumn = new EiColumn(FIELD_APPLY_UNIT_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("入库单重"); eiColumn.setDescName("入库单重");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_APPLY_WEIGHT); eiColumn = new EiColumn(FIELD_APPLY_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("入库重量"); eiColumn.setDescName("入库重量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_QTY); eiColumn = new EiColumn(FIELD_QUALITY_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("合格数量"); eiColumn.setDescName("合格数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UN_QUALITY_QTY); eiColumn = new EiColumn(FIELD_UN_QUALITY_QTY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("不合格数量"); eiColumn.setDescName("不合格数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEPOSIT_CODE); eiColumn = new EiColumn(FIELD_DEPOSIT_CODE);
eiColumn.setDescName("委外入库单号"); eiColumn.setDescName("委外入库单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEPOSIT_LINE_CODE); eiColumn = new EiColumn(FIELD_DEPOSIT_LINE_CODE);
eiColumn.setDescName("委外入库行号"); eiColumn.setDescName("委外入库行号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_USER_ID);
eiColumn.setDescName("质检人ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_USER_NAME);
eiColumn.setDescName("质检人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_QUALITY_TIME);
eiColumn.setDescName("时间时间");
eiMetadata.addMeta(eiColumn);
} }
/** /**
* the constructor. * the constructor.
*/ */
public HGZL012() { public HGZL012() {
initMetaData(); initMetaData();
} }
/** /**
* get the id . * get the id .
* @return the id * @return the id
...@@ -267,7 +287,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -267,7 +287,7 @@ public class HGZL012 extends DaoEPBase {
public Long getId() { public Long getId() {
return this.id; return this.id;
} }
/** /**
* set the id . * set the id .
* *
...@@ -283,7 +303,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -283,7 +303,7 @@ public class HGZL012 extends DaoEPBase {
public String getAccountCode() { public String getAccountCode() {
return this.accountCode; return this.accountCode;
} }
/** /**
* set the accountCode - 企业编码. * set the accountCode - 企业编码.
* *
...@@ -299,7 +319,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -299,7 +319,7 @@ public class HGZL012 extends DaoEPBase {
public String getDepCode() { public String getDepCode() {
return this.depCode; return this.depCode;
} }
/** /**
* set the depCode - 部门编码. * set the depCode - 部门编码.
* *
...@@ -315,7 +335,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -315,7 +335,7 @@ public class HGZL012 extends DaoEPBase {
public String getCreatedBy() { public String getCreatedBy() {
return this.createdBy; return this.createdBy;
} }
/** /**
* set the createdBy - 记录创建者. * set the createdBy - 记录创建者.
* *
...@@ -331,7 +351,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -331,7 +351,7 @@ public class HGZL012 extends DaoEPBase {
public String getCreatedName() { public String getCreatedName() {
return this.createdName; return this.createdName;
} }
/** /**
* set the createdName - 记录创建名称. * set the createdName - 记录创建名称.
* *
...@@ -347,7 +367,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -347,7 +367,7 @@ public class HGZL012 extends DaoEPBase {
public String getCreatedTime() { public String getCreatedTime() {
return this.createdTime; return this.createdTime;
} }
/** /**
* set the createdTime - 记录创建时间. * set the createdTime - 记录创建时间.
* *
...@@ -363,7 +383,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -363,7 +383,7 @@ public class HGZL012 extends DaoEPBase {
public String getUpdatedBy() { public String getUpdatedBy() {
return this.updatedBy; return this.updatedBy;
} }
/** /**
* set the updatedBy - 记录修改者. * set the updatedBy - 记录修改者.
* *
...@@ -379,7 +399,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -379,7 +399,7 @@ public class HGZL012 extends DaoEPBase {
public String getUpdatedName() { public String getUpdatedName() {
return this.updatedName; return this.updatedName;
} }
/** /**
* set the updatedName - 记录修改名称. * set the updatedName - 记录修改名称.
* *
...@@ -395,7 +415,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -395,7 +415,7 @@ public class HGZL012 extends DaoEPBase {
public String getUpdatedTime() { public String getUpdatedTime() {
return this.updatedTime; return this.updatedTime;
} }
/** /**
* set the updatedTime - 记录修改时间. * set the updatedTime - 记录修改时间.
* *
...@@ -411,7 +431,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -411,7 +431,7 @@ public class HGZL012 extends DaoEPBase {
public Integer getDeleteFlag() { public Integer getDeleteFlag() {
return this.deleteFlag; return this.deleteFlag;
} }
/** /**
* set the deleteFlag - 0-未删除,1-已删除. * set the deleteFlag - 0-未删除,1-已删除.
* *
...@@ -427,7 +447,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -427,7 +447,7 @@ public class HGZL012 extends DaoEPBase {
public Integer getStatus() { public Integer getStatus() {
return this.status; return this.status;
} }
/** /**
* set the status - 状态:0-质检中,1-质检完成. * set the status - 状态:0-质检中,1-质检完成.
* *
...@@ -443,7 +463,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -443,7 +463,7 @@ public class HGZL012 extends DaoEPBase {
public String getQualityNo() { public String getQualityNo() {
return this.qualityNo; return this.qualityNo;
} }
/** /**
* set the qualityNo - 质检单号. * set the qualityNo - 质检单号.
* *
...@@ -459,7 +479,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -459,7 +479,7 @@ public class HGZL012 extends DaoEPBase {
public String getQualityDate() { public String getQualityDate() {
return this.qualityDate; return this.qualityDate;
} }
/** /**
* set the qualityDate - 单据日期. * set the qualityDate - 单据日期.
* *
...@@ -475,7 +495,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -475,7 +495,7 @@ public class HGZL012 extends DaoEPBase {
public String getCompanyCode() { public String getCompanyCode() {
return this.companyCode; return this.companyCode;
} }
/** /**
* set the companyCode - 公司编码. * set the companyCode - 公司编码.
* *
...@@ -491,7 +511,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -491,7 +511,7 @@ public class HGZL012 extends DaoEPBase {
public String getCompanyName() { public String getCompanyName() {
return this.companyName; return this.companyName;
} }
/** /**
* set the companyName - 公司名称. * set the companyName - 公司名称.
* *
...@@ -507,7 +527,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -507,7 +527,7 @@ public class HGZL012 extends DaoEPBase {
public String getInventType() { public String getInventType() {
return this.inventType; return this.inventType;
} }
/** /**
* set the inventType - 存货类型. * set the inventType - 存货类型.
* *
...@@ -523,7 +543,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -523,7 +543,7 @@ public class HGZL012 extends DaoEPBase {
public String getInventCode() { public String getInventCode() {
return this.inventCode; return this.inventCode;
} }
/** /**
* set the inventCode - 存货编码. * set the inventCode - 存货编码.
* *
...@@ -539,7 +559,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -539,7 +559,7 @@ public class HGZL012 extends DaoEPBase {
public String getInventName() { public String getInventName() {
return this.inventName; return this.inventName;
} }
/** /**
* set the inventName - 存货名称. * set the inventName - 存货名称.
* *
...@@ -555,7 +575,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -555,7 +575,7 @@ public class HGZL012 extends DaoEPBase {
public Long getSpecId() { public Long getSpecId() {
return this.specId; return this.specId;
} }
/** /**
* set the specId - 规格ID. * set the specId - 规格ID.
* *
...@@ -571,7 +591,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -571,7 +591,7 @@ public class HGZL012 extends DaoEPBase {
public String getSpec() { public String getSpec() {
return this.spec; return this.spec;
} }
/** /**
* set the spec - 规格. * set the spec - 规格.
* *
...@@ -587,7 +607,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -587,7 +607,7 @@ public class HGZL012 extends DaoEPBase {
public String getUnit() { public String getUnit() {
return this.unit; return this.unit;
} }
/** /**
* set the unit - 单位. * set the unit - 单位.
* *
...@@ -603,7 +623,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -603,7 +623,7 @@ public class HGZL012 extends DaoEPBase {
public BigDecimal getApplyQty() { public BigDecimal getApplyQty() {
return this.applyQty; return this.applyQty;
} }
/** /**
* set the applyQty - 入库数量. * set the applyQty - 入库数量.
* *
...@@ -619,7 +639,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -619,7 +639,7 @@ public class HGZL012 extends DaoEPBase {
public BigDecimal getApplyUnitWeight() { public BigDecimal getApplyUnitWeight() {
return this.applyUnitWeight; return this.applyUnitWeight;
} }
/** /**
* set the applyUnitWeight - 入库单重. * set the applyUnitWeight - 入库单重.
* *
...@@ -635,7 +655,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -635,7 +655,7 @@ public class HGZL012 extends DaoEPBase {
public BigDecimal getApplyWeight() { public BigDecimal getApplyWeight() {
return this.applyWeight; return this.applyWeight;
} }
/** /**
* set the applyWeight - 入库重量. * set the applyWeight - 入库重量.
* *
...@@ -651,7 +671,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -651,7 +671,7 @@ public class HGZL012 extends DaoEPBase {
public BigDecimal getQualityQty() { public BigDecimal getQualityQty() {
return this.qualityQty; return this.qualityQty;
} }
/** /**
* set the qualityQty - 合格数量. * set the qualityQty - 合格数量.
* *
...@@ -667,7 +687,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -667,7 +687,7 @@ public class HGZL012 extends DaoEPBase {
public BigDecimal getUnQualityQty() { public BigDecimal getUnQualityQty() {
return this.unQualityQty; return this.unQualityQty;
} }
/** /**
* set the unQualityQty - 不合格数量. * set the unQualityQty - 不合格数量.
* *
...@@ -683,7 +703,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -683,7 +703,7 @@ public class HGZL012 extends DaoEPBase {
public String getDepositCode() { public String getDepositCode() {
return this.depositCode; return this.depositCode;
} }
/** /**
* set the depositCode - 委外入库单号. * set the depositCode - 委外入库单号.
* *
...@@ -699,7 +719,7 @@ public class HGZL012 extends DaoEPBase { ...@@ -699,7 +719,7 @@ public class HGZL012 extends DaoEPBase {
public Long getDepositLineCode() { public Long getDepositLineCode() {
return this.depositLineCode; return this.depositLineCode;
} }
/** /**
* set the depositLineCode - 委外入库行号. * set the depositLineCode - 委外入库行号.
* *
...@@ -709,13 +729,61 @@ public class HGZL012 extends DaoEPBase { ...@@ -709,13 +729,61 @@ public class HGZL012 extends DaoEPBase {
this.depositLineCode = depositLineCode; this.depositLineCode = depositLineCode;
} }
/** /**
* get the qualityUserId - 质检人ID.
* @return the qualityUserId
*/
public String getQualityUserId() {
return this.qualityUserId;
}
/**
* set the qualityUserId - 质检人ID.
*
* @param qualityUserId - 质检人ID
*/
public void setQualityUserId(String qualityUserId) {
this.qualityUserId = qualityUserId;
}
/**
* get the qualityUserName - 质检人名称.
* @return the qualityUserName
*/
public String getQualityUserName() {
return this.qualityUserName;
}
/**
* set the qualityUserName - 质检人名称.
*
* @param qualityUserName - 质检人名称
*/
public void setQualityUserName(String qualityUserName) {
this.qualityUserName = qualityUserName;
}
/**
* get the qualityTime - 时间时间.
* @return the qualityTime
*/
public String getQualityTime() {
return this.qualityTime;
}
/**
* set the qualityTime - 时间时间.
*
* @param qualityTime - 时间时间
*/
public void setQualityTime(String qualityTime) {
this.qualityTime = qualityTime;
}
/**
* get the value from Map. * get the value from Map.
* *
* @param map - source data map * @param map - source data map
*/ */
@Override @Override
public void fromMap(Map map) { public void fromMap(Map map) {
setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id)); setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode)); setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode)); setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
...@@ -744,14 +812,17 @@ public class HGZL012 extends DaoEPBase { ...@@ -744,14 +812,17 @@ public class HGZL012 extends DaoEPBase {
setUnQualityQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UN_QUALITY_QTY)), unQualityQty)); setUnQualityQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UN_QUALITY_QTY)), unQualityQty));
setDepositCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_CODE)), depositCode)); setDepositCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_CODE)), depositCode));
setDepositLineCode(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_DEPOSIT_LINE_CODE)), depositLineCode)); setDepositLineCode(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_DEPOSIT_LINE_CODE)), depositLineCode));
setQualityUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_QUALITY_USER_ID)), qualityUserId));
setQualityUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_QUALITY_USER_NAME)), qualityUserName));
setQualityTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_QUALITY_TIME)), qualityTime));
} }
/** /**
* set the value to Map. * set the value to Map.
*/ */
@Override @Override
public Map toMap() { public Map toMap() {
Map map = new HashMap(); Map map = new HashMap();
map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID))); map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE))); map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
...@@ -781,7 +852,10 @@ public class HGZL012 extends DaoEPBase { ...@@ -781,7 +852,10 @@ public class HGZL012 extends DaoEPBase {
map.put(FIELD_UN_QUALITY_QTY, StringUtils.toString(unQualityQty, eiMetadata.getMeta(FIELD_UN_QUALITY_QTY))); map.put(FIELD_UN_QUALITY_QTY, StringUtils.toString(unQualityQty, eiMetadata.getMeta(FIELD_UN_QUALITY_QTY)));
map.put(FIELD_DEPOSIT_CODE, StringUtils.toString(depositCode, eiMetadata.getMeta(FIELD_DEPOSIT_CODE))); map.put(FIELD_DEPOSIT_CODE, StringUtils.toString(depositCode, eiMetadata.getMeta(FIELD_DEPOSIT_CODE)));
map.put(FIELD_DEPOSIT_LINE_CODE, StringUtils.toString(depositLineCode, eiMetadata.getMeta(FIELD_DEPOSIT_LINE_CODE))); map.put(FIELD_DEPOSIT_LINE_CODE, StringUtils.toString(depositLineCode, eiMetadata.getMeta(FIELD_DEPOSIT_LINE_CODE)));
map.put(FIELD_QUALITY_USER_ID, StringUtils.toString(qualityUserId, eiMetadata.getMeta(FIELD_QUALITY_USER_ID)));
map.put(FIELD_QUALITY_USER_NAME, StringUtils.toString(qualityUserName, eiMetadata.getMeta(FIELD_QUALITY_USER_NAME)));
map.put(FIELD_QUALITY_TIME, StringUtils.toString(qualityTime, eiMetadata.getMeta(FIELD_QUALITY_TIME)));
return map; return map;
} }
} }
...@@ -13,9 +13,8 @@ import com.baosight.hggp.hg.kc.tools.HGKCTools; ...@@ -13,9 +13,8 @@ import com.baosight.hggp.hg.kc.tools.HGKCTools;
import com.baosight.hggp.hg.kc.utils.HGKCUtils; import com.baosight.hggp.hg.kc.utils.HGKCUtils;
import com.baosight.hggp.hg.xs.domain.Company; import com.baosight.hggp.hg.xs.domain.Company;
import com.baosight.hggp.hg.zl.constant.HgZlConst; import com.baosight.hggp.hg.zl.constant.HgZlConst;
import com.baosight.hggp.hg.zl.constant.HgZlSqlConst;
import com.baosight.hggp.hg.zl.domain.HGZL001;
import com.baosight.hggp.hg.zl.domain.HGZL011; import com.baosight.hggp.hg.zl.domain.HGZL011;
import com.baosight.hggp.hg.zl.tools.HGZLTools;
import com.baosight.hggp.hg.zl.utils.HGZLUtils; import com.baosight.hggp.hg.zl.utils.HGZLUtils;
import com.baosight.hggp.util.AssertUtils; import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.BeanUtils; import com.baosight.hggp.util.BeanUtils;
...@@ -226,11 +225,7 @@ public class ServiceHGZL011 extends ServiceBase { ...@@ -226,11 +225,7 @@ public class ServiceHGZL011 extends ServiceBase {
for (HGZL011 fZl011 : fZl011s) { for (HGZL011 fZl011 : fZl011s) {
String qualityNo = fZl011.getQualityNo(); String qualityNo = fZl011.getQualityNo();
// 更新质检单状态 // 更新质检单状态
HGZL011 dbZl011 = dbZl011Map.get(qualityNo); HGZLTools.HgZl011.process(qualityNo, fZl011.getQualityQty(), fZl011.getUnQualityQty());
dbZl011.setQualityQty(fZl011.getQualityQty());
dbZl011.setUnQualityQty(fZl011.getUnQualityQty());
dbZl011.setStatus(HgZlConst.HgZl011.Status.S1);
DaoUtils.update(HgZlSqlConst.HgZl011.PROCESS, dbZl011.toMap());
// 更新领料单明细状态 // 更新领料单明细状态
this.updateApplyDetail(fZl011, dbKc008AMap); this.updateApplyDetail(fZl011, dbKc008AMap);
} }
......
...@@ -13,8 +13,8 @@ import com.baosight.hggp.hg.kc.utils.HGKCUtils; ...@@ -13,8 +13,8 @@ import com.baosight.hggp.hg.kc.utils.HGKCUtils;
import com.baosight.hggp.hg.sc.tools.HGSCTools; import com.baosight.hggp.hg.sc.tools.HGSCTools;
import com.baosight.hggp.hg.xs.domain.Company; import com.baosight.hggp.hg.xs.domain.Company;
import com.baosight.hggp.hg.zl.constant.HgZlConst; import com.baosight.hggp.hg.zl.constant.HgZlConst;
import com.baosight.hggp.hg.zl.constant.HgZlSqlConst;
import com.baosight.hggp.hg.zl.domain.HGZL012; import com.baosight.hggp.hg.zl.domain.HGZL012;
import com.baosight.hggp.hg.zl.tools.HGZLTools;
import com.baosight.hggp.hg.zl.utils.HGZLUtils; import com.baosight.hggp.hg.zl.utils.HGZLUtils;
import com.baosight.hggp.util.AssertUtils; import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.CommonMethod; import com.baosight.hggp.util.CommonMethod;
...@@ -223,11 +223,7 @@ public class ServiceHGZL012 extends ServiceBase { ...@@ -223,11 +223,7 @@ public class ServiceHGZL012 extends ServiceBase {
for (HGZL012 fZl012 : fZl012s) { for (HGZL012 fZl012 : fZl012s) {
String qualityNo = fZl012.getQualityNo(); String qualityNo = fZl012.getQualityNo();
// 更新质检单状态 // 更新质检单状态
HGZL012 dbZl012 = dbZl012Map.get(qualityNo); HGZLTools.HgZl012.process(qualityNo, fZl012.getQualityQty(), fZl012.getUnQualityQty());
dbZl012.setQualityQty(fZl012.getQualityQty());
dbZl012.setUnQualityQty(fZl012.getUnQualityQty());
dbZl012.setStatus(HgZlConst.HgZl012.Status.S1);
DaoUtils.update(HgZlSqlConst.HgZl012.PROCESS, dbZl012.toMap());
// 更新领料单明细状态 // 更新领料单明细状态
this.updateApplyDetail(fZl012, dbKc014AMap); this.updateApplyDetail(fZl012, dbKc014AMap);
} }
......
...@@ -35,7 +35,10 @@ ...@@ -35,7 +35,10 @@
UN_QUALITY_QTY as "unQualityQty", <!-- 不合格数量 --> UN_QUALITY_QTY as "unQualityQty", <!-- 不合格数量 -->
INVENT_TYPE_DETAIL as "inventTypeDetail", <!-- 存货类型大类 --> INVENT_TYPE_DETAIL as "inventTypeDetail", <!-- 存货类型大类 -->
APPLY_CODE as "applyCode", <!-- 领料单号 --> APPLY_CODE as "applyCode", <!-- 领料单号 -->
APPLY_LINE_CODE as "applyLineCode" <!-- 领料单行号 --> APPLY_LINE_CODE as "applyLineCode", <!-- 领料单行号 -->
QUALITY_USER_ID as "qualityUserId", <!-- 质检人ID -->
QUALITY_USER_NAME as "qualityUserName", <!-- 质检人名称 -->
QUALITY_TIME as "qualityTime" <!-- 时间时间 -->
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -227,6 +230,9 @@ ...@@ -227,6 +230,9 @@
STATUS = #status#, STATUS = #status#,
QUALITY_QTY = #qualityQty#, <!-- 合格数量 --> QUALITY_QTY = #qualityQty#, <!-- 合格数量 -->
UN_QUALITY_QTY = #unQualityQty#, <!-- 不合格数量 --> UN_QUALITY_QTY = #unQualityQty#, <!-- 不合格数量 -->
QUALITY_USER_ID = #qualityUserId#, <!-- 质检人ID -->
QUALITY_USER_NAME = #qualityUserName#, <!-- 质检人名称 -->
QUALITY_TIME = #qualityTime#, <!-- 时间时间 -->
<include refid="SqlBase.updateRevise"/> <include refid="SqlBase.updateRevise"/>
WHERE QUALITY_NO = #qualityNo# WHERE QUALITY_NO = #qualityNo#
</update> </update>
......
...@@ -30,7 +30,10 @@ ...@@ -30,7 +30,10 @@
QUALITY_QTY as "qualityQty", <!-- 合格数量 --> QUALITY_QTY as "qualityQty", <!-- 合格数量 -->
UN_QUALITY_QTY as "unQualityQty", <!-- 不合格数量 --> UN_QUALITY_QTY as "unQualityQty", <!-- 不合格数量 -->
DEPOSIT_CODE as "depositCode", <!-- 委外入库单号 --> DEPOSIT_CODE as "depositCode", <!-- 委外入库单号 -->
DEPOSIT_LINE_CODE as "depositLineCode" <!-- 委外入库行号 --> DEPOSIT_LINE_CODE as "depositLineCode", <!-- 委外入库行号 -->
QUALITY_USER_ID as "qualityUserId", <!-- 质检人ID -->
QUALITY_USER_NAME as "qualityUserName", <!-- 质检人名称 -->
QUALITY_TIME as "qualityTime" <!-- 时间时间 -->
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -226,6 +229,9 @@ ...@@ -226,6 +229,9 @@
STATUS = #status#, STATUS = #status#,
QUALITY_QTY = #qualityQty#, <!-- 合格数量 --> QUALITY_QTY = #qualityQty#, <!-- 合格数量 -->
UN_QUALITY_QTY = #unQualityQty#, <!-- 不合格数量 --> UN_QUALITY_QTY = #unQualityQty#, <!-- 不合格数量 -->
QUALITY_USER_ID = #qualityUserId#, <!-- 质检人ID -->
QUALITY_USER_NAME = #qualityUserName#, <!-- 质检人名称 -->
QUALITY_TIME = #qualityTime#, <!-- 时间时间 -->
<include refid="SqlBase.updateRevise"/> <include refid="SqlBase.updateRevise"/>
WHERE QUALITY_NO = #qualityNo# WHERE QUALITY_NO = #qualityNo#
</update> </update>
......
...@@ -5,14 +5,23 @@ import com.baosight.hggp.common.CheckTypeEnum; ...@@ -5,14 +5,23 @@ import com.baosight.hggp.common.CheckTypeEnum;
import com.baosight.hggp.common.HandleStatusEnum; import com.baosight.hggp.common.HandleStatusEnum;
import com.baosight.hggp.core.dao.DaoBase; import com.baosight.hggp.core.dao.DaoBase;
import com.baosight.hggp.core.dao.DaoUtils; import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.core.security.UserSessionUtils;
import com.baosight.hggp.hg.constant.HGConstant; import com.baosight.hggp.hg.constant.HGConstant;
import com.baosight.hggp.hg.constant.HGSqlConstant; import com.baosight.hggp.hg.constant.HGSqlConstant;
import com.baosight.hggp.hg.sc.domain.HGSC007; import com.baosight.hggp.hg.sc.domain.HGSC007;
import com.baosight.hggp.hg.sc.domain.HGSC008; import com.baosight.hggp.hg.sc.domain.HGSC008;
import com.baosight.hggp.hg.sc.tools.HGSCTools; import com.baosight.hggp.hg.sc.tools.HGSCTools;
import com.baosight.hggp.hg.zl.constant.HgZlConst;
import com.baosight.hggp.hg.zl.constant.HgZlSqlConst; import com.baosight.hggp.hg.zl.constant.HgZlSqlConst;
import com.baosight.hggp.hg.zl.domain.*; import com.baosight.hggp.hg.zl.domain.HGZL001;
import com.baosight.hggp.hg.zl.domain.HGZL002;
import com.baosight.hggp.hg.zl.domain.HGZL003;
import com.baosight.hggp.hg.zl.domain.HGZL004;
import com.baosight.hggp.hg.zl.domain.HGZL004A;
import com.baosight.hggp.hg.zl.domain.HGZL011;
import com.baosight.hggp.hg.zl.domain.HGZL012;
import com.baosight.hggp.util.AssertUtils; import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.ed.util.SequenceGenerator; import com.baosight.iplat4j.ed.util.SequenceGenerator;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -382,6 +391,25 @@ public class HGZLTools { ...@@ -382,6 +391,25 @@ public class HGZLTools {
return results.stream().collect(Collectors.toMap(HGZL011::getQualityNo, item -> item)); return results.stream().collect(Collectors.toMap(HGZL011::getQualityNo, item -> item));
} }
/**
* 处理
*
* @param qualityNo
* @param qualityQty
* @param unQualityQty
*/
public static void process(String qualityNo, BigDecimal qualityQty, BigDecimal unQualityQty) {
Map paramMap = new HashMap();
paramMap.put(HGZL011.FIELD_QUALITY_NO, qualityNo);
paramMap.put(HGZL011.FIELD_QUALITY_QTY, qualityQty);
paramMap.put(HGZL011.FIELD_UN_QUALITY_QTY, unQualityQty);
paramMap.put(HGZL011.FIELD_STATUS, HgZlConst.HgZl011.Status.S1);
paramMap.put(HGZL011.FIELD_QUALITY_USER_ID, UserSessionUtils.getLoginName());
paramMap.put(HGZL011.FIELD_QUALITY_USER_NAME, UserSessionUtils.getLoginCName());
paramMap.put(HGZL011.FIELD_QUALITY_TIME, DateUtils.shortDateTime());
DaoUtils.update(HgZlSqlConst.HgZl011.PROCESS, paramMap);
}
} }
/** /**
...@@ -455,6 +483,25 @@ public class HGZLTools { ...@@ -455,6 +483,25 @@ public class HGZLTools {
return results.stream().collect(Collectors.toMap(HGZL012::getQualityNo, item -> item)); return results.stream().collect(Collectors.toMap(HGZL012::getQualityNo, item -> item));
} }
/**
* 处理
*
* @param qualityNo
* @param qualityQty
* @param unQualityQty
*/
public static void process(String qualityNo, BigDecimal qualityQty, BigDecimal unQualityQty) {
Map paramMap = new HashMap();
paramMap.put(HGZL012.FIELD_QUALITY_NO, qualityNo);
paramMap.put(HGZL012.FIELD_QUALITY_QTY, qualityQty);
paramMap.put(HGZL012.FIELD_UN_QUALITY_QTY, unQualityQty);
paramMap.put(HGZL012.FIELD_STATUS, HgZlConst.HgZl011.Status.S1);
paramMap.put(HGZL012.FIELD_QUALITY_USER_ID, UserSessionUtils.getLoginName());
paramMap.put(HGZL012.FIELD_QUALITY_USER_NAME, UserSessionUtils.getLoginCName());
paramMap.put(HGZL012.FIELD_QUALITY_TIME, DateUtils.shortDateTime());
DaoUtils.update(HgZlSqlConst.HgZl012.PROCESS, paramMap);
}
} }
} }
...@@ -54,10 +54,14 @@ ...@@ -54,10 +54,14 @@
<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="specId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/> <EF:EFColumn ename="specId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/>
<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/> <EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
<EF:EFColumn ename="qualityQty" cname="合格数量" width="120" align="right" format="{0:N3}" required="true"/> <EF:EFColumn ename="qualityQty" cname="合格数量" width="120" align="right" format="{0:N3}" required="true"/>
<EF:EFColumn ename="unQualityQty" cname="不合格数量" width="120" align="right" format="{0:N3}" required="true"/> <EF:EFColumn ename="unQualityQty" cname="不合格数量" width="120" align="right" format="{0:N3}" required="true"/>
<EF:EFColumn ename="applyQty" cname="领料数量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="applyQty" cname="领料数量" enable="false" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="applyWeight" cname="领料重量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="applyWeight" cname="领料重量" enable="false" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="qualityUserName" cname="质检人" enable="false" width="130" align="center"/>
<EF:EFColumn ename="qualityTime" cname="质检时间" enable="false" width="150" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']" dateFormat="yyyy-MM-dd HH:mm:ss"/>
<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/> <EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
......
...@@ -49,10 +49,14 @@ ...@@ -49,10 +49,14 @@
<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="specId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/> <EF:EFColumn ename="specId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/>
<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/> <EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
<EF:EFColumn ename="qualityQty" cname="合格数量" width="120" align="right" format="{0:N3}" required="true"/> <EF:EFColumn ename="qualityQty" cname="合格数量" width="120" align="right" format="{0:N3}" required="true"/>
<EF:EFColumn ename="unQualityQty" cname="不合格数量" width="120" align="right" format="{0:N3}" required="true"/> <EF:EFColumn ename="unQualityQty" cname="不合格数量" width="120" align="right" format="{0:N3}" required="true"/>
<EF:EFColumn ename="applyQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="applyQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="applyWeight" cname="入库重量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="applyWeight" cname="入库重量" enable="false" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="qualityUserName" cname="质检人" enable="false" width="130" align="center"/>
<EF:EFColumn ename="qualityTime" cname="质检时间" enable="false" width="150" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']" dateFormat="yyyy-MM-dd HH:mm:ss"/>
<EF:EFColumn ename="depositCode" cname="入库单号" enable="false" width="130" align="center"/> <EF:EFColumn ename="depositCode" cname="入库单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="depositLineCode" cname="入库单行ID" enable="false" width="130" align="center"/> <EF:EFColumn ename="depositLineCode" cname="入库单行ID" enable="false" width="130" align="center"/>
<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="150" align="center"/> <EF:EFColumn ename="createdName" cname="创建人" enable="false" width="150" align="center"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment