Skip to content

H
hg-smart
Commit c1f41793 by 宋祥
Options

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

parent 5482fb35
Showing with 232 additions and 26 deletions
src/main/java/com/baosight/hggp/hg/zl/domain/HGZL011.java
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,7 +16,7 @@ import java.util.Map; ...@@ -17,7 +16,7 @@ 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 {
...@@ -56,6 +55,9 @@ public class HGZL011 extends DaoEPBase { ...@@ -56,6 +55,9 @@ 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"; /* 企业编码*/
...@@ -90,6 +92,9 @@ public class HGZL011 extends DaoEPBase { ...@@ -90,6 +92,9 @@ 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";
...@@ -130,6 +135,9 @@ public class HGZL011 extends DaoEPBase { ...@@ -130,6 +135,9 @@ 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.
...@@ -294,6 +302,18 @@ public class HGZL011 extends DaoEPBase { ...@@ -294,6 +302,18 @@ public class HGZL011 extends DaoEPBase {
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);
} }
...@@ -833,6 +853,54 @@ public class HGZL011 extends DaoEPBase { ...@@ -833,6 +853,54 @@ 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
...@@ -873,6 +941,9 @@ public class HGZL011 extends DaoEPBase { ...@@ -873,6 +941,9 @@ 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));
} }
/** /**
...@@ -915,6 +986,9 @@ public class HGZL011 extends DaoEPBase { ...@@ -915,6 +986,9 @@ 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;
} }
......
src/main/java/com/baosight/hggp/hg/zl/domain/HGZL012.java
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,7 +16,7 @@ import java.util.Map; ...@@ -17,7 +16,7 @@ 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 {
...@@ -51,6 +50,9 @@ public class HGZL012 extends DaoEPBase { ...@@ -51,6 +50,9 @@ 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"; /* 企业编码*/
...@@ -80,6 +82,9 @@ public class HGZL012 extends DaoEPBase { ...@@ -80,6 +82,9 @@ 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";
...@@ -115,6 +120,9 @@ public class HGZL012 extends DaoEPBase { ...@@ -115,6 +120,9 @@ 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.
...@@ -250,6 +258,18 @@ public class HGZL012 extends DaoEPBase { ...@@ -250,6 +258,18 @@ public class HGZL012 extends DaoEPBase {
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);
} }
...@@ -709,6 +729,54 @@ public class HGZL012 extends DaoEPBase { ...@@ -709,6 +729,54 @@ 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
...@@ -744,6 +812,9 @@ public class HGZL012 extends DaoEPBase { ...@@ -744,6 +812,9 @@ 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));
} }
/** /**
...@@ -781,6 +852,9 @@ public class HGZL012 extends DaoEPBase { ...@@ -781,6 +852,9 @@ 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;
} }
......
src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL011.java
...@@ -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);
} }
......
src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL012.java
...@@ -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);
} }
......
src/main/java/com/baosight/hggp/hg/zl/sql/HGZL011.xml
...@@ -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>
......
src/main/java/com/baosight/hggp/hg/zl/sql/HGZL012.xml
...@@ -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>
......
src/main/java/com/baosight/hggp/hg/zl/tools/HGZLTools.java
...@@ -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);
}
} }
} }
src/main/webapp/HG/ZL/HGZL011.jsp
...@@ -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}"/>
......
src/main/webapp/HG/ZL/HGZL012.jsp
...@@ -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