Skip to content

H
hg-smart
Commit 96f4abf0 by liuyang
Options

Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

parents 38007abe e8ce41e5
Showing with 245 additions and 350 deletions
src/main/java/com/baosight/hggp/common/CheckTypeEnum.java
......@@ -5,8 +5,10 @@ package com.baosight.hggp.common;
* @version 1.0 2024/5/21
*/
public enum CheckTypeEnum {
PROCESS_CHECK(1,"工序质检单"),
POLLING_CHECK(2,"日常巡检单");
POLLING_CHECK(2,"日常巡检单"),
OUTSOURCE_CHECK(3, "委外入库单");
private Integer code;
......
src/main/java/com/baosight/hggp/hg/constant/HGConstant.java
......@@ -82,6 +82,8 @@ public class HGConstant {
public static final String HGZL002_CHECK_CODE = "HGZL002_CHECK_CODE";
//日常巡检
public static final String HGZL003_CHECK_CODE = "HGZL003_CHECK_CODE";
// 整改通知单
public static final String HGZL004_CHECK_CODE = "HGZL004_CHECK_CODE";
//生产任务订单
public static final String PROD_TASK_NO = "PROD_TASK_NO";
//售后维修单号
......
src/main/java/com/baosight/hggp/hg/ct/constant/HgCtConst.java
......@@ -7,12 +7,12 @@ package com.baosight.hggp.hg.ct.constant;
public class HgCtConst {
/**
* HPCT01 定义
* HGCT01 定义
*
* @author:songx
* @date:2024/9/24,17:54
*/
public static class HgCt01 {
public static class HgCt001 {
/**
* 状态
......
src/main/java/com/baosight/hggp/hg/ct/constant/HgCtSqlConst.java
......@@ -10,10 +10,10 @@ public class HgCtSqlConst {
* @author:songx
* @date:2024/8/29,15:54
*/
public static class HgCt01 {
public static class HgCt001 {
// 确认
public static final String CONFIRM = "HGCT01.confirm";
public static final String CONFIRM = "HGCT001.confirm";
}
}
src/main/java/com/baosight/hggp/hg/ct/domain/HGCT01.java → src/main/java/com/baosight/hggp/hg/ct/domain/HGCT001.java
......@@ -18,7 +18,7 @@ import java.util.Map;
* @version 1.0
* @history 2024-10-08 17:03:25 create
*/
public class HGCT01 extends DaoEPBase {
public class HGCT001 extends DaoEPBase {
private static final long serialVersionUID = 1L;
......@@ -56,11 +56,11 @@ public class HGCT01 extends DaoEPBase {
public static final String COL_FORM_PARAM = "FORM_PARAM"; /* 画面参数*/
public static final String COL_CLOSE_TIME = "CLOSE_TIME"; /* 关闭时间*/
public static final String QUERY = "HGCT01.query";
public static final String COUNT = "HGCT01.count";
public static final String INSERT = "HGCT01.insert";
public static final String UPDATE = "HGCT01.update";
public static final String DELETE = "HGCT01.delete";
public static final String QUERY = "HGCT001.query";
public static final String COUNT = "HGCT001.count";
public static final String INSERT = "HGCT001.insert";
public static final String UPDATE = "HGCT001.update";
public static final String DELETE = "HGCT001.delete";
private String createdBy = " "; /* 记录创建者*/
private String createdName = " "; /* 记录创建名称*/
......@@ -156,7 +156,7 @@ public class HGCT01 extends DaoEPBase {
/**
* the constructor.
*/
public HGCT01() {
public HGCT001() {
initMetaData();
}
......
src/main/java/com/baosight/hggp/hg/ct/service/ServiceHGCT01.java → src/main/java/com/baosight/hggp/hg/ct/service/ServiceHGCT001.java
......@@ -3,7 +3,7 @@ package com.baosight.hggp.hg.ct.service;
import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.hg.ct.constant.HgCtConst;
import com.baosight.hggp.hg.ct.constant.HgCtSqlConst;
import com.baosight.hggp.hg.ct.domain.HGCT01;
import com.baosight.hggp.hg.ct.domain.HGCT001;
import com.baosight.hggp.hg.ct.tools.HgCtTools;
import com.baosight.hggp.util.DateUtils;
import com.baosight.hggp.util.EiInfoUtils;
......@@ -25,7 +25,7 @@ import java.util.Map;
* @author:songx
* @date:2021/10/15,16:46
*/
public class ServiceHGCT01 extends ServiceEPBase {
public class ServiceHGCT001 extends ServiceEPBase {
/**
* 页面加载调用.
......@@ -34,7 +34,7 @@ public class ServiceHGCT01 extends ServiceEPBase {
*/
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCT01().eiMetadata);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCT001().eiMetadata);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "初始化失败");
}
......@@ -50,8 +50,8 @@ public class ServiceHGCT01 extends ServiceEPBase {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
// 只看自己的通知
queryMap.put(HGCT01.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HGCT01.QUERY);
queryMap.put(HGCT001.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HGCT001.QUERY);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询失败");
}
......@@ -67,11 +67,11 @@ public class ServiceHGCT01 extends ServiceEPBase {
public EiInfo queryTodo(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
queryMap.put(HGCT01.FIELD_STATUS, HgCtConst.HgCt01.Status.OPEN);
queryMap.put(HGCT01.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HGCT01.QUERY, new HGCT01());
queryMap.put(HGCT001.FIELD_STATUS, HgCtConst.HgCt001.Status.OPEN);
queryMap.put(HGCT001.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HGCT001.QUERY, new HGCT001());
// 查询总数量
List<Integer> counts = dao.query(HGCT01.COUNT, queryMap);
List<Integer> counts = dao.query(HGCT001.COUNT, queryMap);
inInfo.set(EiConstant.countStr, CollectionUtils.isEmpty(counts) ? 0 : counts.get(0));
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询待办信息");
......@@ -88,11 +88,11 @@ public class ServiceHGCT01 extends ServiceEPBase {
public EiInfo queryRecord(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
queryMap.put(HGCT01.FIELD_STATUS, HgCtConst.HgCt01.Status.CLOSE);
queryMap.put(HGCT01.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HGCT01.QUERY, new HGCT01());
queryMap.put(HGCT001.FIELD_STATUS, HgCtConst.HgCt001.Status.CLOSE);
queryMap.put(HGCT001.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HGCT001.QUERY, new HGCT001());
// 查询总数量
List<Integer> counts = dao.query(HGCT01.COUNT, queryMap);
List<Integer> counts = dao.query(HGCT001.COUNT, queryMap);
inInfo.set(EiConstant.countStr, CollectionUtils.isEmpty(counts) ? 0 : counts.get(0));
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询已办信息");
......@@ -109,13 +109,13 @@ public class ServiceHGCT01 extends ServiceEPBase {
public EiInfo confirm(EiInfo inInfo) {
try {
Map resultRow = EiInfoUtils.getFirstRow(inInfo, EiConstant.resultBlock);
if (ObjectUtils.isEmpty(resultRow.get(HGCT01.FIELD_INTERNAL_CODE))) {
if (ObjectUtils.isEmpty(resultRow.get(HGCT001.FIELD_INTERNAL_CODE))) {
inInfo.setMsg("无效的待办消息");
return inInfo;
}
resultRow.put(HGCT01.FIELD_STATUS, HgCtConst.HgCt01.Status.CLOSE);
resultRow.put(HGCT01.FIELD_CLOSE_TIME, DateUtils.shortDateTime());
DaoUtils.update(HgCtSqlConst.HgCt01.CONFIRM, resultRow);
resultRow.put(HGCT001.FIELD_STATUS, HgCtConst.HgCt001.Status.CLOSE);
resultRow.put(HGCT001.FIELD_CLOSE_TIME, DateUtils.shortDateTime());
DaoUtils.update(HgCtSqlConst.HgCt001.CONFIRM, resultRow);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "确认已办失败");
}
......@@ -131,9 +131,9 @@ public class ServiceHGCT01 extends ServiceEPBase {
public EiInfo batchConfirm(EiInfo inInfo) {
try {
int successCount = 0;
List<HGCT01> fCt01s = MapUtils.toDaoEPBases(inInfo, HGCT01.class);
for (HGCT01 fCt01 : fCt01s) {
int result = HgCtTools.HgCt01.confirm(fCt01.getInternalCode());
List<HGCT001> fCt01s = MapUtils.toDaoEPBases(inInfo, HGCT001.class);
for (HGCT001 fCt01 : fCt01s) {
int result = HgCtTools.HgCt001.confirm(fCt01.getInternalCode());
successCount += result;
}
inInfo = this.query(inInfo);
......
src/main/java/com/baosight/hggp/hg/ct/sql/HGCT01.xml → src/main/java/com/baosight/hggp/hg/ct/sql/HGCT001.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<sqlMap namespace="HGCT01">
<sqlMap namespace="HGCT001">
<sql id="column">
CREATED_BY as "createdBy", <!-- 记录创建者 -->
......@@ -81,23 +81,23 @@
</dynamic>
</sql>
<select id="query" resultClass="com.baosight.hggp.hg.ct.domain.HGCT01">
<select id="query" resultClass="com.baosight.hggp.hg.ct.domain.HGCT001">
SELECT
<include refid="column"/>
FROM ${hggpSchema}.HGCT01
FROM ${hggpSchema}.HGCT001
WHERE 1=1
<include refid="customCondition"/>
<include refid="orderBy"/>
</select>
<select id="count" resultClass="int">
SELECT COUNT(*) FROM ${hggpSchema}.HGCT01
SELECT COUNT(*) FROM ${hggpSchema}.HGCT001
WHERE 1=1
<include refid="customCondition"/>
</select>
<insert id="insert">
INSERT INTO ${hggpSchema}.HGCT01 (
INSERT INTO ${hggpSchema}.HGCT001 (
CREATED_BY, <!-- 记录创建者 -->
CREATED_NAME, <!-- 记录创建名称 -->
CREATED_TIME, <!-- 记录创建时间 -->
......@@ -121,7 +121,7 @@
<!-- 确认 -->
<update id="confirm">
UPDATE ${hggpSchema}.HGCT01
UPDATE ${hggpSchema}.HGCT001
SET
STATUS = #status#,
CLOSE_TIME = #closeTime#,
......
src/main/java/com/baosight/hggp/hg/ct/tools/HgCtTools.java
......@@ -3,7 +3,7 @@ package com.baosight.hggp.hg.ct.tools;
import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.hg.ct.constant.HgCtConst;
import com.baosight.hggp.hg.ct.constant.HgCtSqlConst;
import com.baosight.hggp.hg.ct.domain.HGCT01;
import com.baosight.hggp.hg.ct.domain.HGCT001;
import com.baosight.hggp.util.DateUtils;
import com.baosight.hggp.util.StringUtils;
......@@ -22,16 +22,16 @@ public class HgCtTools {
* @author:songx
* @date:2024/3/25,21:04
*/
public static class HgCt01 {
public static class HgCt001 {
/**
* 写入数据库
*
* @param ct00
*/
public static void insertDb(HGCT01 ct00) {
ct00.setStatus(HgCtConst.HgCt01.Status.OPEN);
DaoUtils.insert(HGCT01.INSERT, ct00);
public static void insertDb(HGCT001 ct00) {
ct00.setStatus(HgCtConst.HgCt001.Status.OPEN);
DaoUtils.insert(HGCT001.INSERT, ct00);
}
/**
......@@ -44,10 +44,10 @@ public class HgCtTools {
return 0;
}
Map paramMap = new HashMap();
paramMap.put(HGCT01.FIELD_INTERNAL_CODE, internalCode);
paramMap.put(HGCT01.FIELD_STATUS, HgCtConst.HgCt01.Status.CLOSE);
paramMap.put(HGCT01.FIELD_CLOSE_TIME, DateUtils.shortDateTime());
return DaoUtils.update(HgCtSqlConst.HgCt01.CONFIRM, paramMap);
paramMap.put(HGCT001.FIELD_INTERNAL_CODE, internalCode);
paramMap.put(HGCT001.FIELD_STATUS, HgCtConst.HgCt001.Status.CLOSE);
paramMap.put(HGCT001.FIELD_CLOSE_TIME, DateUtils.shortDateTime());
return DaoUtils.update(HgCtSqlConst.HgCt001.CONFIRM, paramMap);
}
}
......
src/main/java/com/baosight/hggp/hg/ct/utils/HgCtUtils.java
package com.baosight.hggp.hg.ct.utils;
import com.baosight.hggp.hg.ct.domain.HGCT01;
import com.baosight.hggp.hg.ct.domain.HGCT001;
import com.baosight.hggp.hg.ct.tools.HgCtTools;
import com.baosight.hggp.hg.xs.domain.User;
import com.baosight.hggp.hg.xs.tools.HGXSTools;
......@@ -21,14 +21,14 @@ public class HgCtUtils {
* @author:songx
* @date:2024/10/8,17:20
*/
public static class HgCt01 {
public static class HgCt001 {
/**
* 发送通知
*
* @param ct00 消息体
*/
public static void send(HGCT01 ct00) {
public static void send(HGCT001 ct00) {
AssertUtils.isNull(ct00, "待办内容不能为空");
AssertUtils.isEmpty(ct00.getTitle(), "待办标题不能为空");
AssertUtils.isEmpty(ct00.getContent(), "待办内容不能为空");
......@@ -36,7 +36,7 @@ public class HgCtUtils {
// 设置通知对象名称
User user = HGXSTools.XsUser.getByLogin(ct00.getUserEname());
ct00.setUserCname(user.getUserName());
HgCtTools.HgCt01.insertDb(ct00);
HgCtTools.HgCt001.insertDb(ct00);
}
/**
......@@ -45,7 +45,7 @@ public class HgCtUtils {
* @param ct00 消息体
* @param loginNames loginNames
*/
public static void send(HGCT01 ct00, List<String> loginNames) {
public static void send(HGCT001 ct00, List<String> loginNames) {
AssertUtils.isNull(ct00, "待办内容不能为空");
AssertUtils.isEmpty(ct00.getTitle(), "待办标题不能为空");
AssertUtils.isEmpty(ct00.getContent(), "待办内容不能为空");
......@@ -55,7 +55,7 @@ public class HgCtUtils {
User user = HGXSTools.XsUser.getByLogin(loginName);
ct00.setUserCname(user.getUserName());
ct00.setUserEname(user.getLoginName());
HgCtTools.HgCt01.insertDb(ct00);
HgCtTools.HgCt001.insertDb(ct00);
}
} catch (Exception e) {
log.error("发送通知消息失败：{}", e.getMessage(), e);
......
src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL011.java
......@@ -259,8 +259,8 @@ public class ServiceHGZL011 extends ServiceBase {
DaoUtils.insert(HGKC008A.INSERT, newKc008A);
// 修改库存
HGKCUtils.HgKc010.updateInv(dbKc008A.getCompanyCode(), dbKc008A.getWhCode(),
dbKc008A.getInventCode(), newKc008A.getInvQty(), newKc008A.getInvUnitWeight(),
newKc008A.getInvWeight());
dbKc008A.getInventCode(), newKc008A.getInvQty().negate(), newKc008A.getInvUnitWeight(),
newKc008A.getInvWeight().negate());
}
/**
......
src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL012.java
......@@ -251,6 +251,9 @@ public class ServiceHGZL012 extends ServiceBase {
}
// 不合格量大于0，更新委外加工
if (fZl012.getUnQualityQty().compareTo(BigDecimal.ZERO) > 0) {
// 生成整改通知单
HGZLTools.THGZL004.addByHGZL012(fZl012);
// 更新委外加工
HGSCTools.Hgsc010a.updateDeliver(dbKc014A.getPcsId(), fZl012.getUnQualityQty());
}
}
......
src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL012B.java
......@@ -11,6 +11,7 @@ import com.baosight.hggp.hg.kc.tools.HGKCTools;
import com.baosight.hggp.hg.kc.utils.HGKCUtils;
import com.baosight.hggp.hg.zl.constant.HgZlConst;
import com.baosight.hggp.hg.zl.domain.HGZL012;
import com.baosight.hggp.hg.zl.tools.HGZLTools;
import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.BeanUtils;
import com.baosight.hggp.util.CommonMethod;
......
src/main/java/com/baosight/hggp/hg/zl/sql/HGZL004.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd"> <!-- table information
Generate time : 2024-06-03 11:12:42
Version : 1.0
schema : hggp
tableName : HGZL004
id BIGINT NOT NULL primarykey,
check_id BIGINT NOT NULL,
company_code VARCHAR NOT NULL,
company_name VARCHAR NOT NULL,
dep_code VARCHAR,
dep_name VARCHAR,
proj_code VARCHAR,
proj_name VARCHAR,
handle_status TINYINT,
quality_problem VARCHAR,
process_sugges VARCHAR,
rectificat_sugges VARCHAR,
check_type TINYINT,
check_code VARCHAR,
product_type TINYINT,
product_code VARCHAR,
product_name VARCHAR,
factory_code VARCHAR,
factory_name VARCHAR,
group_code VARCHAR,
group_name VARCHAR,
work_by VARCHAR,
work_name VARCHAR,
check_by VARCHAR,
check_name VARCHAR,
account_code VARCHAR NOT NULL,
created_by VARCHAR,
created_name VARCHAR,
created_time VARCHAR,
updated_by VARCHAR,
updated_name VARCHAR,
updated_time VARCHAR
-->
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<sqlMap namespace="HGZL004">
<sql id="condition">
<sql id="condition">
<include refid="HGXSDataAuth.authCondition"/>
<isNotEmpty prepend=" AND " property="id">
id = #id#
</isNotEmpty>
......@@ -152,44 +114,43 @@
</isNotEmpty>
</sql>
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.hggp.hg.zl.domain.HGZL004">
SELECT
id as "id",
check_id as "checkId", <!-- 质检单ID -->
company_code as "companyCode", <!-- 公司编码 -->
company_name as "companyName", <!-- 公司名称 -->
dep_code as "depCode", <!-- 部门编码 -->
dep_name as "depName", <!-- 部门名称 -->
proj_code as "projCode", <!-- 项目编码 -->
proj_name as "projName", <!-- 项目名称 -->
handle_status as "handleStatus", <!-- 处理状态 0:待处理；1:处理中；2:已处理 -->
quality_problem as "qualityProblem", <!-- 质量问题 -->
process_sugges as "processSugges", <!-- 处理意见 -->
rectificat_sugges as "rectificatSugges", <!-- 整改措施 -->
check_type as "checkType", <!-- 质检单类型 1:工序质检单；2:日常巡检单 -->
check_code as "checkCode", <!-- 质检单编码 -->
product_type as "productType", <!-- 产品类型 -->
product_code as "productCode", <!-- 产品编号 -->
product_name as "productName", <!-- 产品名称 -->
factory_code as "factoryCode", <!-- 工厂编号 -->
factory_name as "factoryName", <!-- 工厂名称 -->
group_code as "groupCode", <!-- 工作组编号 -->
group_name as "groupName", <!-- 工作组名称 -->
work_by as "workBy", <!-- 生产人 -->
work_name as "workName", <!-- 生产人名称 -->
check_by as "checkBy", <!-- 质检人 -->
check_name as "checkName", <!-- 质检人名称 -->
account_code as "accountCode", <!-- 帐套 -->
created_by as "createdBy", <!-- 创建人 -->
created_name as "createdName", <!-- 创建人名称 -->
created_time as "createdTime", <!-- 创建时间 -->
updated_by as "updatedBy", <!-- 更新人 -->
updated_name as "updatedName", <!-- 修改人名称 -->
updated_time as "updatedTime", <!-- 更新时间 -->
process_code as "processCode", <!-- 工序编码 -->
process_name as "processName" <!-- 工序名称 -->
FROM ${hggpSchema}.HGZL004 WHERE 1=1
<select id="query" resultClass="com.baosight.hggp.hg.zl.domain.HGZL004">
SELECT
id as "id",
check_id as "checkId", <!-- 质检单ID -->
company_code as "companyCode", <!-- 公司编码 -->
company_name as "companyName", <!-- 公司名称 -->
dep_code as "depCode", <!-- 部门编码 -->
dep_name as "depName", <!-- 部门名称 -->
proj_code as "projCode", <!-- 项目编码 -->
proj_name as "projName", <!-- 项目名称 -->
handle_status as "handleStatus", <!-- 处理状态 0:待处理；1:处理中；2:已处理 -->
quality_problem as "qualityProblem", <!-- 质量问题 -->
process_sugges as "processSugges", <!-- 处理意见 -->
rectificat_sugges as "rectificatSugges", <!-- 整改措施 -->
check_type as "checkType", <!-- 质检单类型 1:工序质检单；2:日常巡检单 -->
check_code as "checkCode", <!-- 质检单编码 -->
product_type as "productType", <!-- 产品类型 -->
product_code as "productCode", <!-- 产品编号 -->
product_name as "productName", <!-- 产品名称 -->
factory_code as "factoryCode", <!-- 工厂编号 -->
factory_name as "factoryName", <!-- 工厂名称 -->
group_code as "groupCode", <!-- 工作组编号 -->
group_name as "groupName", <!-- 工作组名称 -->
work_by as "workBy", <!-- 生产人 -->
work_name as "workName", <!-- 生产人名称 -->
check_by as "checkBy", <!-- 质检人 -->
check_name as "checkName", <!-- 质检人名称 -->
account_code as "accountCode", <!-- 帐套 -->
created_by as "createdBy", <!-- 创建人 -->
created_name as "createdName", <!-- 创建人名称 -->
created_time as "createdTime", <!-- 创建时间 -->
updated_by as "updatedBy", <!-- 更新人 -->
updated_name as "updatedName", <!-- 修改人名称 -->
updated_time as "updatedTime", <!-- 更新时间 -->
process_code as "processCode", <!-- 工序编码 -->
process_name as "processName" <!-- 工序名称 -->
FROM ${hggpSchema}.HGZL004 WHERE 1=1
<include refid="condition" />
<dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy">
......@@ -199,219 +160,122 @@
id desc
</isEmpty>
</dynamic>
</select>
<select id="count" resultClass="int">
SELECT COUNT(*) FROM ${hggpSchema}.HGZL004 WHERE 1=1
<include refid="condition" />
</select>
<!--
<isNotEmpty prepend=" AND " property="id">
id = #id#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="checkId">
check_id = #checkId#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode">
company_code = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyName">
company_name = #companyName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="depCode">
dep_code = #depCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="depName">
dep_name = #depName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="projCode">
proj_code = #projCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="projName">
proj_name = #projName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="handleStatus">
handle_status = #handleStatus#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="qualityProblem">
quality_problem = #qualityProblem#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="processSugges">
process_sugges = #processSugges#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="rectificatSugges">
rectificat_sugges = #rectificatSugges#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="checkType">
check_type = #checkType#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="checkCode">
check_code = #checkCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="productType">
product_type = #productType#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="productCode">
product_code = #productCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="productName">
product_name = #productName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="factoryCode">
factory_code = #factoryCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="factoryName">
factory_name = #factoryName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="groupCode">
group_code = #groupCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="groupName">
group_name = #groupName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="workBy">
work_by = #workBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="workName">
work_name = #workName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="checkBy">
check_by = #checkBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="checkName">
check_name = #checkName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="accountCode">
account_code = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdBy">
created_by = #createdBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdName">
created_name = #createdName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdTime">
created_time = #createdTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedBy">
updated_by = #updatedBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedName">
updated_name = #updatedName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedTime">
updated_time = #updatedTime#
</isNotEmpty>
-->
<select id="count" resultClass="int">
SELECT COUNT(*) FROM ${hggpSchema}.HGZL004 WHERE 1=1
<include refid="condition"/>
</select>
<insert id="insert">
INSERT INTO ${hggpSchema}.HGZL004 (id,
check_id, <!-- 质检单ID -->
company_code, <!-- 公司编码 -->
company_name, <!-- 公司名称 -->
dep_code, <!-- 部门编码 -->
dep_name, <!-- 部门名称 -->
proj_code, <!-- 项目编码 -->
proj_name, <!-- 项目名称 -->
handle_status, <!-- 处理状态 0:待处理；1:处理中；2:已处理 -->
quality_problem, <!-- 质量问题 -->
process_sugges, <!-- 处理意见 -->
rectificat_sugges, <!-- 整改措施 -->
check_type, <!-- 质检单类型 1:工序质检单；2:日常巡检单 -->
check_code, <!-- 质检单编码 -->
product_type, <!-- 产品类型 -->
product_code, <!-- 产品编号 -->
product_name, <!-- 产品名称 -->
factory_code, <!-- 工厂编号 -->
factory_name, <!-- 工厂名称 -->
group_code, <!-- 工作组编号 -->
group_name, <!-- 工作组名称 -->
work_by, <!-- 生产人 -->
work_name, <!-- 生产人名称 -->
check_by, <!-- 质检人 -->
check_name, <!-- 质检人名称 -->
account_code, <!-- 帐套 -->
created_by, <!-- 创建人 -->
created_name, <!-- 创建人名称 -->
created_time, <!-- 创建时间 -->
updated_by, <!-- 更新人 -->
updated_name, <!-- 修改人名称 -->
updated_time, <!-- 更新时间 -->
process_code, <!-- 工序编码 -->
process_name <!-- 工序名称 -->
)
VALUES (#id#, #checkId#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #handleStatus#, #qualityProblem#, #processSugges#, #rectificatSugges#, #checkType#, #checkCode#, #productType#, #productCode#, #productName#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #workBy#, #workName#, #checkBy#, #checkName#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #processCode#, #processName#)
</insert>
INSERT INTO ${hggpSchema}.HGZL004 (
check_id,<!-- 质检单ID -->
company_code,<!-- 公司编码 -->
company_name,<!-- 公司名称 -->
dep_code,<!-- 部门编码 -->
dep_name,<!-- 部门名称 -->
proj_code, <!-- 项目编码 -->
proj_name,<!-- 项目名称 -->
handle_status,<!-- 处理状态 0:待处理；1:处理中；2:已处理 -->
quality_problem, <!-- 质量问题 -->
process_sugges,<!-- 处理意见 -->
rectificat_sugges,<!-- 整改措施 -->
check_type,<!-- 质检单类型 1:工序质检单；2:日常巡检单 -->
check_code,<!-- 质检单编码 -->
product_type,<!-- 产品类型 -->
product_code, <!-- 产品编号 -->
product_name, <!-- 产品名称 -->
factory_code, <!-- 工厂编号 -->
factory_name, <!-- 工厂名称 -->
group_code, <!-- 工作组编号 -->
group_name, <!-- 工作组名称 -->
work_by,<!-- 生产人 -->
work_name, <!-- 生产人名称 -->
check_by, <!-- 质检人 -->
check_name, <!-- 质检人名称 -->
account_code, <!-- 帐套 -->
created_by, <!-- 创建人 -->
created_name, <!-- 创建人名称 -->
created_time, <!-- 创建时间 -->
updated_by, <!-- 更新人 -->
updated_name, <!-- 修改人名称 -->
updated_time, <!-- 更新时间 -->
process_code, <!-- 工序编码 -->
process_name <!-- 工序名称 -->
) VALUES (
#checkId#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #handleStatus#,
#qualityProblem#, #processSugges#, #rectificatSugges#, #checkType#, #checkCode#, #productType#, #productCode#,
#productName#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #workBy#, #workName#, #checkBy#,
#checkName#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
#updatedTime#, #processCode#, #processName#)
</insert>
<delete id="delete">
DELETE FROM ${hggpSchema}.HGZL004 WHERE
id = #id#
DELETE FROM ${hggpSchema}.HGZL004 WHERE id = #id#
</delete>
<update id="update">
UPDATE ${hggpSchema}.HGZL004
SET
check_id = #checkId#, <!-- 质检单ID -->
company_code = #companyCode#, <!-- 公司编码 -->
company_name = #companyName#, <!-- 公司名称 -->
dep_code = #depCode#, <!-- 部门编码 -->
dep_name = #depName#, <!-- 部门名称 -->
proj_code = #projCode#, <!-- 项目编码 -->
proj_name = #projName#, <!-- 项目名称 -->
handle_status = #handleStatus#, <!-- 处理状态 0:待处理；1:处理中；2:已处理 -->
quality_problem = #qualityProblem#, <!-- 质量问题 -->
process_sugges = #processSugges#, <!-- 处理意见 -->
rectificat_sugges = #rectificatSugges#, <!-- 整改措施 -->
check_type = #checkType#, <!-- 质检单类型 1:工序质检单；2:日常巡检单 -->
check_code = #checkCode#, <!-- 质检单编码 -->
product_type = #productType#, <!-- 产品类型 -->
product_code = #productCode#, <!-- 产品编号 -->
product_name = #productName#, <!-- 产品名称 -->
factory_code = #factoryCode#, <!-- 工厂编号 -->
factory_name = #factoryName#, <!-- 工厂名称 -->
group_code = #groupCode#, <!-- 工作组编号 -->
group_name = #groupName#, <!-- 工作组名称 -->
work_by = #workBy#, <!-- 生产人 -->
work_name = #workName#, <!-- 生产人名称 -->
check_by = #checkBy#, <!-- 质检人 -->
check_name = #checkName#, <!-- 质检人名称 -->
account_code = #accountCode#, <!-- 帐套 -->
created_by = #createdBy#, <!-- 创建人 -->
created_name = #createdName#, <!-- 创建人名称 -->
created_time = #createdTime#, <!-- 创建时间 -->
updated_by = #updatedBy#, <!-- 更新人 -->
updated_name = #updatedName#, <!-- 修改人名称 -->
updated_time = #updatedTime#, <!-- 更新时间 -->
process_code = #processCode#, <!-- 工序编码 -->
process_name = #processName# <!-- 工序名称 -->
WHERE
id = #id#
</update>
UPDATE ${hggpSchema}.HGZL004
SET
check_id = #checkId#, <!-- 质检单ID -->
company_code = #companyCode#, <!-- 公司编码 -->
company_name = #companyName#, <!-- 公司名称 -->
dep_code = #depCode#, <!-- 部门编码 -->
dep_name = #depName#, <!-- 部门名称 -->
proj_code = #projCode#, <!-- 项目编码 -->
proj_name = #projName#, <!-- 项目名称 -->
handle_status = #handleStatus#, <!-- 处理状态 0:待处理；1:处理中；2:已处理 -->
quality_problem = #qualityProblem#, <!-- 质量问题 -->
process_sugges = #processSugges#, <!-- 处理意见 -->
rectificat_sugges = #rectificatSugges#, <!-- 整改措施 -->
check_type = #checkType#, <!-- 质检单类型 1:工序质检单；2:日常巡检单 -->
check_code = #checkCode#, <!-- 质检单编码 -->
product_type = #productType#, <!-- 产品类型 -->
product_code = #productCode#, <!-- 产品编号 -->
product_name = #productName#, <!-- 产品名称 -->
factory_code = #factoryCode#, <!-- 工厂编号 -->
factory_name = #factoryName#, <!-- 工厂名称 -->
group_code = #groupCode#, <!-- 工作组编号 -->
group_name = #groupName#, <!-- 工作组名称 -->
work_by = #workBy#, <!-- 生产人 -->
work_name = #workName#, <!-- 生产人名称 -->
check_by = #checkBy#, <!-- 质检人 -->
check_name = #checkName#, <!-- 质检人名称 -->
account_code = #accountCode#, <!-- 帐套 -->
created_by = #createdBy#, <!-- 创建人 -->
created_name = #createdName#, <!-- 创建人名称 -->
created_time = #createdTime#, <!-- 创建时间 -->
updated_by = #updatedBy#, <!-- 更新人 -->
updated_name = #updatedName#, <!-- 修改人名称 -->
updated_time = #updatedTime#, <!-- 更新时间 -->
process_code = #processCode#, <!-- 工序编码 -->
process_name = #processName# <!-- 工序名称 -->
WHERE id = #id#
</update>
<!-- 行锁 -->
<update id="lock">
UPDATE ${hggpSchema}.HGZL004
SET CREATED_TIME = CREATED_TIME
WHERE 1=1
<isNotEmpty prepend=" AND " property="id">
id = #id#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="ids">
id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
</isNotEmpty>
</update>
<update id="lock">
UPDATE ${hggpSchema}.HGZL004
SET CREATED_TIME = CREATED_TIME
WHERE 1=1
<isNotEmpty prepend=" AND " property="id">
id = #id#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="ids">
id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
</isNotEmpty>
</update>
<update id="batch_complete">
UPDATE ${hggpSchema}.HGZL004
SET
handle_status = 2, <!-- 处理状态 0:待处理；1:处理中；2:已处理 -->
updated_by = #updatedBy#, <!-- 更新人 -->
updated_name = #updatedName#, <!-- 修改人名称 -->
updated_time = #updatedTime# <!-- 更新时间 -->
WHERE
id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
</update>
<update id="batch_complete">
UPDATE ${hggpSchema}.HGZL004
SET
handle_status = 2, <!-- 处理状态 0:待处理；1:处理中；2:已处理 -->
updated_by = #updatedBy#, <!-- 更新人 -->
updated_name = #updatedName#, <!-- 修改人名称 -->
updated_time = #updatedTime# <!-- 更新时间 -->
WHERE
id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
</update>
<delete id="delete_by_check_ids">
DELETE FROM ${hggpSchema}.HGZL004 WHERE
......@@ -423,4 +287,5 @@
DELETE FROM ${hggpSchema}.HGZL004 WHERE
id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
</delete>
</sqlMap>
src/main/java/com/baosight/hggp/hg/zl/tools/HGZLTools.java
......@@ -21,10 +21,10 @@ 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.BeanUtils;
import com.baosight.hggp.util.DateUtils;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import java.math.BigDecimal;
import java.util.HashMap;
......@@ -257,7 +257,28 @@ public class HGZLTools {
DaoUtils.insert(HGZL004.INSERT, hgzl004);
}
}
/**
* 生成整改通知单
*
* @param hgZl012
*/
public static void addByHGZL012(HGZL012 hgZl012) {
if (hgZl012.getUnQualityQty().compareTo(BigDecimal.ZERO) < 1) {
return;
}
HGZL004 newZl004 = BeanUtils.copy(hgZl012, HGZL004.class);
newZl004.setCheckId(hgZl012.getId());
newZl004.setCheckType(CheckTypeEnum.OUTSOURCE_CHECK.getCode());
newZl004.setHandleStatus(HandleStatusEnum.UNPROCESS.getCode());
newZl004.setCheckCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.HGZL002_CHECK_CODE));
newZl004.setCheckBy(UserSessionUtils.getLoginName());
newZl004.setCheckName(UserSessionUtils.getLoginCName());
newZl004.setProductCode(hgZl012.getInventCode());
newZl004.setProductName(hgZl012.getInventName());
DaoUtils.insert(HGZL004.INSERT, newZl004);
}
public static void deleteByCheckIds(List<Long> checkIds,CheckTypeEnum checkType){
List<HGZL004> hgzl004List = listByCheckIds(checkIds,checkType.getCode());
List<Long> ids = hgzl004List.stream().map(HGZL004::getId).collect(Collectors.toList());
......
src/main/resources/META-INF/resources/iPlatV7-index.js
......@@ -1121,13 +1121,13 @@
}
});
// 绑定查看更多
bandForMore('todo', 'HGCT01', 'inqu_status-0-status=open');
bandForMore('todo', 'HGCT001', 'inqu_status-0-status=open');
// 绑定刷新
bandForRefresh('todo', refreshTodo);
};
let refreshTodo = function () {
refreshService('HGCT01', 'queryTodo', drawTodo);
refreshService('HGCT001', 'queryTodo', drawTodo);
};
// 定时刷新
......@@ -1394,13 +1394,13 @@
}
});
// 绑定查看更多
bandForMore('record', 'HGCT01', 'inqu_status-0-status=close');
bandForMore('record', 'HGCT001', 'inqu_status-0-status=close');
// 绑定刷新
bandForRefresh('record', refreshRecord);
};
let refreshRecord = function () {
refreshService('HGCT01', 'queryRecord', drawRecord);
refreshService('HGCT001', 'queryRecord', drawRecord);
};
// 定时刷新
......
src/main/resources/resources/ibatis/sqlmap-config.xml
......@@ -27,7 +27,7 @@
<!-- 工具 -->
<sqlMap resource="com/baosight/hggp/hg/dm/sql/HGDM099.xml"/>
<sqlMap resource="com/baosight/hggp/hg/ct/sql/HGCT01.xml"/>
<sqlMap resource="com/baosight/hggp/hg/ct/sql/HGCT001.xml"/>
<!-- 工艺 -->
<sqlMap resource="com/baosight/hggp/hg/sj/sql/HGSJ001.xml"/>
......
src/main/webapp/HG/CT/HGCT01.js → src/main/webapp/HG/CT/HGCT001.js
......@@ -59,7 +59,7 @@ let confirm = function () {
}
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"确认已办\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HGCT01", "batchConfirm", true);
JSUtils.submitGridsData("result", "HGCT001", "batchConfirm", true);
}
});
}
......
src/main/webapp/HG/ZL/HGZL004.jsp
......@@ -22,24 +22,24 @@
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="checkBy" cname="质检员" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
<EF:EFColumn ename="companyName" cname="公司名称" width="130" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="problemPic" cname="问题照片" width="90" enable="false" align="center"/>
<EF:EFColumn ename="processPic" cname="处理照片" width="90" enable="false" align="center"/>
<EF:EFColumn ename="checkCode" cname="整改单号" width="130" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="companyName" cname="公司名称" width="180" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="projCode" cname="项目编号" width="130" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="projName" cname="项目名称" width="130" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="createdTime" cname="单据日期" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" enable="true" width="120" align="center" readOnly="true"/>
<EF:EFColumn ename="checkCode" cname="检查单号" width="130" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="checkName" cname="质检人" width="100" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="groupName" cname="责任部门" width="100" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="workName" cname="姓名" width="90" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="productName" cname="产品名称" width="90" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="processName" cname="工序" width="100" enable="false" readonly="true" align="center"/>
<EF:EFColumn ename="qualityProblem" cname="质量问题描述" width="130" align="center"/>
<EF:EFColumn ename="problemPic" cname="问题照片" width="90" enable="false" align="center"/>
<EF:EFColumn ename="processPic" cname="处理照片" width="90" enable="false" align="center"/>
<EF:EFColumn ename="processSugges" cname="处理意见" width="130" align="center"/>
<EF:EFColumn ename="rectificatSugges" cname="整改措施" width="130" align="center"/>
<EF:EFComboColumn ename="handleStatus" cname="处理状态" width="80" align="center" enable="false"
......
src/main/webapp/common/js/common.js
......@@ -277,7 +277,8 @@ function currShortDate() {
const year = date.getFullYear();
const month = date.getMonth() + 1; // 月份从0开始，需要加1
const day = date.getDate();
return year + (month < 10 ? '0' + month : month.toString()) + (day < 10 ? '0' + day : day);
return year.toString() + (month < 10 ? '0' + month : month.toString())
+ (day < 10 ? '0' + day : day.toString());
}
/**
......@@ -289,7 +290,7 @@ function currShortMonth(getYear) {
const date = new Date(getYear);
const year = date.getFullYear();
const month = date.getMonth() + 1; // 月份从0开始，需要加1
return year + (month < 10 ? '0' + month : month);
return year.toString() + (month < 10 ? '0' + month : month.toString());
}
/**
......
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