Skip to content

H
hg-smart
Commit 682fc1de by 江和松
Options

修改生产入库代码，以及退回、提交操作逻辑

parent 935a54d9
Showing with 64 additions and 291 deletions
src/main/java/com/baosight/hggp/hg/kc/domain/HGKC003.java
...@@ -50,24 +50,17 @@ public class HGKC003 extends DaoEPBase { ...@@ -50,24 +50,17 @@ public class HGKC003 extends DaoEPBase {
public static final String FIELD_PROD_TASK_NO = "prodTaskNo"; /* 生产任务号*/ public static final String FIELD_PROD_TASK_NO = "prodTaskNo"; /* 生产任务号*/
public static final String FIELD_PROJ_CODE = "projCode"; /* 项目编码*/ public static final String FIELD_PROJ_CODE = "projCode"; /* 项目编码*/
public static final String FIELD_PROJ_NAME = "projName"; /* 项目名称*/ public static final String FIELD_PROJ_NAME = "projName"; /* 项目名称*/
public static final String FIELD_PRDT_TYPE = "prdtType"; /* 产品类型*/ public static final String FIELD_PART_TYPE = "partType"; /* 物料类型*/
public static final String FIELD_PRDT_CODE = "prdtCode"; /* 产品编码*/ public static final String FIELD_PART_CODE = "partCode"; /* 物料编码*/
public static final String FIELD_PRDT_NAME = "prdtName"; /* 产品名称*/ public static final String FIELD_PART_NAME = "partName"; /* 物料名称*/
public static final String FIELD_PRDT_LENGTH = "prdtLength"; /* 产品-长*/ public static final String FIELD_PART_LENGTH = "partLength"; /* 物料-长*/
public static final String FIELD_PRDT_WIDTH = "prdtWidth"; /* 产品-宽*/ public static final String FIELD_PART_WIDTH = "partWidth"; /* 物料-宽*/
public static final String FIELD_PRDT_THICK = "prdtThick"; /* 产品-厚*/ public static final String FIELD_PART_THICK = "partThick"; /* 物料-厚*/
public static final String FIELD_PRDT_SPEC = "prdtSpec"; /* 产品规格*/ public static final String FIELD_PART_SPEC = "partSpec"; /* 物料规格*/
public static final String FIELD_PART_TYPE = "partType"; /* 零件类型*/
public static final String FIELD_PART_CODE = "partCode"; /* 零件编码*/
public static final String FIELD_PART_NAME = "partName"; /* 零件名称*/
public static final String FIELD_PART_LENGTH = "partLength"; /* 零件-长*/
public static final String FIELD_PART_WIDTH = "partWidth"; /* 零件-宽*/
public static final String FIELD_PART_THICK = "partThick"; /* 零件-厚*/
public static final String FIELD_PART_SPEC = "partSpec"; /* 零件规格*/
public static final String FIELD_SUBMIT_STATUS = "submitStatus"; /* 提交状态 0未提交，1已提交*/ public static final String FIELD_SUBMIT_STATUS = "submitStatus"; /* 提交状态 0未提交，1已提交*/
public static final String FIELD_PART_SPEC_ID = "partSpecId"; /* 零件规格ID*/ public static final String FIELD_PART_SPEC_ID = "partSpecId"; /* 物料规格ID*/
public static final String FIELD_RECTIFICATION_ID = "rectificationId"; /* 整改通知单ID*/ public static final String FIELD_RECTIFICATION_ID = "rectificationId"; /* 整改通知单ID*/
public static final String FIELD_PART_COEFFICIENT = "partCoefficient"; /* 零件系数*/ public static final String FIELD_PART_COEFFICIENT = "partCoefficient"; /* 物料系数*/
public static final String FIELD_PRICE = "price"; /* 单价*/ public static final String FIELD_PRICE = "price"; /* 单价*/
public static final String FIELD_AMOUNT = "amount"; /* 金额*/ public static final String FIELD_AMOUNT = "amount"; /* 金额*/
public static final String FIELD_STORAGE_TYPE = "storageType"; /* 入库类型：1：入库 2：退回*/ public static final String FIELD_STORAGE_TYPE = "storageType"; /* 入库类型：1：入库 2：退回*/
...@@ -108,17 +101,17 @@ public class HGKC003 extends DaoEPBase { ...@@ -108,17 +101,17 @@ public class HGKC003 extends DaoEPBase {
public static final String COL_PRDT_WIDTH = "PRDT_WIDTH"; /* 产品-宽*/ public static final String COL_PRDT_WIDTH = "PRDT_WIDTH"; /* 产品-宽*/
public static final String COL_PRDT_THICK = "PRDT_THICK"; /* 产品-厚*/ public static final String COL_PRDT_THICK = "PRDT_THICK"; /* 产品-厚*/
public static final String COL_PRDT_SPEC = "PRDT_SPEC"; /* 产品规格*/ public static final String COL_PRDT_SPEC = "PRDT_SPEC"; /* 产品规格*/
public static final String COL_PART_TYPE = "PART_TYPE"; /* 零件类型*/ public static final String COL_PART_TYPE = "PART_TYPE"; /* 物料类型*/
public static final String COL_PART_CODE = "PART_CODE"; /* 零件编码*/ public static final String COL_PART_CODE = "PART_CODE"; /* 物料编码*/
public static final String COL_PART_NAME = "PART_NAME"; /* 零件名称*/ public static final String COL_PART_NAME = "PART_NAME"; /* 物料名称*/
public static final String COL_PART_LENGTH = "PART_LENGTH"; /* 零件-长*/ public static final String COL_PART_LENGTH = "PART_LENGTH"; /* 物料-长*/
public static final String COL_PART_WIDTH = "PART_WIDTH"; /* 零件-宽*/ public static final String COL_PART_WIDTH = "PART_WIDTH"; /* 物料-宽*/
public static final String COL_PART_THICK = "PART_THICK"; /* 零件-厚*/ public static final String COL_PART_THICK = "PART_THICK"; /* 物料-厚*/
public static final String COL_PART_SPEC = "PART_SPEC"; /* 零件规格*/ public static final String COL_PART_SPEC = "PART_SPEC"; /* 物料规格*/
public static final String COL_SUBMIT_STATUS = "SUBMIT_STATUS"; /* 提交状态 0未提交，1已提交*/ public static final String COL_SUBMIT_STATUS = "SUBMIT_STATUS"; /* 提交状态 0未提交，1已提交*/
public static final String COL_PART_SPEC_ID = "PART_SPEC_ID"; /* 零件规格ID*/ public static final String COL_PART_SPEC_ID = "PART_SPEC_ID"; /* 物料规格ID*/
public static final String COL_RECTIFICATION_ID = "RECTIFICATION_ID"; /* 整改通知单ID*/ public static final String COL_RECTIFICATION_ID = "RECTIFICATION_ID"; /* 整改通知单ID*/
public static final String COL_PART_COEFFICIENT = "PART_COEFFICIENT"; /* 零件系数*/ public static final String COL_PART_COEFFICIENT = "PART_COEFFICIENT"; /* 物料系数*/
public static final String COL_PRICE = "PRICE"; /* 单价*/ public static final String COL_PRICE = "PRICE"; /* 单价*/
public static final String COL_AMOUNT = "AMOUNT"; /* 金额*/ public static final String COL_AMOUNT = "AMOUNT"; /* 金额*/
public static final String COL_STORAGE_TYPE = "STORAGE_TYPE"; /* 入库类型：1：入库 2：退回*/ public static final String COL_STORAGE_TYPE = "STORAGE_TYPE"; /* 入库类型：1：入库 2：退回*/
...@@ -160,29 +153,22 @@ public class HGKC003 extends DaoEPBase { ...@@ -160,29 +153,22 @@ public class HGKC003 extends DaoEPBase {
private String prodTaskNo = " "; /* 生产任务号*/ private String prodTaskNo = " "; /* 生产任务号*/
private String projCode = " "; /* 项目编码*/ private String projCode = " "; /* 项目编码*/
private String projName = " "; /* 项目名称*/ private String projName = " "; /* 项目名称*/
private String prdtType; /* 产品类型*/ private String partType; /* 物料类型*/
private String prdtCode = " "; /* 产品编码*/ private String partCode = " "; /* 物料编码*/
private String prdtName = " "; /* 产品名称*/ private String partName = " "; /* 物料名称*/
private BigDecimal prdtLength = new BigDecimal(0.000); /* 产品-长*/ private BigDecimal partLength = new BigDecimal(0.000); /* 物料-长*/
private BigDecimal prdtWidth = new BigDecimal(0.000); /* 产品-宽*/ private BigDecimal partWidth = new BigDecimal(0.000); /* 物料-宽*/
private BigDecimal prdtThick = new BigDecimal(0.000); /* 产品-厚*/ private BigDecimal partThick = new BigDecimal(0.000); /* 物料-厚*/
private String prdtSpec = " "; /* 产品规格*/ private String partSpec = " "; /* 物料规格*/
private String partType; /* 零件类型*/
private String partCode = " "; /* 零件编码*/
private String partName = " "; /* 零件名称*/
private BigDecimal partLength = new BigDecimal(0.000); /* 零件-长*/
private BigDecimal partWidth = new BigDecimal(0.000); /* 零件-宽*/
private BigDecimal partThick = new BigDecimal(0.000); /* 零件-厚*/
private String partSpec = " "; /* 零件规格*/
private Integer submitStatus; /* 提交状态 0未提交，1已提交*/ private Integer submitStatus; /* 提交状态 0未提交，1已提交*/
private Long partSpecId = new Long(0); /* 规格id*/ private Long partSpecId = new Long(0); /* 规格id*/
private Long rectificationId = new Long(0); /* 整改通知单id*/ private Long rectificationId = new Long(0); /* 整改通知单id*/
private BigDecimal partCoefficient = new BigDecimal(0.000); /* 零件-系数*/ private BigDecimal partCoefficient = new BigDecimal(0.000); /* 物料-系数*/
private BigDecimal price = new BigDecimal("0"); /* 单价*/ private BigDecimal price = new BigDecimal("0"); /* 单价*/
private BigDecimal amount = new BigDecimal("0"); /* 金额*/ private BigDecimal amount = new BigDecimal("0"); /* 金额*/
private Integer storageType; /* 入库类型：1：入库 2：退回*/ private Integer storageType; /* 入库类型：1：入库 2：退回*/
private Integer isReturn; /* 是否退回：0：否 1：是*/ private Integer isReturn; /* 是否退回：0：否 1：是*/
private Integer inventTypeDetail; /*存货类型明细 1：构建 2：零件*/ private Integer inventTypeDetail; /*存货类型明细 1：构建 2：物料*/
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -308,78 +294,41 @@ public class HGKC003 extends DaoEPBase { ...@@ -308,78 +294,41 @@ public class HGKC003 extends DaoEPBase {
eiColumn.setDescName("项目名称"); eiColumn.setDescName("项目名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRDT_TYPE);
eiColumn.setDescName("产品类型");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRDT_CODE);
eiColumn.setDescName("产品编码");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRDT_NAME);
eiColumn.setDescName("产品名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRDT_LENGTH);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("产品-长");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRDT_WIDTH);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("产品-宽");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRDT_THICK);
eiColumn.setType("N");
eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12);
eiColumn.setDescName("产品-厚");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRDT_SPEC);
eiColumn.setDescName("产品规格");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PART_TYPE); eiColumn = new EiColumn(FIELD_PART_TYPE);
eiColumn.setDescName("零件类型"); eiColumn.setDescName("物料类型");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PART_CODE); eiColumn = new EiColumn(FIELD_PART_CODE);
eiColumn.setDescName("零件编码"); eiColumn.setDescName("物料编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PART_NAME); eiColumn = new EiColumn(FIELD_PART_NAME);
eiColumn.setDescName("零件名称"); eiColumn.setDescName("物料名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PART_LENGTH); eiColumn = new EiColumn(FIELD_PART_LENGTH);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12); eiColumn.setFieldLength(12);
eiColumn.setDescName("零件-长"); eiColumn.setDescName("物料-长");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PART_WIDTH); eiColumn = new EiColumn(FIELD_PART_WIDTH);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12); eiColumn.setFieldLength(12);
eiColumn.setDescName("零件-宽"); eiColumn.setDescName("物料-宽");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PART_THICK); eiColumn = new EiColumn(FIELD_PART_THICK);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12); eiColumn.setFieldLength(12);
eiColumn.setDescName("零件-厚"); eiColumn.setDescName("物料-厚");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PART_SPEC); eiColumn = new EiColumn(FIELD_PART_SPEC);
eiColumn.setDescName("零件规格"); eiColumn.setDescName("物料规格");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_SUBMIT_STATUS); eiColumn = new EiColumn(FIELD_SUBMIT_STATUS);
...@@ -387,7 +336,7 @@ public class HGKC003 extends DaoEPBase { ...@@ -387,7 +336,7 @@ public class HGKC003 extends DaoEPBase {
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PART_SPEC_ID); eiColumn = new EiColumn(FIELD_PART_SPEC_ID);
eiColumn.setDescName("零件规格ID"); eiColumn.setDescName("物料规格ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_RECTIFICATION_ID); eiColumn = new EiColumn(FIELD_RECTIFICATION_ID);
...@@ -398,7 +347,7 @@ public class HGKC003 extends DaoEPBase { ...@@ -398,7 +347,7 @@ public class HGKC003 extends DaoEPBase {
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(3); eiColumn.setScaleLength(3);
eiColumn.setFieldLength(12); eiColumn.setFieldLength(12);
eiColumn.setDescName("零件-系数"); eiColumn.setDescName("物料-系数");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PRICE); eiColumn = new EiColumn(FIELD_PRICE);
...@@ -852,119 +801,7 @@ public class HGKC003 extends DaoEPBase { ...@@ -852,119 +801,7 @@ public class HGKC003 extends DaoEPBase {
this.projName = projName; this.projName = projName;
} }
/** /**
* get the prdtType - 产品类型. * get the partType - 物料类型.
* @return the prdtType
*/
public String getPrdtType() {
return this.prdtType;
}
/**
* set the prdtType - 产品类型.
*
* @param prdtType - 产品类型
*/
public void setPrdtType(String prdtType) {
this.prdtType = prdtType;
}
/**
* get the prdtCode - 产品编码.
* @return the prdtCode
*/
public String getPrdtCode() {
return this.prdtCode;
}
/**
* set the prdtCode - 产品编码.
*
* @param prdtCode - 产品编码
*/
public void setPrdtCode(String prdtCode) {
this.prdtCode = prdtCode;
}
/**
* get the prdtName - 产品名称.
* @return the prdtName
*/
public String getPrdtName() {
return this.prdtName;
}
/**
* set the prdtName - 产品名称.
*
* @param prdtName - 产品名称
*/
public void setPrdtName(String prdtName) {
this.prdtName = prdtName;
}
/**
* get the prdtLength - 产品-长.
* @return the prdtLength
*/
public BigDecimal getPrdtLength() {
return this.prdtLength;
}
/**
* set the prdtLength - 产品-长.
*
* @param prdtLength - 产品-长
*/
public void setPrdtLength(BigDecimal prdtLength) {
this.prdtLength = prdtLength;
}
/**
* get the prdtWidth - 产品-宽.
* @return the prdtWidth
*/
public BigDecimal getPrdtWidth() {
return this.prdtWidth;
}
/**
* set the prdtWidth - 产品-宽.
*
* @param prdtWidth - 产品-宽
*/
public void setPrdtWidth(BigDecimal prdtWidth) {
this.prdtWidth = prdtWidth;
}
/**
* get the prdtThick - 产品-厚.
* @return the prdtThick
*/
public BigDecimal getPrdtThick() {
return this.prdtThick;
}
/**
* set the prdtThick - 产品-厚.
*
* @param prdtThick - 产品-厚
*/
public void setPrdtThick(BigDecimal prdtThick) {
this.prdtThick = prdtThick;
}
/**
* get the prdtSpec - 产品规格.
* @return the prdtSpec
*/
public String getPrdtSpec() {
return this.prdtSpec;
}
/**
* set the prdtSpec - 产品规格.
*
* @param prdtSpec - 产品规格
*/
public void setPrdtSpec(String prdtSpec) {
this.prdtSpec = prdtSpec;
}
/**
* get the partType - 零件类型.
* @return the partType * @return the partType
*/ */
public String getPartType() { public String getPartType() {
...@@ -972,15 +809,15 @@ public class HGKC003 extends DaoEPBase { ...@@ -972,15 +809,15 @@ public class HGKC003 extends DaoEPBase {
} }
/** /**
* set the partType - 零件类型. * set the partType - 物料类型.
* *
* @param partType - 零件类型 * @param partType - 物料类型
*/ */
public void setPartType(String partType) { public void setPartType(String partType) {
this.partType = partType; this.partType = partType;
} }
/** /**
* get the partCode - 零件编码. * get the partCode - 物料编码.
* @return the partCode * @return the partCode
*/ */
public String getPartCode() { public String getPartCode() {
...@@ -988,15 +825,15 @@ public class HGKC003 extends DaoEPBase { ...@@ -988,15 +825,15 @@ public class HGKC003 extends DaoEPBase {
} }
/** /**
* set the partCode - 零件编码. * set the partCode - 物料编码.
* *
* @param partCode - 零件编码 * @param partCode - 物料编码
*/ */
public void setPartCode(String partCode) { public void setPartCode(String partCode) {
this.partCode = partCode; this.partCode = partCode;
} }
/** /**
* get the partName - 零件名称. * get the partName - 物料名称.
* @return the partName * @return the partName
*/ */
public String getPartName() { public String getPartName() {
...@@ -1004,15 +841,15 @@ public class HGKC003 extends DaoEPBase { ...@@ -1004,15 +841,15 @@ public class HGKC003 extends DaoEPBase {
} }
/** /**
* set the partName - 零件名称. * set the partName - 物料名称.
* *
* @param partName - 零件名称 * @param partName - 物料名称
*/ */
public void setPartName(String partName) { public void setPartName(String partName) {
this.partName = partName; this.partName = partName;
} }
/** /**
* get the partLength - 零件-长. * get the partLength - 物料-长.
* @return the partLength * @return the partLength
*/ */
public BigDecimal getPartLength() { public BigDecimal getPartLength() {
...@@ -1020,15 +857,15 @@ public class HGKC003 extends DaoEPBase { ...@@ -1020,15 +857,15 @@ public class HGKC003 extends DaoEPBase {
} }
/** /**
* set the partLength - 零件-长. * set the partLength - 物料-长.
* *
* @param partLength - 零件-长 * @param partLength - 物料-长
*/ */
public void setPartLength(BigDecimal partLength) { public void setPartLength(BigDecimal partLength) {
this.partLength = partLength; this.partLength = partLength;
} }
/** /**
* get the partWidth - 零件-宽. * get the partWidth - 物料-宽.
* @return the partWidth * @return the partWidth
*/ */
public BigDecimal getPartWidth() { public BigDecimal getPartWidth() {
...@@ -1036,15 +873,15 @@ public class HGKC003 extends DaoEPBase { ...@@ -1036,15 +873,15 @@ public class HGKC003 extends DaoEPBase {
} }
/** /**
* set the partWidth - 零件-宽. * set the partWidth - 物料-宽.
* *
* @param partWidth - 零件-宽 * @param partWidth - 物料-宽
*/ */
public void setPartWidth(BigDecimal partWidth) { public void setPartWidth(BigDecimal partWidth) {
this.partWidth = partWidth; this.partWidth = partWidth;
} }
/** /**
* get the partThick - 零件-厚. * get the partThick - 物料-厚.
* @return the partThick * @return the partThick
*/ */
public BigDecimal getPartThick() { public BigDecimal getPartThick() {
...@@ -1052,15 +889,15 @@ public class HGKC003 extends DaoEPBase { ...@@ -1052,15 +889,15 @@ public class HGKC003 extends DaoEPBase {
} }
/** /**
* set the partThick - 零件-厚. * set the partThick - 物料-厚.
* *
* @param partThick - 零件-厚 * @param partThick - 物料-厚
*/ */
public void setPartThick(BigDecimal partThick) { public void setPartThick(BigDecimal partThick) {
this.partThick = partThick; this.partThick = partThick;
} }
/** /**
* get the partSpec - 零件规格. * get the partSpec - 物料规格.
* @return the partSpec * @return the partSpec
*/ */
public String getPartSpec() { public String getPartSpec() {
...@@ -1068,9 +905,9 @@ public class HGKC003 extends DaoEPBase { ...@@ -1068,9 +905,9 @@ public class HGKC003 extends DaoEPBase {
} }
/** /**
* set the partSpec - 零件规格. * set the partSpec - 物料规格.
* *
* @param partSpec - 零件规格 * @param partSpec - 物料规格
*/ */
public void setPartSpec(String partSpec) { public void setPartSpec(String partSpec) {
this.partSpec = partSpec; this.partSpec = partSpec;
...@@ -1190,13 +1027,6 @@ public class HGKC003 extends DaoEPBase { ...@@ -1190,13 +1027,6 @@ public class HGKC003 extends DaoEPBase {
setProdTaskNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_TASK_NO)), prodTaskNo)); setProdTaskNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_TASK_NO)), prodTaskNo));
setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode)); setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName)); setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
setPrdtType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_TYPE)), prdtType));
setPrdtCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_CODE)), prdtCode));
setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
setPrdtLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRDT_LENGTH)), prdtLength));
setPrdtWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRDT_WIDTH)), prdtWidth));
setPrdtThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRDT_THICK)), prdtThick));
setPrdtSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_SPEC)), prdtSpec));
setPartType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_TYPE)), partType)); setPartType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_TYPE)), partType));
setPartCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_CODE)), partCode)); setPartCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_CODE)), partCode));
setPartName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_NAME)), partName)); setPartName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_NAME)), partName));
...@@ -1249,13 +1079,6 @@ public class HGKC003 extends DaoEPBase { ...@@ -1249,13 +1079,6 @@ public class HGKC003 extends DaoEPBase {
map.put(FIELD_PROD_TASK_NO, StringUtils.toString(prodTaskNo, eiMetadata.getMeta(FIELD_PROD_TASK_NO))); map.put(FIELD_PROD_TASK_NO, StringUtils.toString(prodTaskNo, eiMetadata.getMeta(FIELD_PROD_TASK_NO)));
map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE))); map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME))); map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME)));
map.put(FIELD_PRDT_TYPE, StringUtils.toString(prdtType, eiMetadata.getMeta(FIELD_PRDT_TYPE)));
map.put(FIELD_PRDT_CODE, StringUtils.toString(prdtCode, eiMetadata.getMeta(FIELD_PRDT_CODE)));
map.put(FIELD_PRDT_NAME, StringUtils.toString(prdtName, eiMetadata.getMeta(FIELD_PRDT_NAME)));
map.put(FIELD_PRDT_LENGTH, StringUtils.toString(prdtLength, eiMetadata.getMeta(FIELD_PRDT_LENGTH)));
map.put(FIELD_PRDT_WIDTH, StringUtils.toString(prdtWidth, eiMetadata.getMeta(FIELD_PRDT_WIDTH)));
map.put(FIELD_PRDT_THICK, StringUtils.toString(prdtThick, eiMetadata.getMeta(FIELD_PRDT_THICK)));
map.put(FIELD_PRDT_SPEC, StringUtils.toString(prdtSpec, eiMetadata.getMeta(FIELD_PRDT_SPEC)));
map.put(FIELD_PART_TYPE, StringUtils.toString(partType, eiMetadata.getMeta(FIELD_PART_TYPE))); map.put(FIELD_PART_TYPE, StringUtils.toString(partType, eiMetadata.getMeta(FIELD_PART_TYPE)));
map.put(FIELD_PART_CODE, StringUtils.toString(partCode, eiMetadata.getMeta(FIELD_PART_CODE))); map.put(FIELD_PART_CODE, StringUtils.toString(partCode, eiMetadata.getMeta(FIELD_PART_CODE)));
map.put(FIELD_PART_NAME, StringUtils.toString(partName, eiMetadata.getMeta(FIELD_PART_NAME))); map.put(FIELD_PART_NAME, StringUtils.toString(partName, eiMetadata.getMeta(FIELD_PART_NAME)));
......
src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC003.java
...@@ -158,7 +158,7 @@ public class ServiceHGKC003 extends ServiceBase { ...@@ -158,7 +158,7 @@ public class ServiceHGKC003 extends ServiceBase {
DaoUtils.update(HGKC003.UPDATE_SUBMIT_STATUS, hgkc003); DaoUtils.update(HGKC003.UPDATE_SUBMIT_STATUS, hgkc003);
//修改计划生产任务完工数量 //修改计划生产任务完工数量
HGSCTools.complete(hgkc003.getQualityId(),hgkc003.getInvQty().intValue(),hgkc003.getRectificationId()); HGSCTools.complete(hgkc003.getQualityId(),hgkc003.getInvQty().intValue(),hgkc003.getRectificationId(),HGConstant.StorageType.RK);
// 修改库存 // 修改库存
HGKCUtils.HgKc010.updateInv(hgkc003.getCompanyCode(), hgkc003.getWhCode(), hgkc003.getPartCode(), HGKCUtils.HgKc010.updateInv(hgkc003.getCompanyCode(), hgkc003.getWhCode(), hgkc003.getPartCode(),
hgkc003.getInvQty(), hgkc003.getInvWeight()); hgkc003.getInvQty(), hgkc003.getInvWeight());
...@@ -244,7 +244,7 @@ public class ServiceHGKC003 extends ServiceBase { ...@@ -244,7 +244,7 @@ public class ServiceHGKC003 extends ServiceBase {
newKc003.setIsReturn(CommonConstant.YesNo.YES_1); newKc003.setIsReturn(CommonConstant.YesNo.YES_1);
DaoUtils.insert(HGKC003.INSERT, newKc003); DaoUtils.insert(HGKC003.INSERT, newKc003);
//修改计划生产任务完工数量 //修改计划生产任务完工数量
HGSCTools.complete(fKc003.getQualityId(),newKc003.getInvQty().intValue(),fKc003.getRectificationId()); HGSCTools.complete(fKc003.getQualityId(),newKc003.getInvQty().intValue(),fKc003.getRectificationId(), HGConstant.StorageType.TH);
// 修改库存 // 修改库存
HGKCUtils.HgKc010.updateInv(newKc003.getCompanyCode(), newKc003.getWhCode(), newKc003.getPartCode(), HGKCUtils.HgKc010.updateInv(newKc003.getCompanyCode(), newKc003.getWhCode(), newKc003.getPartCode(),
newKc003.getInvQty(), newKc003.getInvWeight()); newKc003.getInvQty(), newKc003.getInvWeight());
......
src/main/java/com/baosight/hggp/hg/kc/sql/HGKC003.xml
...@@ -81,27 +81,6 @@ ...@@ -81,27 +81,6 @@
<isNotEmpty prepend=" AND " property="projName"> <isNotEmpty prepend=" AND " property="projName">
PROJ_NAME like ('%$projName$%') PROJ_NAME like ('%$projName$%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="prdtType">
PRDT_TYPE = #prdtType#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="prdtCode">
PRDT_CODE = #prdtCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="prdtName">
PRDT_NAME = #prdtName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="prdtLength">
PRDT_LENGTH = #prdtLength#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="prdtWidth">
PRDT_WIDTH = #prdtWidth#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="prdtThick">
PRDT_THICK = #prdtThick#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="prdtSpec">
PRDT_SPEC = #prdtSpec#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="partType"> <isNotEmpty prepend=" AND " property="partType">
PART_TYPE = #partType# PART_TYPE = #partType#
</isNotEmpty> </isNotEmpty>
...@@ -191,13 +170,6 @@ ...@@ -191,13 +170,6 @@
PROD_TASK_NO as "prodTaskNo", <!-- 生产任务号 --> PROD_TASK_NO as "prodTaskNo", <!-- 生产任务号 -->
PROJ_CODE as "projCode", <!-- 项目编码 --> PROJ_CODE as "projCode", <!-- 项目编码 -->
PROJ_NAME as "projName", <!-- 项目名称 --> PROJ_NAME as "projName", <!-- 项目名称 -->
PRDT_TYPE as "prdtType", <!-- 产品类型 -->
PRDT_CODE as "prdtCode", <!-- 产品编码 -->
PRDT_NAME as "prdtName", <!-- 产品名称 -->
PRDT_LENGTH as "prdtLength", <!-- 产品-长 -->
PRDT_WIDTH as "prdtWidth", <!-- 产品-宽 -->
PRDT_THICK as "prdtThick", <!-- 产品-厚 -->
PRDT_SPEC as "prdtSpec", <!-- 产品规格 -->
PART_TYPE as "partType", <!-- 零件类型 --> PART_TYPE as "partType", <!-- 零件类型 -->
PART_CODE as "partCode", <!-- 零件编码 --> PART_CODE as "partCode", <!-- 零件编码 -->
PART_NAME as "partName", <!-- 零件名称 --> PART_NAME as "partName", <!-- 零件名称 -->
...@@ -261,13 +233,6 @@ ...@@ -261,13 +233,6 @@
PROD_TASK_NO, <!-- 生产任务号 --> PROD_TASK_NO, <!-- 生产任务号 -->
PROJ_CODE, <!-- 项目编码 --> PROJ_CODE, <!-- 项目编码 -->
PROJ_NAME, <!-- 项目名称 --> PROJ_NAME, <!-- 项目名称 -->
PRDT_TYPE, <!-- 产品类型 -->
PRDT_CODE, <!-- 产品编码 -->
PRDT_NAME, <!-- 产品名称 -->
PRDT_LENGTH, <!-- 产品-长 -->
PRDT_WIDTH, <!-- 产品-宽 -->
PRDT_THICK, <!-- 产品-厚 -->
PRDT_SPEC, <!-- 产品规格 -->
PART_TYPE, <!-- 零件类型 --> PART_TYPE, <!-- 零件类型 -->
PART_CODE, <!-- 零件编码 --> PART_CODE, <!-- 零件编码 -->
PART_NAME, <!-- 零件名称 --> PART_NAME, <!-- 零件名称 -->
...@@ -288,8 +253,7 @@ ...@@ -288,8 +253,7 @@
#companyName#, #depositDate#, #depositNo#, #whCode#, #whName#, #companyName#, #depositDate#, #depositNo#, #whCode#, #whName#,
#invQty#, #invUnitWeight#, #invWeight#, #depositNoOld#, #remark#, #invQty#, #invUnitWeight#, #invWeight#, #depositNoOld#, #remark#,
#factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#, #factoryCode#, #prodOrderNo#, #prodTaskNo#, #projCode#, #projName#,
#prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #partType#, #partCode#, #partName#, #partLength#, #partWidth#,
#prdtSpec#, #partType#, #partCode#, #partName#, #partLength#, #partWidth#,
#partThick#, #partSpec#, #price#, #amount#, #storageType#, #isReturn#,#submitStatus#,#inventTypeDetail#) #partThick#, #partSpec#, #price#, #amount#, #storageType#, #isReturn#,#submitStatus#,#inventTypeDetail#)
</insert> </insert>
...@@ -334,13 +298,6 @@ ...@@ -334,13 +298,6 @@
PROD_TASK_NO = #prodTaskNo#, <!-- 生产任务号 --> PROD_TASK_NO = #prodTaskNo#, <!-- 生产任务号 -->
PROJ_CODE = #projCode#, <!-- 项目编码 --> PROJ_CODE = #projCode#, <!-- 项目编码 -->
PROJ_NAME = #projName#, <!-- 项目名称 --> PROJ_NAME = #projName#, <!-- 项目名称 -->
PRDT_TYPE = #prdtType#, <!-- 产品类型 -->
PRDT_CODE = #prdtCode#, <!-- 产品编码 -->
PRDT_NAME = #prdtName#, <!-- 产品名称 -->
PRDT_LENGTH = #prdtLength#, <!-- 产品-长 -->
PRDT_WIDTH = #prdtWidth#, <!-- 产品-宽 -->
PRDT_THICK = #prdtThick#, <!-- 产品-厚 -->
PRDT_SPEC = #prdtSpec#, <!-- 产品规格 -->
PART_TYPE = #partType#, <!-- 零件类型 --> PART_TYPE = #partType#, <!-- 零件类型 -->
PART_CODE = #partCode#, <!-- 零件编码 --> PART_CODE = #partCode#, <!-- 零件编码 -->
PART_NAME = #partName#, <!-- 零件名称 --> PART_NAME = #partName#, <!-- 零件名称 -->
...@@ -424,13 +381,6 @@ ...@@ -424,13 +381,6 @@
PROD_TASK_NO as "prodTaskNo", <!-- 生产任务号 --> PROD_TASK_NO as "prodTaskNo", <!-- 生产任务号 -->
PROJ_CODE as "projCode", <!-- 项目编码 --> PROJ_CODE as "projCode", <!-- 项目编码 -->
PROJ_NAME as "projName", <!-- 项目名称 --> PROJ_NAME as "projName", <!-- 项目名称 -->
PRDT_TYPE as "prdtType", <!-- 产品类型 -->
PRDT_CODE as "prdtCode", <!-- 产品编码 -->
PRDT_NAME as "prdtName", <!-- 产品名称 -->
PRDT_LENGTH as "prdtLength", <!-- 产品-长 -->
PRDT_WIDTH as "prdtWidth", <!-- 产品-宽 -->
PRDT_THICK as "prdtThick", <!-- 产品-厚 -->
PRDT_SPEC as "prdtSpec", <!-- 产品规格 -->
PART_TYPE as "partType", <!-- 零件类型 --> PART_TYPE as "partType", <!-- 零件类型 -->
PART_CODE as "partCode", <!-- 零件编码 --> PART_CODE as "partCode", <!-- 零件编码 -->
PART_NAME as "partName", <!-- 零件名称 --> PART_NAME as "partName", <!-- 零件名称 -->
......
src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java
package com.baosight.hggp.hg.sc.tools; package com.baosight.hggp.hg.sc.tools;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.copier.SrcToDestCopier;
import com.baosight.hggp.common.*; import com.baosight.hggp.common.*;
import com.baosight.hggp.core.constant.CommonConstant; import com.baosight.hggp.core.constant.CommonConstant;
import com.baosight.hggp.core.dao.DaoBase; import com.baosight.hggp.core.dao.DaoBase;
...@@ -16,7 +15,6 @@ import com.baosight.hggp.hg.pz.tools.HGPZTools; ...@@ -16,7 +15,6 @@ import com.baosight.hggp.hg.pz.tools.HGPZTools;
import com.baosight.hggp.hg.sc.domain.*; import com.baosight.hggp.hg.sc.domain.*;
import com.baosight.hggp.hg.sj.domain.HGSJ001; import com.baosight.hggp.hg.sj.domain.HGSJ001;
import com.baosight.hggp.hg.sj.tools.HGSJTools; import com.baosight.hggp.hg.sj.tools.HGSJTools;
import com.baosight.hggp.hg.xs.domain.Org;
import com.baosight.hggp.hg.zl.domain.HGZL002; import com.baosight.hggp.hg.zl.domain.HGZL002;
import com.baosight.hggp.hg.zl.domain.HGZL004; import com.baosight.hggp.hg.zl.domain.HGZL004;
import com.baosight.hggp.hg.zl.tools.HGZLTools; import com.baosight.hggp.hg.zl.tools.HGZLTools;
...@@ -36,7 +34,6 @@ import org.apache.commons.lang3.StringUtils; ...@@ -36,7 +34,6 @@ import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.baosight.hggp.common.AssignStatusEnum.*; import static com.baosight.hggp.common.AssignStatusEnum.*;
...@@ -132,8 +129,10 @@ public class HGSCTools { ...@@ -132,8 +129,10 @@ public class HGSCTools {
} }
public static void complete(Long checkId, Integer completeNum, Long rectificationId){ public static void complete(Long checkId, Integer completeNum, Long rectificationId, Integer storageType){
HGZL002 hgzl002 = HGZLTools.THGZL002.get(checkId); HGZL002 hgzl002 = HGZLTools.THGZL002.get(checkId);
//如果是退回，需要修改整改通知单状态,工序质检单状态
if(storageType.intValue() == HGConstant.StorageType.TH){
if(Objects.nonNull(rectificationId) && rectificationId.intValue() != 0){ if(Objects.nonNull(rectificationId) && rectificationId.intValue() != 0){
//更新整改通知单状态,工序质检单与整改通知单是2条入库单数据 //更新整改通知单状态,工序质检单与整改通知单是2条入库单数据
HGZL004 hgzl004 = HGZLTools.THGZL004.get(rectificationId); HGZL004 hgzl004 = HGZLTools.THGZL004.get(rectificationId);
...@@ -145,6 +144,7 @@ public class HGSCTools { ...@@ -145,6 +144,7 @@ public class HGSCTools {
hgzl002.setCheckStatus(CheckStatusEnum.CHECKING.getCode()); hgzl002.setCheckStatus(CheckStatusEnum.CHECKING.getCode());
DaoUtils.update(HGZL002.UPDATE,hgzl002); DaoUtils.update(HGZL002.UPDATE,hgzl002);
} }
}
HGSC008 hgsc008 = THGSC008.getById(hgzl002.getWorkId()); HGSC008 hgsc008 = THGSC008.getById(hgzl002.getWorkId());
HGSC007 hgsc007 = THGSC007.getById(hgsc008.getTaskId()); HGSC007 hgsc007 = THGSC007.getById(hgsc008.getTaskId());
//更新生产任务完工数量 //更新生产任务完工数量
......
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