Skip to content

H
hg-smart
Commit c1f41793 by 宋祥
Options

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

parent 5482fb35
Showing with 74 additions and 16 deletions
src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL011.java
......@@ -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.xs.domain.Company;
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.tools.HGZLTools;
import com.baosight.hggp.hg.zl.utils.HGZLUtils;
import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.BeanUtils;
......@@ -226,11 +225,7 @@ public class ServiceHGZL011 extends ServiceBase {
for (HGZL011 fZl011 : fZl011s) {
String qualityNo = fZl011.getQualityNo();
// 更新质检单状态
HGZL011 dbZl011 = dbZl011Map.get(qualityNo);
dbZl011.setQualityQty(fZl011.getQualityQty());
dbZl011.setUnQualityQty(fZl011.getUnQualityQty());
dbZl011.setStatus(HgZlConst.HgZl011.Status.S1);
DaoUtils.update(HgZlSqlConst.HgZl011.PROCESS, dbZl011.toMap());
HGZLTools.HgZl011.process(qualityNo, fZl011.getQualityQty(), fZl011.getUnQualityQty());
// 更新领料单明细状态
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;
import com.baosight.hggp.hg.sc.tools.HGSCTools;
import com.baosight.hggp.hg.xs.domain.Company;
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.tools.HGZLTools;
import com.baosight.hggp.hg.zl.utils.HGZLUtils;
import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.CommonMethod;
......@@ -223,11 +223,7 @@ public class ServiceHGZL012 extends ServiceBase {
for (HGZL012 fZl012 : fZl012s) {
String qualityNo = fZl012.getQualityNo();
// 更新质检单状态
HGZL012 dbZl012 = dbZl012Map.get(qualityNo);
dbZl012.setQualityQty(fZl012.getQualityQty());
dbZl012.setUnQualityQty(fZl012.getUnQualityQty());
dbZl012.setStatus(HgZlConst.HgZl012.Status.S1);
DaoUtils.update(HgZlSqlConst.HgZl012.PROCESS, dbZl012.toMap());
HGZLTools.HgZl012.process(qualityNo, fZl012.getQualityQty(), fZl012.getUnQualityQty());
// 更新领料单明细状态
this.updateApplyDetail(fZl012, dbKc014AMap);
}
......
src/main/java/com/baosight/hggp/hg/zl/sql/HGZL011.xml
......@@ -35,7 +35,10 @@
UN_QUALITY_QTY as "unQualityQty", <!-- 不合格数量 -->
INVENT_TYPE_DETAIL as "inventTypeDetail", <!-- 存货类型大类 -->
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 id="condition">
......@@ -227,6 +230,9 @@
STATUS = #status#,
QUALITY_QTY = #qualityQty#, <!-- 合格数量 -->
UN_QUALITY_QTY = #unQualityQty#, <!-- 不合格数量 -->
QUALITY_USER_ID = #qualityUserId#, <!-- 质检人ID -->
QUALITY_USER_NAME = #qualityUserName#, <!-- 质检人名称 -->
QUALITY_TIME = #qualityTime#, <!-- 时间时间 -->
<include refid="SqlBase.updateRevise"/>
WHERE QUALITY_NO = #qualityNo#
</update>
......
src/main/java/com/baosight/hggp/hg/zl/sql/HGZL012.xml
......@@ -30,7 +30,10 @@
QUALITY_QTY as "qualityQty", <!-- 合格数量 -->
UN_QUALITY_QTY as "unQualityQty", <!-- 不合格数量 -->
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 id="condition">
......@@ -226,6 +229,9 @@
STATUS = #status#,
QUALITY_QTY = #qualityQty#, <!-- 合格数量 -->
UN_QUALITY_QTY = #unQualityQty#, <!-- 不合格数量 -->
QUALITY_USER_ID = #qualityUserId#, <!-- 质检人ID -->
QUALITY_USER_NAME = #qualityUserName#, <!-- 质检人名称 -->
QUALITY_TIME = #qualityTime#, <!-- 时间时间 -->
<include refid="SqlBase.updateRevise"/>
WHERE QUALITY_NO = #qualityNo#
</update>
......
src/main/java/com/baosight/hggp/hg/zl/tools/HGZLTools.java
......@@ -5,14 +5,23 @@ import com.baosight.hggp.common.CheckTypeEnum;
import com.baosight.hggp.common.HandleStatusEnum;
import com.baosight.hggp.core.dao.DaoBase;
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.HGSqlConstant;
import com.baosight.hggp.hg.sc.domain.HGSC007;
import com.baosight.hggp.hg.sc.domain.HGSC008;
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.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.DateUtils;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
......@@ -382,6 +391,25 @@ public class HGZLTools {
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 {
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 @@
<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="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="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="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="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}"/>
......
src/main/webapp/HG/ZL/HGZL012.jsp
......@@ -49,10 +49,14 @@
<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="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="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="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="depositLineCode" cname="入库单行ID" enable="false" width="130" 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