Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
zpl 4 years ago
parent f740da5672 b71d147f33
commit 9f3a5f4c5d
15 changed files with 207 additions and 76 deletions
Show Stats Download Patch File Download Diff File

8
common/src/main/java/com/foreverwin/mesnac/common/model/CustomReportSearchConditionConfig.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.foreverwin.mesnac.common.model;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
*
@ -33,7 +34,7 @@ public class CustomReportSearchConditionConfig {
private Integer columnID;
private Integer columnWidthPercent;
//自定义报表 Load后需赋上初值
private List<String> fieldValueList;
private List<Map<String, Object>> fieldValueList;
//增加insert所需字段
private String site;
@ -177,10 +178,11 @@ public class CustomReportSearchConditionConfig {
this.columnWidthPercent = columnWidthPercent;
}
public List<String> getFieldValueList() {
public List<Map<String, Object>> getFieldValueList() {
return fieldValueList;
}
public void setFieldValueList(List<String> fieldValueList) {
public void setFieldValueList(List<Map<String, Object>> fieldValueList) {
this.fieldValueList = fieldValueList;
}
}

11
common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java
Unescape Escape View File

@ -182,6 +182,17 @@ public class ProdReadyTask extends Model<ProdReadyTask> {
@TableField(exist = false)
private String workCenterDesc;
@TableField(exist = false)
private String blankingSize;
public String getBlankingSize() {
return blankingSize;
}
public void setBlankingSize(String blankingSize) {
this.blankingSize = blankingSize;
}
public List<ProdReadyTaskDetail> getProdReadyTaskDetailList() {
return prodReadyTaskDetailList;
}

78
common/src/main/java/com/foreverwin/mesnac/common/service/impl/CustomReportImpl.java
Unescape Escape View File

@ -115,27 +115,46 @@ public class CustomReportImpl implements CustomReportInterface {
int k=0;
for(CustomReportSearchConditionConfig searchConditionConfig:conditionConfigList)
{
if(searchConditionConfig.getDailogCheckboxSQL().trim().isEmpty())
{
conditionConfigList.get(k).setFieldValueList(new ArrayList());
}else
{
//当 弹出复选框数据获取SQL 有值时，依SQL获取相应的字段值列表
if (searchConditionConfig.getDailogCheckboxSQL().trim().isEmpty()) {
//List<Map<String, Object>> result=logicService.executeQuery(site, searchConditionConfig.getDailogCheckboxSQL().trim(), new HashMap<String,Object>());
List<Map<String, Object>> result = customReportMapper.executeSqlQuery( searchConditionConfig.getDailogCheckboxSQL().trim() );
if(result.size()>0)
{
List<String> lst=new ArrayList<String>();
for(Map<String,Object> m:result)
{
for(String key:m.keySet())
{
lst.add(m.get(key).toString());
conditionConfigList.get(k).setFieldValueList(new ArrayList());
} else {
String dictOrSql = searchConditionConfig.getDailogCheckboxSQL();
if (dictOrSql.startsWith("SELECT".toUpperCase())) {
//当 弹出复选框数据获取SQL 有值时，依SQL获取相应的字段值列表
//List<Map<String, Object>> result=logicService.executeQuery(site, searchConditionConfig.getDailogCheckboxSQL().trim(), new HashMap<String,Object>());
List<Map<String, Object>> result = customReportMapper.executeSqlQuery(dictOrSql.trim());
if (result.size() > 0) {
List<Map<String, Object>> lst = new ArrayList<>();
for (Map<String, Object> m : result) {
Map<String, Object> _map = new HashMap<>();
for (String key : m.keySet()) {
_map.put("key", m.get(key));
_map.put("text", m.get(key));
break;
}
lst.add(_map);
}
conditionConfigList.get(k).setFieldValueList(lst);
}
} else if (dictOrSql.contains("*") && dictOrSql.contains(";")) {
String[] dictOrSqlArray = dictOrSql.split(";");
if (dictOrSqlArray != null && dictOrSqlArray.length > 0) {
List<Map<String, Object>> mapList = new ArrayList<>();
Map<String, Object> _map = null;
for (int i = 0; i < dictOrSqlArray.length; i++) {
String keyValue = dictOrSqlArray[i];
if (!keyValue.contains("*")) {
continue;
}
_map = new HashMap<>();
_map.put("key", keyValue.split("\\*")[0]);
_map.put("text", keyValue.split("\\*")[1]);
mapList.add(_map);
}
conditionConfigList.get(k).setFieldValueList(mapList);
}
conditionConfigList.get(k).setFieldValueList(lst);
}
}
@ -202,24 +221,15 @@ public class CustomReportImpl implements CustomReportInterface {
if(querySentence.trim().isEmpty())
{
//70502.simple=请在检索语句配置栏填写 SQL语句
//throw Exceptions.convert(new BasicBOBeanException(70502,new Data()));
throw new RuntimeException("请在检索语句配置栏填写 SQL语句");
}
param=null;
//2.依定的规则 检索语句中需替换的内容 以 :开头，所以此处依:先做下判断是否有需替换的内容
if(querySentence.indexOf(":")>1)
{
//处理需替换的数据
//自定义报表_检索条件动态SQL配置
List<CustomReportSearchConditionDynSQLConfig> dynSQLConfigList=new ArrayList<CustomReportSearchConditionDynSQLConfig>();
param = new HashMap<String, Object>();
param = new HashMap();
param.put("MAINHANDLE", "CustomReportBO:*,"+reportID);
//map=logicService.executeQuery(site, QUERY_DYNSQLCONFIG_SQL, param);
@ -235,10 +245,8 @@ public class CustomReportImpl implements CustomReportInterface {
}
if(object.getString(dynSqlConfigMap.get(i).toString())==null || object.getString(dynSqlConfigMap.get(i).getConditionField()).isEmpty())
if( dynSqlConfigMap == null || dynSqlConfigMap.get(i)==null || object.getString(dynSqlConfigMap.get(i).getConditionField()) == null)
{
//当前台的json格式字串中没有 依赖条件的值时，即表示查询条件中无此项，可直接赋空字串
//queryMap.put(map.get(i).get("DYN_CONDITION_REPLACE_FIELD").toString().trim(), "");
querySentence=querySentence.replaceAll(dynSqlConfigMap.get(i).getDynConditionReplaceField().trim(), " ");
}else
@ -268,11 +276,11 @@ public class CustomReportImpl implements CustomReportInterface {
}
//3.执行查询
Map<String,Object> siteParam=new HashMap<String, Object>();
//siteParam.put("SITE", site);
//替换站点 2021/08/19
querySentence = querySentence.replace(":SITE","\'"+site+"\'");
//3.执行查询
//List<Map<String, Object>> result=logicService.executeQuery(site, querySentence,siteParam);
List<Map<String, Object>> result= customReportMapper.executeSqlQuery( querySentence );
@ -289,7 +297,5 @@ public class CustomReportImpl implements CustomReportInterface {
}
return result;
}
}

3
common/src/main/resources/mapper/ProdReadyTaskMapper.xml
Unescape Escape View File

@ -631,7 +631,7 @@
</delete>
<!-- BaseMapper标准查询/修改/删除 -->
<select id="getTaskList" resultMap="BaseResultMap">
SELECT PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
SELECT zsd.BLANKING_SIZE,PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成'
ELSE '未完成' END LAST_OPERATION_STATUS
,PREOT.DESCRIPTION LAST_OPERATION,zprt.*,zsd.DISPATCH_NO,zsd.RESOURCE_TYPE,RES.DESCRIPTION RESRCE_DESC,ITT.DESCRIPTION ITEM_DESC,OT.DESCRIPTION OPERATION_DESC
@ -662,6 +662,7 @@
<if test="entity.resourceType!=null and entity.resourceType!='' "> AND ZSD.RESOURCE_TYPE=#{entity.resourceType}</if>
<if test="entity.shopOrder!=null and entity.shopOrder!='' "> AND ZPRT.SHOP_ORDER=#{entity.shopOrder}</if>
<if test="entity.item!=null and entity.item!='' "> AND ZPRT.ITEM=#{entity.item}</if>
<if test="entity.blankingSize!=null and entity.blankingSize!='' "> AND zsd.BLANKING_SIZE LIKE '%${entity.blankingSize}%'</if>
<if test="entity.planStartDate!=null and entity.planStartDate!='' "> AND TO_CHAR(ZSD.PLANNED_START_DATE,'YYYY-MM-DD')=#{entity.planStartDate}</if>
ORDER BY zprt.CREATED_DATE_TIME DESC
</select>

18
meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java
Unescape Escape View File

@ -20,6 +20,24 @@ public class SfcDto extends Sfc {
private String plannedCompDate;
//工作令号
private String workOrder;
private String employeeDescription;
private String lastOperationStatus;
public String getEmployeeDescription() {
return employeeDescription;
}
public void setEmployeeDescription(String employeeDescription) {
this.employeeDescription = employeeDescription;
}
public String getLastOperationStatus() {
return lastOperationStatus;
}
public void setLastOperationStatus(String lastOperationStatus) {
this.lastOperationStatus = lastOperationStatus;
}
public String getAbnormalNo() {
return abnormalNo;

15
meapi/src/main/resources/mapper/SfcMapper.xml
Unescape Escape View File

@ -44,6 +44,9 @@
<result column="OPERATION_DESCRIPTION" property="operationDescription" />
<result column="PREPOSITION_OPERATION" property="prepositionOperation" />
<result column="RESRCE" property="resrce" />
<result column="EMPLOYEE_DESCRIPTION" property="employeeDescription" />
<result column="LAST_OPERATION_STATUS" property="lastOperationStatus" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
@ -636,7 +639,7 @@
SELECT IW.DATE_STARTED
FROM SFC S
INNER JOIN SFC_ROUTING SR ON SR.SFC_BO = S.HANDLE
INNER JOIN SFC_ROUTER SRO ON SRO.SFC_ROUTING_BO = SR.HANDLE
INNER JOIN SFC_ROUTER SRO ON SRO.SFC_ROUTING_BO = SR.HANDLE AND SRO.IN_USE = 'true'
INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = SRO.HANDLE
INNER JOIN SFC_IN_WORK IW ON SS.HANDLE = IW.SFC_STEP_BO
INNER JOIN STATUS ST ON ST.HANDLE = S.STATUS_BO AND ST.STATUS ='403'
@ -663,10 +666,18 @@
</select>
<select id="pageByResrce" resultMap="FullResultMap">
SELECT S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION FROM SFC S
SELECT PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成'
ELSE '未完成' END LAST_OPERATION_STATUS,
S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION FROM SFC S
LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.ITEM_BO AND IT.LOCALE=#{locale}
JOIN Z_SFC_DISPATCH zsd ON S.SFC=zsd.SFC AND S.SITE=zsd.SITE
LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1
JOIN Z_PROD_READY_TASK zprt ON ZPRT.SFC_DISPATCH_BO=zsd.HANDLE
JOIN SFC S ON S.SFC=ZSD.SFC AND S.SITE=ZSD.SITE
JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE
JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO AND SR2.IN_USE = 'true'
LEFT JOIN SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0)
WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND ZSD.DISPATCH_STATUS!='CANCEL' AND ZSD.DISPATCH_STATUS!='COMPLETE'
AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404')
AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK'

2
production/src/main/java/com/foreverwin/mesnac/production/mapper/LoadInventoryMapper.java
Unescape Escape View File

@ -20,4 +20,6 @@ import java.util.List;
public interface LoadInventoryMapper extends BaseMapper<LoadInventory> {
List<LoadInventoryDto> getLoadInventoryList(@Param("site") String site, @Param("resrce") String resrce, @Param("language") String language);
Integer findBomComponent(@Param("site")String site, @Param("resrce")String resrce, @Param("itemBo")String itemBo);
}

5
production/src/main/java/com/foreverwin/mesnac/production/service/impl/LoadInventoryServiceImpl.java
Unescape Escape View File

@ -119,6 +119,11 @@ public class LoadInventoryServiceImpl extends ServiceImpl<LoadInventoryMapper, L
if (inventory.getQtyOnHand().compareTo(loadQty)<0){
throw new BaseException("上料数量不能大于剩余数量"+inventory.getQtyOnHand());
}
//设备派工单组件是否包含
Integer bomComponent = loadInventoryMapper.findBomComponent(site, resrce, inventory.getItemBo());
if (bomComponent<1){
throw new BaseException("不是设备上产品需要的物料");
}
BigDecimal remainQty = inventory.getQtyOnHand().subtract(loadQty);
//扣减库存
commonService.updateInventory(site,inventoryId,remainQty);

9
production/src/main/resources/mapper/LoadInventoryMapper.xml
Unescape Escape View File

@ -423,4 +423,13 @@
LEFT JOIN CUSTOM_FIELDS cf3 ON cf.HANDLE=IT.HANDLE AND CF."ATTRIBUTE"='MAT_SPEC'
WHERE ZLI.RESRCE=#{resrce} AND ZLI.SITE=#{site} ORDER BY ZLI.CREATED_DATE_TIME
</select>
<select id="findBomComponent" resultType="java.lang.Integer">
SELECT COUNT(BC.HANDLE) FROM Z_SFC_DISPATCH zsd
JOIN SFC S ON S.SFC = zsd.SFC AND zsd.SITE=S.SITE
JOIN SFC_BOM SB ON SB.SFC_BO = S.HANDLE
JOIN BOM_COMPONENT BC ON BC.BOM_BO = SB.BOM_BO
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = BC.COMPONENT_GBO AND CF."ATTRIBUTE" = 'ACCESSORY_TYPE' AND (CF.VALUE = '0' OR CF.VALUE = NULL)
WHERE zsd.SITE=#{site} AND zsd.DISPATCH_STATUS!='COMPLETE' AND zsd.DISPATCH_STATUS!='CANCEL' AND zsd.RESRCE=#{resrce} AND BC.COMPONENT_GBO=#{itemBo}
</select>
</mapper>

4
quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java
Unescape Escape View File

@ -18,7 +18,7 @@ import java.util.Map;
/**
*
* @author Philip
* @since 2021-06-17
* @since 2021-08-20
*/
@RestController
@RequestMapping("/Z-SELF-REPORT")
@ -99,6 +99,8 @@ public class SelfReportController {
.or().like(SelfReport::getRemark, frontPage.getGlobalQuery())
.or().like(SelfReport::getCreateUser, frontPage.getGlobalQuery())
.or().like(SelfReport::getModifyUser, frontPage.getGlobalQuery())
.or().like(SelfReport::getNcCodeDesc, frontPage.getGlobalQuery())
.or().like(SelfReport::getReportUserGroup, frontPage.getGlobalQuery())
);
}
result = selfReportService.page(frontPage.getPagePlus(), queryWrapper);

7
quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java
Unescape Escape View File

@ -1,8 +1,9 @@
package com.foreverwin.mesnac.quality.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.foreverwin.mesnac.quality.model.SelfReport;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.meapi.model.UserGroup;
import com.foreverwin.mesnac.quality.model.SelfReport;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -15,10 +16,10 @@ import java.util.List;
* </p>
*
* @author Philip
* @since 2021-06-17
* @since 2021-08-20
*/
@Repository
public interface SelfReportMapper extends BaseMapper<SelfReport> {
List<SelfReport> selectListByCondition(@Param("ew") QueryWrapper<SelfReport> ew, @Param("locale") String locale,@Param("startTime") LocalDate startTime,@Param("endTime") LocalDate endTime);
List<SelfReport> selectListByCondition(@Param("ew") QueryWrapper<SelfReport> ew, @Param("locale") String locale, @Param("startTime") LocalDate startTime, @Param("endTime") LocalDate endTime, @Param("userGroupList")List<UserGroup> userGroupList);
}

66
quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java
Unescape Escape View File

@ -17,7 +17,7 @@ import java.time.LocalDateTime;
* </p>
*
* @author Philip
* @since 2021-08-16
* @since 2021-08-20
*/
@TableName("Z_SELF_REPORT")
@ -121,6 +121,11 @@ public class SelfReport extends Model<SelfReport> {
*/
@TableField("NC_CODE_DESC")
private String ncCodeDesc;
/**
* 提报用户组
*/
@TableField("REPORT_USER_GROUP")
private String reportUserGroup;
/**
* 开始时间
@ -140,29 +145,7 @@ public class SelfReport extends Model<SelfReport> {
@TableField(exist = false)
private String description;
public LocalDate getStartTime() {
return startTime;
}
public void setStartTime(LocalDate startTime) {
this.startTime = startTime;
}
public LocalDate getEndTime() {
return endTime;
}
public void setEndTime(LocalDate endTime) {
this.endTime = endTime;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getHandle() {
return handle;
@ -316,7 +299,39 @@ public class SelfReport extends Model<SelfReport> {
this.ncCodeDesc = ncCodeDesc;
}
public static final String HANDLE = "HANDLE";
public String getReportUserGroup() {
return reportUserGroup;
}
public void setReportUserGroup(String reportUserGroup) {
this.reportUserGroup = reportUserGroup;
}
public LocalDate getStartTime() {
return startTime;
}
public void setStartTime(LocalDate startTime) {
this.startTime = startTime;
}
public LocalDate getEndTime() {
return endTime;
}
public void setEndTime(LocalDate endTime) {
this.endTime = endTime;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";
@ -354,6 +369,8 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
public static final String NC_CODE_DESC = "NC_CODE_DESC";
public static final String REPORT_USER_GROUP = "REPORT_USER_GROUP";
@Override
protected Serializable pkVal() {
@ -382,6 +399,7 @@ public static final String NC_CODE_DESC = "NC_CODE_DESC";
", modifyUser = " + modifyUser +
", modifiedDateTime = " + modifiedDateTime +
", ncCodeDesc = " + ncCodeDesc +
", reportUserGroup = " + reportUserGroup +
"}";
}
}

4
quality/src/main/java/com/foreverwin/mesnac/quality/service/SelfReportService.java
Unescape Escape View File

@ -2,8 +2,8 @@ package com.foreverwin.mesnac.quality.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.quality.model.SelfReport;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.mesnac.quality.model.SelfReport;
import com.foreverwin.modular.core.util.FrontPage;
import java.time.LocalDate;
@ -16,7 +16,7 @@ import java.util.Map;
* </p>
*
* @author Philip
* @since 2021-06-17
* @since 2021-08-20
*/
public interface SelfReportService extends IService<SelfReport> {

24
quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java
Unescape Escape View File

@ -13,6 +13,8 @@ import com.foreverwin.mesnac.common.service.CommonService;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.dto.NcCodeDto;
import com.foreverwin.mesnac.meapi.dto.SfcDto;
import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper;
import com.foreverwin.mesnac.meapi.model.UserGroup;
import com.foreverwin.mesnac.meapi.service.NcCodeService;
import com.foreverwin.mesnac.production.mapper.SfcCrossMapper;
import com.foreverwin.mesnac.quality.dto.SelfReportRequest;
@ -36,13 +38,14 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
* 自报代办事项 服务实现类
* </p>
*
* @author Philip
* @since 2021-06-17
* @since 2021-08-20
*/
@Service
@Transactional(rollbackFor = Exception.class)
@ -59,7 +62,8 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
private CommonService commonService;
@Autowired
private NcCodeService ncCodeService;
@Autowired
private UserGroupMapper userGroupMapper;
@Override
public IPage<SelfReport> selectPage(FrontPage<SelfReport> frontPage, SelfReport selfReport) {
@ -76,7 +80,18 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
}
@Override
public List<SelfReport> selectList(QueryWrapper<SelfReport> queryWrapper, String locale, LocalDate startTime, LocalDate endTime) {
return selfReportMapper.selectListByCondition(queryWrapper,locale,startTime,endTime);
String site = CommonMethods.getSite();
String user = CommonMethods.getUser();
List<UserGroup> userGroupList = userGroupMapper.findUserGroupListByUser(site, user);
//ADMINISTRATORS,如果有的话就等于null
for (UserGroup userGroup : userGroupList){
if("ADMINISTRATORS".equals(userGroup.getUserGroup())){
userGroupList = null;
break;
}
}
return selfReportMapper.selectListByCondition(queryWrapper,locale,startTime,endTime,userGroupList);
}
@Override
@ -175,6 +190,7 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
selfReport.setCreatedDateTime(LocalDateTime.now());
selfReport.setModifyUser(user);
selfReport.setModifiedDateTime(LocalDateTime.now());
selfReport.setReportUserGroup(userGroup);
save(selfReport);
}
}
@ -191,4 +207,6 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
return updateById(selfReport);
}
}

29
quality/src/main/resources/mapper/SelfReportMapper.xml
Unescape Escape View File

@ -23,11 +23,12 @@
<result column="MODIFY_USER" property="modifyUser" />
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
<result column="NC_CODE_DESC" property="ncCodeDesc" />
<result column="REPORT_USER_GROUP" property="reportUserGroup" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
HANDLE, SITE, TASK_NO, WORK_CENTER, SHOP_ORDER, ITEM, OP_STEP, RESRCE, SFC, NC_CODE, NC_QTY, LOCATION, STATE, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME, NC_CODE_DESC
HANDLE, SITE, TASK_NO, WORK_CENTER, SHOP_ORDER, ITEM, OP_STEP, RESRCE, SFC, NC_CODE, NC_QTY, LOCATION, STATE, REMARK, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME, NC_CODE_DESC, REPORT_USER_GROUP
</sql>
<!-- BaseMapper标准查询/修改/删除 -->
@ -80,6 +81,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</where>
</select>
@ -109,6 +111,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -146,6 +149,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -183,6 +187,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -220,6 +225,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -257,6 +263,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -294,6 +301,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -327,6 +335,7 @@
<if test="modifyUser!=null">MODIFY_USER,</if>
<if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
<if test="ncCodeDesc!=null">NC_CODE_DESC,</if>
<if test="reportUserGroup!=null">REPORT_USER_GROUP,</if>
</trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
#{handle},
@ -348,6 +357,7 @@
<if test="modifyUser!=null">#{modifyUser},</if>
<if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
<if test="ncCodeDesc!=null">#{ncCodeDesc},</if>
<if test="reportUserGroup!=null">#{reportUserGroup},</if>
</trim>
</insert>
@ -376,6 +386,7 @@
#{modifyUser},
#{modifiedDateTime},
#{ncCodeDesc},
#{reportUserGroup},
</trim>
</insert>
@ -400,6 +411,7 @@
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
<if test="et.ncCodeDesc!=null">NC_CODE_DESC=#{et.ncCodeDesc},</if>
<if test="et.reportUserGroup!=null">REPORT_USER_GROUP=#{et.reportUserGroup},</if>
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -424,6 +436,7 @@
MODIFY_USER=#{et.modifyUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
NC_CODE_DESC=#{et.ncCodeDesc},
REPORT_USER_GROUP=#{et.reportUserGroup},
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -448,6 +461,7 @@
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
<if test="et.ncCodeDesc!=null">NC_CODE_DESC=#{et.ncCodeDesc},</if>
<if test="et.reportUserGroup!=null">REPORT_USER_GROUP=#{et.reportUserGroup},</if>
</trim>
<where>
<if test="ew!=null">
@ -471,6 +485,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -525,6 +540,7 @@
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="ew.entity.ncCodeDesc!=null"> AND NC_CODE_DESC=#{ew.entity.ncCodeDesc}</if>
<if test="ew.entity.reportUserGroup!=null"> AND REPORT_USER_GROUP=#{ew.entity.reportUserGroup}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
@ -570,6 +586,17 @@
<if test="ew.entity.createdDateTime!=null"> AND ZSR.CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND ZSR.MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND ZSR.MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
<if test="userGroupList != null">
<if test="userGroupList.size &lt;= 0">
AND 1 = 2
</if>
<if test="userGroupList.size > 0">
AND ZSR.REPORT_USER_GROUP IN
<foreach item="item" index="index" collection="userGroupList" separator="," open="(" close=")">
UPPER(#{item.userGroup})
</foreach>
</if>
</if>
</if>
<if test="startTime!=null"> AND ZSR.CREATED_DATE_TIME >=#{startTime}</if>
<if test="endTime!=null"> AND ZSR.CREATED_DATE_TIME &lt;=#{endTime}</if>

Write Preview
Loading…
Cancel
Save