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

Merge remote-tracking branch 'origin/master'

Browse Source
philip 4 years ago
parent a118947288 6402fb0ed2
commit 6a9dcca7b4
7 changed files with 219 additions and 72 deletions
Show Stats Download Patch File Download Diff File

18
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
Unescape Escape View File

@ -1,11 +1,12 @@
package com.foreverwin.mesnac.anomaly.controller; package com.foreverwin.mesnac.anomaly.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
import com.foreverwin.mesnac.anomaly.service.AbnormalBillService; import com.foreverwin.mesnac.anomaly.service.AbnormalBillService;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.model.DataField; import com.foreverwin.mesnac.meapi.model.DataField;
import com.foreverwin.mesnac.meapi.model.NcCode; import com.foreverwin.mesnac.meapi.model.NcCode;
import com.foreverwin.mesnac.meapi.model.WorkCenter; import com.foreverwin.mesnac.meapi.model.WorkCenter;
@ -24,7 +25,7 @@ import java.util.List;
/** /**
* *
* @author robert * @author robert
* @since 2021-06-25 * @since 2021-07-05
*/ */
@RestController @RestController
@RequestMapping("/Z-ABNORMAL-BILL") @RequestMapping("/Z-ABNORMAL-BILL")
@ -104,7 +105,7 @@ public class AbnormalBillController {
.or().like(AbnormalBill::getPbUser, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getPbUser, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getPbQty, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getPbQty, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getDiscover, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getDiscover, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getInspecter, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getInspector, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getEntityLocation, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getEntityLocation, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getReportFrom, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getReportFrom, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getObjectBo, frontPage.getGlobalQuery()) .or().like(AbnormalBill::getObjectBo, frontPage.getGlobalQuery())
@ -170,10 +171,13 @@ public class AbnormalBillController {
@GetMapping("/init") @GetMapping("/init")
public R init(String messageType){ public R init(String messageType){
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
String site = CommonMethods.getSite();
//消息类型 //消息类型
if(!StringUtil.isBlank(messageType)){
List<NcCode> ncByNG = ncCodeService.findNcByNG(messageType); List<NcCode> ncByNG = ncCodeService.findNcByNG(messageType);
String site = CommonMethods.getSite();
hashMap.put("ncByNG",ncByNG); hashMap.put("ncByNG",ncByNG);
}
//工作中心 //工作中心
WorkCenter workCenter = new WorkCenter(); WorkCenter workCenter = new WorkCenter();
workCenter.setWcCategory("LEVEL4"); workCenter.setWcCategory("LEVEL4");
@ -254,4 +258,10 @@ public class AbnormalBillController {
abnormalBillService.cancelBrowse(handle,cancelBrowse); abnormalBillService.cancelBrowse(handle,cancelBrowse);
return R.ok(); return R.ok();
} }
@GetMapping("/backLog")
public R backLog(AbnormalBillDto abnormalBillDto){
return R.ok(abnormalBillService.backLog(abnormalBillDto));
}
} }

64
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java
Unescape Escape View File

@ -0,0 +1,64 @@
package com.foreverwin.mesnac.anomaly.dto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import java.time.LocalDateTime;
/**
* @Description TODO
* @Author zhaojiawei
* @Since 2021-07-05
*/
public class AbnormalBillDto extends AbnormalBill {
/**
* seq
*/
String seq;
/**
* 物料描述
*/
String itemDescription;
/**
* 开始时间
*/
LocalDateTime startDateTime;
/**
* 结束时间
*/
LocalDateTime endDateTime;
public String getSeq() {
return seq;
}
public void setSeq(String seq) {
this.seq = seq;
}
public String getItemDescription() {
return itemDescription;
}
public void setItemDescription(String itemDescription) {
this.itemDescription = itemDescription;
}
public LocalDateTime getStartDateTime() {
return startDateTime;
}
public void setStartDateTime(LocalDateTime startDateTime) {
this.startDateTime = startDateTime;
}
public LocalDateTime getEndDateTime() {
return endDateTime;
}
public void setEndDateTime(LocalDateTime endDateTime) {
this.endDateTime = endDateTime;
}
}

10
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
Unescape Escape View File

@ -1,18 +1,22 @@
package com.foreverwin.mesnac.anomaly.mapper; package com.foreverwin.mesnac.anomaly.mapper;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
/** /**
* <p> * <p>
* 异常单 Mapper 接口 * 异常单 Mapper 接口
* </p> * </p>
* *
* @author robert * @author robert
* @since 2021-06-25 * @since 2021-07-05
*/ */
@Repository @Repository
public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> { public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
List<AbnormalBillDto> backLog(@Param("abnormalBill")AbnormalBillDto abnormalBillDto, @Param("language")String language);
} }

46
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
Unescape Escape View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -16,7 +15,7 @@ import java.time.LocalDateTime;
* </p> * </p>
* *
* @author robert * @author robert
* @since 2021-06-25 * @since 2021-07-05
*/ */
@TableName("Z_ABNORMAL_BILL") @TableName("Z_ABNORMAL_BILL")
@ -41,12 +40,12 @@ public class AbnormalBill extends Model<AbnormalBill> {
@TableField("ABNORMAL_NO") @TableField("ABNORMAL_NO")
private String abnormalNo; private String abnormalNo;
/** /**
* 异常状态 新建/响应中/方案确认/纠防确认/取消/关闭 * 异常状态 新建 N/ X响应中/F方案确认/J纠防确认/Q取消/G关闭
*/ */
@TableField("STATUS") @TableField("STATUS")
private String status; private String status;
/** /**
* 异常类型 * 异常类型 Q｜其他，Z｜质量，S｜设备
*/ */
@TableField("TYPE") @TableField("TYPE")
private String type; private String type;
@ -111,7 +110,7 @@ public class AbnormalBill extends Model<AbnormalBill> {
@TableField("NC_QTY") @TableField("NC_QTY")
private String ncQty; private String ncQty;
/** /**
* 问题等级 * 问题等级 A,B,C
*/ */
@TableField("PB_GRADE") @TableField("PB_GRADE")
private String pbGrade; private String pbGrade;
@ -131,22 +130,22 @@ public class AbnormalBill extends Model<AbnormalBill> {
@TableField("REPAIR_DATE_TIME") @TableField("REPAIR_DATE_TIME")
private LocalDateTime repairDateTime; private LocalDateTime repairDateTime;
/** /**
* 发现环节 * 发现环节 Z|自制 W| 外协 D｜到货 K｜客户
*/ */
@TableField("DISCOVER") @TableField("DISCOVER")
private String discover; private String discover;
/** /**
* 检验人员 * 检验人员
*/ */
@TableField("INSPECTER") @TableField("INSPECTOR")
private String inspecter; private String inspector;
/** /**
* 实物位置 * 实物位置
*/ */
@TableField("ENTITY_LOCATION") @TableField("ENTITY_LOCATION")
private String entityLocation; private String entityLocation;
/** /**
* 上报来源 * 上报来源 B｜自保。 J｜质检 R｜设备人员 Z｜设备自动
*/ */
@TableField("REPORT_FROM") @TableField("REPORT_FROM")
private String reportFrom; private String reportFrom;
@ -188,8 +187,8 @@ public class AbnormalBill extends Model<AbnormalBill> {
/** /**
* 创建日期 * 创建日期
*/ */
@TableField("CREATED_DATA_TIME") @TableField("CREATED_DATE_TIME")
private LocalDateTime createdDataTime; private LocalDateTime createdDateTime;
/** /**
* 修改人 * 修改人
*/ */
@ -201,6 +200,7 @@ public class AbnormalBill extends Model<AbnormalBill> {
@TableField("MODIFIED_DATE_TIME") @TableField("MODIFIED_DATE_TIME")
private LocalDateTime modifiedDateTime; private LocalDateTime modifiedDateTime;
public String getHandle() { public String getHandle() {
return handle; return handle;
} }
@ -377,12 +377,12 @@ public class AbnormalBill extends Model<AbnormalBill> {
this.discover = discover; this.discover = discover;
} }
public String getInspecter() { public String getInspector() {
return inspecter; return inspector;
} }
public void setInspecter(String inspecter) { public void setInspector(String inspector) {
this.inspecter = inspecter; this.inspector = inspector;
} }
public String getEntityLocation() { public String getEntityLocation() {
@ -457,12 +457,12 @@ public class AbnormalBill extends Model<AbnormalBill> {
this.createdUser = createdUser; this.createdUser = createdUser;
} }
public LocalDateTime getCreatedDataTime() { public LocalDateTime getCreatedDateTime() {
return createdDataTime; return createdDateTime;
} }
public void setCreatedDataTime(LocalDateTime createdDataTime) { public void setCreatedDateTime(LocalDateTime createdDateTime) {
this.createdDataTime = createdDataTime; this.createdDateTime = createdDateTime;
} }
public String getModifiedUser() { public String getModifiedUser() {
@ -525,7 +525,7 @@ public static final String REPAIR_DATE_TIME = "REPAIR_DATE_TIME";
public static final String DISCOVER = "DISCOVER"; public static final String DISCOVER = "DISCOVER";
public static final String INSPECTER = "INSPECTER"; public static final String INSPECTOR = "INSPECTOR";
public static final String ENTITY_LOCATION = "ENTITY_LOCATION"; public static final String ENTITY_LOCATION = "ENTITY_LOCATION";
@ -545,7 +545,7 @@ public static final String CANCEL_USER = "CANCEL_USER";
public static final String CREATED_USER = "CREATED_USER"; public static final String CREATED_USER = "CREATED_USER";
public static final String CREATED_DATA_TIME = "CREATED_DATA_TIME"; public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
public static final String MODIFIED_USER = "MODIFIED_USER"; public static final String MODIFIED_USER = "MODIFIED_USER";
@ -582,7 +582,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
", pbQty = " + pbQty + ", pbQty = " + pbQty +
", repairDateTime = " + repairDateTime + ", repairDateTime = " + repairDateTime +
", discover = " + discover + ", discover = " + discover +
", inspecter = " + inspecter + ", inspector = " + inspector +
", entityLocation = " + entityLocation + ", entityLocation = " + entityLocation +
", reportFrom = " + reportFrom + ", reportFrom = " + reportFrom +
", objectBo = " + objectBo + ", objectBo = " + objectBo +
@ -592,7 +592,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
", cancelDateTime = " + cancelDateTime + ", cancelDateTime = " + cancelDateTime +
", cancelUser = " + cancelUser + ", cancelUser = " + cancelUser +
", createdUser = " + createdUser + ", createdUser = " + createdUser +
", createdDataTime = " + createdDataTime + ", createdDateTime = " + createdDateTime +
", modifiedUser = " + modifiedUser + ", modifiedUser = " + modifiedUser +
", modifiedDateTime = " + modifiedDateTime + ", modifiedDateTime = " + modifiedDateTime +
"}"; "}";

10
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.foreverwin.mesnac.anomaly.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill; import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose; import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.FrontPage;
@ -14,7 +15,7 @@ import java.util.List;
* </p> * </p>
* *
* @author robert * @author robert
* @since 2021-06-25 * @since 2021-07-05
*/ */
public interface AbnormalBillService extends IService<AbnormalBill> { public interface AbnormalBillService extends IService<AbnormalBill> {
@ -49,4 +50,11 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose); String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
/**
* 待办事项
* @param abnormalBillDto
* @return
*/
List<AbnormalBillDto> backLog(AbnormalBillDto abnormalBillDto);
} }

19
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.foreverwin.mesnac.anomaly.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper; import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillMapper;
import com.foreverwin.mesnac.anomaly.model.*; import com.foreverwin.mesnac.anomaly.model.*;
import com.foreverwin.mesnac.anomaly.service.*; import com.foreverwin.mesnac.anomaly.service.*;
@ -18,11 +19,14 @@ import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.FrontPage;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/** /**
* <p> * <p>
@ -30,13 +34,14 @@ import java.util.*;
* </p> * </p>
* *
* @author robert * @author robert
* @since 2021-06-25 * @since 2021-07-05
*/ */
@Service @Service
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, AbnormalBill> implements AbnormalBillService { public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, AbnormalBill> implements AbnormalBillService {
@Autowired @Autowired
private AbnormalBillMapper abnormalBillMapper; private AbnormalBillMapper abnormalBillMapper;
@ -64,7 +69,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
@Autowired @Autowired
private AbnormalDutyService abnormalDutyService; private AbnormalDutyService abnormalDutyService;
@Override @Override
public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) { public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) {
QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>(); QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
@ -153,6 +157,12 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
return abnormalBill.getAbnormalNo(); return abnormalBill.getAbnormalNo();
} }
@Override
public List<AbnormalBillDto> backLog(AbnormalBillDto abnormalBillDto) {
String language = LocaleContextHolder.getLocale().getLanguage();
return abnormalBillMapper.backLog(abnormalBillDto, language);
}
@Override @Override
public void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType) { public void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType) {
@ -234,7 +244,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
//设置创建时间和更新时间 //设置创建时间和更新时间
if(abnormalBillMapper.selectById(abnormalBill.getHandle()) == null){ if(abnormalBillMapper.selectById(abnormalBill.getHandle()) == null){
abnormalBill.setCreatedDataTime(currentTime); abnormalBill.setCreatedDateTime(currentTime);
abnormalBill.setCreatedUser(user); abnormalBill.setCreatedUser(user);
abnormalBillDispose.setCreatedDataTime(currentTime); abnormalBillDispose.setCreatedDataTime(currentTime);
abnormalBillDispose.setCreatedUser(user); abnormalBillDispose.setCreatedUser(user);
@ -294,4 +304,5 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
abnormalBill.setCancelUser(CommonMethods.getUser()); abnormalBill.setCancelUser(CommonMethods.getUser());
abnormalBill.setCancelDateTime(now); abnormalBill.setCancelDateTime(now);
} }
} }

116
anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
Unescape Escape View File

@ -26,7 +26,7 @@
<result column="PB_QTY" property="pbQty" /> <result column="PB_QTY" property="pbQty" />
<result column="REPAIR_DATE_TIME" property="repairDateTime" /> <result column="REPAIR_DATE_TIME" property="repairDateTime" />
<result column="DISCOVER" property="discover" /> <result column="DISCOVER" property="discover" />
<result column="INSPECTER" property="inspecter" /> <result column="INSPECTOR" property="inspector" />
<result column="ENTITY_LOCATION" property="entityLocation" /> <result column="ENTITY_LOCATION" property="entityLocation" />
<result column="REPORT_FROM" property="reportFrom" /> <result column="REPORT_FROM" property="reportFrom" />
<result column="OBJECT_BO" property="objectBo" /> <result column="OBJECT_BO" property="objectBo" />
@ -36,14 +36,21 @@
<result column="CANCEL_DATE_TIME" property="cancelDateTime" /> <result column="CANCEL_DATE_TIME" property="cancelDateTime" />
<result column="CANCEL_USER" property="cancelUser" /> <result column="CANCEL_USER" property="cancelUser" />
<result column="CREATED_USER" property="createdUser" /> <result column="CREATED_USER" property="createdUser" />
<result column="CREATED_DATA_TIME" property="createdDataTime" /> <result column="CREATED_DATE_TIME" property="createdDateTime" />
<result column="MODIFIED_USER" property="modifiedUser" /> <result column="MODIFIED_USER" property="modifiedUser" />
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" /> <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
</resultMap> </resultMap>
<resultMap id="abnormalBillDto" type="com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto" extends="BaseResultMap">
<result column="SEQ" property="seq"/>
<result column="ITEM_DESCRIPTION" property="itemDescription"/>
<result column="START_DATE_TIME" property="startDateTime"/>
<result column="END_DATE_TIME" property="endDateTime"/>
</resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTER, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
</sql> </sql>
<!-- BaseMapper标准查询/修改/删除 --> <!-- BaseMapper标准查询/修改/删除 -->
@ -99,7 +106,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -109,7 +116,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</where> </where>
@ -144,7 +151,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -154,7 +161,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if> </if>
@ -197,7 +204,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -207,7 +214,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if> </if>
@ -250,7 +257,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -260,7 +267,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if> </if>
@ -303,7 +310,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -313,7 +320,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if> </if>
@ -356,7 +363,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -366,7 +373,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if> </if>
@ -409,7 +416,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -419,7 +426,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if> </if>
@ -458,7 +465,7 @@
<if test="pbQty!=null">PB_QTY,</if> <if test="pbQty!=null">PB_QTY,</if>
<if test="repairDateTime!=null">REPAIR_DATE_TIME,</if> <if test="repairDateTime!=null">REPAIR_DATE_TIME,</if>
<if test="discover!=null">DISCOVER,</if> <if test="discover!=null">DISCOVER,</if>
<if test="inspecter!=null">INSPECTER,</if> <if test="inspector!=null">INSPECTOR,</if>
<if test="entityLocation!=null">ENTITY_LOCATION,</if> <if test="entityLocation!=null">ENTITY_LOCATION,</if>
<if test="reportFrom!=null">REPORT_FROM,</if> <if test="reportFrom!=null">REPORT_FROM,</if>
<if test="objectBo!=null">OBJECT_BO,</if> <if test="objectBo!=null">OBJECT_BO,</if>
@ -468,7 +475,7 @@
<if test="cancelDateTime!=null">CANCEL_DATE_TIME,</if> <if test="cancelDateTime!=null">CANCEL_DATE_TIME,</if>
<if test="cancelUser!=null">CANCEL_USER,</if> <if test="cancelUser!=null">CANCEL_USER,</if>
<if test="createdUser!=null">CREATED_USER,</if> <if test="createdUser!=null">CREATED_USER,</if>
<if test="createdDataTime!=null">CREATED_DATA_TIME,</if> <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
<if test="modifiedUser!=null">MODIFIED_USER,</if> <if test="modifiedUser!=null">MODIFIED_USER,</if>
<if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if> <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
</trim> VALUES </trim> VALUES
@ -495,7 +502,7 @@
<if test="pbQty!=null">#{pbQty},</if> <if test="pbQty!=null">#{pbQty},</if>
<if test="repairDateTime!=null">#{repairDateTime},</if> <if test="repairDateTime!=null">#{repairDateTime},</if>
<if test="discover!=null">#{discover},</if> <if test="discover!=null">#{discover},</if>
<if test="inspecter!=null">#{inspecter},</if> <if test="inspector!=null">#{inspector},</if>
<if test="entityLocation!=null">#{entityLocation},</if> <if test="entityLocation!=null">#{entityLocation},</if>
<if test="reportFrom!=null">#{reportFrom},</if> <if test="reportFrom!=null">#{reportFrom},</if>
<if test="objectBo!=null">#{objectBo},</if> <if test="objectBo!=null">#{objectBo},</if>
@ -505,7 +512,7 @@
<if test="cancelDateTime!=null">#{cancelDateTime},</if> <if test="cancelDateTime!=null">#{cancelDateTime},</if>
<if test="cancelUser!=null">#{cancelUser},</if> <if test="cancelUser!=null">#{cancelUser},</if>
<if test="createdUser!=null">#{createdUser},</if> <if test="createdUser!=null">#{createdUser},</if>
<if test="createdDataTime!=null">#{createdDataTime},</if> <if test="createdDateTime!=null">#{createdDateTime},</if>
<if test="modifiedUser!=null">#{modifiedUser},</if> <if test="modifiedUser!=null">#{modifiedUser},</if>
<if test="modifiedDateTime!=null">#{modifiedDateTime},</if> <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
</trim> </trim>
@ -539,7 +546,7 @@
#{pbQty}, #{pbQty},
#{repairDateTime}, #{repairDateTime},
#{discover}, #{discover},
#{inspecter}, #{inspector},
#{entityLocation}, #{entityLocation},
#{reportFrom}, #{reportFrom},
#{objectBo}, #{objectBo},
@ -549,7 +556,7 @@
#{cancelDateTime}, #{cancelDateTime},
#{cancelUser}, #{cancelUser},
#{createdUser}, #{createdUser},
#{createdDataTime}, #{createdDateTime},
#{modifiedUser}, #{modifiedUser},
#{modifiedDateTime}, #{modifiedDateTime},
</trim> </trim>
@ -579,7 +586,7 @@
<if test="et.pbQty!=null">PB_QTY=#{et.pbQty},</if> <if test="et.pbQty!=null">PB_QTY=#{et.pbQty},</if>
<if test="et.repairDateTime!=null">REPAIR_DATE_TIME=#{et.repairDateTime},</if> <if test="et.repairDateTime!=null">REPAIR_DATE_TIME=#{et.repairDateTime},</if>
<if test="et.discover!=null">DISCOVER=#{et.discover},</if> <if test="et.discover!=null">DISCOVER=#{et.discover},</if>
<if test="et.inspecter!=null">INSPECTER=#{et.inspecter},</if> <if test="et.inspector!=null">INSPECTOR=#{et.inspector},</if>
<if test="et.entityLocation!=null">ENTITY_LOCATION=#{et.entityLocation},</if> <if test="et.entityLocation!=null">ENTITY_LOCATION=#{et.entityLocation},</if>
<if test="et.reportFrom!=null">REPORT_FROM=#{et.reportFrom},</if> <if test="et.reportFrom!=null">REPORT_FROM=#{et.reportFrom},</if>
<if test="et.objectBo!=null">OBJECT_BO=#{et.objectBo},</if> <if test="et.objectBo!=null">OBJECT_BO=#{et.objectBo},</if>
@ -589,7 +596,7 @@
<if test="et.cancelDateTime!=null">CANCEL_DATE_TIME=#{et.cancelDateTime},</if> <if test="et.cancelDateTime!=null">CANCEL_DATE_TIME=#{et.cancelDateTime},</if>
<if test="et.cancelUser!=null">CANCEL_USER=#{et.cancelUser},</if> <if test="et.cancelUser!=null">CANCEL_USER=#{et.cancelUser},</if>
<if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if> <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
<if test="et.createdDataTime!=null">CREATED_DATA_TIME=#{et.createdDataTime},</if> <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
<if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if> <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if> <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</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> </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>
@ -619,7 +626,7 @@
PB_QTY=#{et.pbQty}, PB_QTY=#{et.pbQty},
REPAIR_DATE_TIME=#{et.repairDateTime}, REPAIR_DATE_TIME=#{et.repairDateTime},
DISCOVER=#{et.discover}, DISCOVER=#{et.discover},
INSPECTER=#{et.inspecter}, INSPECTOR=#{et.inspector},
ENTITY_LOCATION=#{et.entityLocation}, ENTITY_LOCATION=#{et.entityLocation},
REPORT_FROM=#{et.reportFrom}, REPORT_FROM=#{et.reportFrom},
OBJECT_BO=#{et.objectBo}, OBJECT_BO=#{et.objectBo},
@ -629,7 +636,7 @@
CANCEL_DATE_TIME=#{et.cancelDateTime}, CANCEL_DATE_TIME=#{et.cancelDateTime},
CANCEL_USER=#{et.cancelUser}, CANCEL_USER=#{et.cancelUser},
CREATED_USER=#{et.createdUser}, CREATED_USER=#{et.createdUser},
CREATED_DATA_TIME=#{et.createdDataTime}, CREATED_DATE_TIME=#{et.createdDateTime},
MODIFIED_USER=#{et.modifiedUser}, MODIFIED_USER=#{et.modifiedUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime}, MODIFIED_DATE_TIME=#{et.modifiedDateTime},
</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> </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>
@ -659,7 +666,7 @@
<if test="et.pbQty!=null">PB_QTY=#{et.pbQty},</if> <if test="et.pbQty!=null">PB_QTY=#{et.pbQty},</if>
<if test="et.repairDateTime!=null">REPAIR_DATE_TIME=#{et.repairDateTime},</if> <if test="et.repairDateTime!=null">REPAIR_DATE_TIME=#{et.repairDateTime},</if>
<if test="et.discover!=null">DISCOVER=#{et.discover},</if> <if test="et.discover!=null">DISCOVER=#{et.discover},</if>
<if test="et.inspecter!=null">INSPECTER=#{et.inspecter},</if> <if test="et.inspector!=null">INSPECTOR=#{et.inspector},</if>
<if test="et.entityLocation!=null">ENTITY_LOCATION=#{et.entityLocation},</if> <if test="et.entityLocation!=null">ENTITY_LOCATION=#{et.entityLocation},</if>
<if test="et.reportFrom!=null">REPORT_FROM=#{et.reportFrom},</if> <if test="et.reportFrom!=null">REPORT_FROM=#{et.reportFrom},</if>
<if test="et.objectBo!=null">OBJECT_BO=#{et.objectBo},</if> <if test="et.objectBo!=null">OBJECT_BO=#{et.objectBo},</if>
@ -669,7 +676,7 @@
<if test="et.cancelDateTime!=null">CANCEL_DATE_TIME=#{et.cancelDateTime},</if> <if test="et.cancelDateTime!=null">CANCEL_DATE_TIME=#{et.cancelDateTime},</if>
<if test="et.cancelUser!=null">CANCEL_USER=#{et.cancelUser},</if> <if test="et.cancelUser!=null">CANCEL_USER=#{et.cancelUser},</if>
<if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if> <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
<if test="et.createdDataTime!=null">CREATED_DATA_TIME=#{et.createdDataTime},</if> <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
<if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if> <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if> <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
</trim> </trim>
@ -698,7 +705,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -708,7 +715,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if> </if>
@ -768,7 +775,7 @@
<if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if> <if test="ew.entity.pbQty!=null"> AND PB_QTY=#{ew.entity.pbQty}</if>
<if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if> <if test="ew.entity.repairDateTime!=null"> AND REPAIR_DATE_TIME=#{ew.entity.repairDateTime}</if>
<if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if> <if test="ew.entity.discover!=null"> AND DISCOVER=#{ew.entity.discover}</if>
<if test="ew.entity.inspecter!=null"> AND INSPECTER=#{ew.entity.inspecter}</if> <if test="ew.entity.inspector!=null"> AND INSPECTOR=#{ew.entity.inspector}</if>
<if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if> <if test="ew.entity.entityLocation!=null"> AND ENTITY_LOCATION=#{ew.entity.entityLocation}</if>
<if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if> <if test="ew.entity.reportFrom!=null"> AND REPORT_FROM=#{ew.entity.reportFrom}</if>
<if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if> <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@ -778,7 +785,7 @@
<if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if> <if test="ew.entity.cancelDateTime!=null"> AND CANCEL_DATE_TIME=#{ew.entity.cancelDateTime}</if>
<if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if> <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
<if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if> <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
<if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if> <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if> <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if> <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if> </if>
@ -798,5 +805,48 @@
</foreach>) </foreach>)
</delete> </delete>
<!-- BaseMapper标准查询/修改/删除 --> <!-- BaseMapper标准查询/修改/删除 -->
<select id="backLog" resultMap="abnormalBillDto">
SELECT ROW_NUMBER() OVER(ORDER BY zab.ABNORMAL_NO ASC) SEQ,zab.ABNORMAL_NO ABNORMAL_NO,
zab.STATUS STATUS, it.DESCRIPTION ITEM_DESCRIPTION, zab.CREATED_DATE_TIME CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME RESPONSE_DATE_TIME
,zab.CREATED_USER CREATED_USER,
zab.NC_CODE NC_CODE,zab.PB_DESCRIPTION PB_DESCRIPTION
FROM Z_ABNORMAL_BILL zab
INNER JOIN ITEM i ON zab.ITEM_BO = i.HANDLE
LEFT JOIN ITEM_T it ON i.HANDLE = it.ITEM_BO AND it.LOCALE = #{language}
<where>
<if test="abnormalBill != null">
<if test="abnormalBill.site != null and abnormalBill.site != ''">
zab.SITE = #{abnormalBill.site}
</if>
<if test="abnormalBill.resrce != null and abnormalBill.resrce != ''">
AND zab.RESRCE = #{abnormalBill.resrce}
</if>
<if test="abnormalBill.shopOrder != null and abnormalBill.shopOrder != ''">
AND zab.SHOP_ORDER = #{abnormalBill.shopOrder}
</if>
<if test="abnormalBill.abnormalNo != null and abnormalBill.abnormalNo != ''">
AND zab.ABNORMAL_NO = #{abnormalBill.abnormalNo}
</if>
<if test="abnormalBill.status != null and abnormalBill.status != ''">
AND zab.STATUS = #{abnormalBill.status}
</if>
<if test="abnormalBill.startDateTime != null ">
AND zab.CREATED_DATE_TIME &gt;= #{abnormalBill.startDateTime}
</if>
<if test="abnormalBill.endDateTime != null">
AND zab.CREATED_DATE_TIME &lt;= #{abnormalBill.endDateTime}
</if>
<if test="abnormalBill.workCenter != null and abnormalBill.workCenter != ''">
AND zab.WORK_CENTER = #{abnormalBill.workCenter}
</if>
<if test="abnormalBill.type != null and abnormalBill.type != ''">
AND zab.TYPE = #{abnormalBill.type}
</if>
<if test="abnormalBill.reportFrom != null and abnormalBill.reportFrom != ''">
AND zab.REPORT_FROM = #{abnormalBill.reportFrom}
</if>
</if>
</where>
</select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save