Merge remote-tracking branch 'origin/master'

master
shaoyong 2 years ago
commit 40b350ac8b

@ -10,6 +10,15 @@ public class BoardDTO {
private Integer totalNum;
private String equTypeCode;
private String equTypeName;
private String shiftId;
public String getShiftId() {
return shiftId;
}
public void setShiftId(String shiftId) {
this.shiftId = shiftId;
}
public String getEquName() {
return equName;

@ -31,11 +31,32 @@ import com.op.common.core.web.page.TableDataInfo;
* @date 2023-10-16
*/
@RestController
@RequestMapping("/plan")
@RequestMapping("/inspectionPlan")
public class EquPlanController extends BaseController {
@Autowired
private IEquPlanService equPlanService;
/**
*
*
* @param equPlan
* @return
*/
@PostMapping("/initUpdatePlanInfo")
public AjaxResult initUpdatePlanInfo(@RequestBody EquPlan equPlan) {
return equPlanService.initUpdatePlanInfo(equPlan);
}
/**
*
*
* @return
*/
@GetMapping("/getWorkCenter")
public AjaxResult getWorkCenter() {
return equPlanService.getWorkCenter();
}
/**
* list
*
@ -57,18 +78,19 @@ public class EquPlanController extends BaseController {
return equPlanService.formatEquItem(equPlanEquList);
}
/**
* list
* @param equEquipment
* @return
*/
@RequiresPermissions("device:plan:list")
@GetMapping("/getEquList")
public TableDataInfo getEquList(EquEquipment equEquipment) {
startPage();
List<EquEquipment> list = equPlanService.getEquList(equEquipment);
return getDataTable(list);
}
/**
* list
*
* @param equEquipment
* @return
*/
@RequiresPermissions("device:plan:list")
@GetMapping("/getEquList")
public TableDataInfo getEquList(EquEquipment equEquipment) {
startPage();
List<EquEquipment> list = equPlanService.getEquList(equEquipment);
return getDataTable(list);
}
/**
*
@ -119,7 +141,7 @@ public class EquPlanController extends BaseController {
@Log(title = "计划", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody EquPlan equPlan) {
return toAjax(equPlanService.updateEquPlan(equPlan));
return equPlanService.updateEquPlan(equPlan);
}
/**
@ -129,6 +151,6 @@ public class EquPlanController extends BaseController {
@Log(title = "计划", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}")
public AjaxResult remove(@PathVariable String[] planIds) {
return toAjax(equPlanService.deleteEquPlanByPlanIds(planIds));
return equPlanService.deleteEquPlanByPlanIds(planIds);
}
}

@ -131,6 +131,28 @@ public class EquPlan extends BaseEntity {
private List<EquPlanEqu> equipmentItem;
private List<SysUser> personList;
private List<Date> planTimeArray;
private List<Long> personListVO;
public List<Long> getPersonListVO() {
return personListVO;
}
public void setPersonListVO(List<Long> personListVO) {
this.personListVO = personListVO;
}
public List<Date> getPlanTimeArray() {
return planTimeArray;
}
public void setPlanTimeArray(List<Date> planTimeArray) {
this.planTimeArray = planTimeArray;
}
public List<EquPlanEqu> getEquipmentItem() {
return equipmentItem;
}
@ -139,8 +161,6 @@ public class EquPlan extends BaseEntity {
this.equipmentItem = equipmentItem;
}
private List<SysUser> personList;
public List<SysUser> getPersonList() {
return personList;
}

@ -77,6 +77,17 @@ public class EquPlanDetail extends BaseEntity {
// 关联-检查项->检查详情list
private List<EquPlanStandard> equPlanStandardList;
// 主计划code
private String planCode;
public String getPlanCode() {
return planCode;
}
public void setPlanCode(String planCode) {
this.planCode = planCode;
}
public List<EquPlanStandard> getEquPlanStandardList() {
return equPlanStandardList;
}

@ -61,6 +61,17 @@ public class EquPlanEqu extends BaseEntity {
private String itemTempName;
// 主计划code
private String planCode;
public String getPlanCode() {
return planCode;
}
public void setPlanCode(String planCode) {
this.planCode = planCode;
}
public String getItemTempName() {
return itemTempName;
}

@ -0,0 +1,133 @@
package com.op.device.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* equ_plan_person
*
* @author Open Platform
* @date 2023-10-19
*/
public class EquPlanPerson extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键 */
private String id;
/** 计划编码 */
@Excel(name = "计划编码")
private String planCode;
/** 用户id */
@Excel(name = "用户id")
private Long userId;
/** 账号 */
@Excel(name = "账号")
private String userName;
/** 工厂 */
@Excel(name = "工厂")
private String factoryCode;
/** 备用字段1 */
@Excel(name = "备用字段1")
private String attr1;
/** 备用字段2 */
@Excel(name = "备用字段2")
private String attr2;
/** 备用字段3 */
@Excel(name = "备用字段3")
private String attr3;
/** 删除标识 */
private String delFlag;
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setPlanCode(String planCode) {
this.planCode = planCode;
}
public String getPlanCode() {
return planCode;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getUserId() {
return userId;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getUserName() {
return userName;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("planCode", getPlanCode())
.append("userId", getUserId())
.append("userName", getUserName())
.append("factoryCode", getFactoryCode())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

@ -69,6 +69,37 @@ public class EquPlanStandard extends BaseEntity {
/** 删除标识 */
private String delFlag;
// 主计划code
private String planCode;
private String itemName;
private String standardTypeName;
public String getStandardTypeName() {
return standardTypeName;
}
public void setStandardTypeName(String standardTypeName) {
this.standardTypeName = standardTypeName;
}
public String getItemName() {
return itemName;
}
public void setItemName(String itemName) {
this.itemName = itemName;
}
public String getPlanCode() {
return planCode;
}
public void setPlanCode(String planCode) {
this.planCode = planCode;
}
public void setId(String id) {
this.id = id;
}

@ -0,0 +1,44 @@
package com.op.device.domain;
// 工作中心实体类
public class WorkCenter {
private int factoryId;
private String factoryName;
private String factoryCode;
private String fType;
public int getFactoryId() {
return factoryId;
}
public void setFactoryId(int factoryId) {
this.factoryId = factoryId;
}
public String getFactoryName() {
return factoryName;
}
public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getfType() {
return fType;
}
public void setfType(String fType) {
this.fType = fType;
}
}

@ -58,4 +58,23 @@ public interface EquPlanDetailMapper {
* @return
*/
public int deleteEquPlanDetailByIds(String[] ids);
/**
* code
* @param planCode
* @return
*/
List<EquPlanDetail> selectEquPlanDetailByPlanCode(String planCode);
/**
* code
* @param planCode
*/
void deleteEquPlanDetailByPlanCode(String planCode);
/**
*
* @param planCode
*/
void delEquPlanDetailByPlanCode(String planCode);
}

@ -58,4 +58,23 @@ public interface EquPlanEquMapper {
* @return
*/
public int deleteEquPlanEquByIds(String[] ids);
/**
* codelist
* @param planCode
* @return
*/
List<EquPlanEqu> selectEquPlanEquByPlanCode(String planCode);
/**
* code
* @param planCode
*/
void deleteEquPlanEquByPlanCode(String planCode);
/**
*
* @param planCode
*/
void delEquPlanEquByPlanCode(String planCode);
}

@ -5,6 +5,7 @@ import java.util.List;
import com.op.device.domain.EquCheckItem;
import com.op.device.domain.EquCheckItemDetail;
import com.op.device.domain.EquPlan;
import com.op.device.domain.WorkCenter;
import com.op.device.domain.dto.InspectionPlanDTO;
import com.op.device.domain.vo.InspectionPlanVO;
@ -62,4 +63,30 @@ public interface EquPlanMapper {
* @return
*/
public int deleteEquPlanByPlanIds(String[] planIds);
/**
*
* @return
*/
int selectSerialNumber();
/**
* list
* @param factory
* @return
*/
List<WorkCenter> selectWorkCenter(String factory);
/**
*
* @param planCode
* @return
*/
EquPlan selectEquPlanByPlanCode(String planCode);
/**
*
* @param planCode
*/
void delEquPlanByPlanCode(String planCode);
}

@ -0,0 +1,80 @@
package com.op.device.mapper;
import java.util.List;
import com.op.device.domain.EquPlanPerson;
/**
* Mapper
*
* @author Open Platform
* @date 2023-10-19
*/
public interface EquPlanPersonMapper {
/**
*
*
* @param id
* @return
*/
public EquPlanPerson selectEquPlanPersonById(String id);
/**
*
*
* @param equPlanPerson
* @return
*/
public List<EquPlanPerson> selectEquPlanPersonList(EquPlanPerson equPlanPerson);
/**
*
*
* @param equPlanPerson
* @return
*/
public int insertEquPlanPerson(EquPlanPerson equPlanPerson);
/**
*
*
* @param equPlanPerson
* @return
*/
public int updateEquPlanPerson(EquPlanPerson equPlanPerson);
/**
*
*
* @param id
* @return
*/
public int deleteEquPlanPersonById(String id);
/**
*
*
* @param ids
* @return
*/
public int deleteEquPlanPersonByIds(String[] ids);
/**
* codelist
* @param planCode
* @return
*/
List<EquPlanPerson> selectEquPlanPersonByPlanCode(String planCode);
/**
* code
* @param planCode
*/
void deleteEquPlanPersonByPlanCode(String planCode);
/**
*
* @param planCode
*/
void delEquPlanPersonByPlanCode(String planCode);
}

@ -58,4 +58,23 @@ public interface EquPlanStandardMapper {
* @return
*/
public int deleteEquPlanStandardByIds(String[] ids);
/**
* code
* @param planCode
* @return
*/
List<EquPlanStandard> selectEquPlanStandardByPlanCode(String planCode);
/**
* code
* @param planCode
*/
void deleteEquPlanStandardByPlanCode(String planCode);
/**
*
* @param planCode
*/
void delEquPlanStandardByPlanCode(String planCode);
}

@ -46,7 +46,7 @@ public interface IEquPlanService {
* @param equPlan
* @return
*/
public int updateEquPlan(EquPlan equPlan);
public AjaxResult updateEquPlan(EquPlan equPlan);
/**
*
@ -54,7 +54,7 @@ public interface IEquPlanService {
* @param planIds
* @return
*/
public int deleteEquPlanByPlanIds(String[] planIds);
public AjaxResult deleteEquPlanByPlanIds(String[] planIds);
/**
*
@ -83,4 +83,17 @@ public interface IEquPlanService {
* @return
*/
AjaxResult getPersonList();
/**
*
* @return
*/
AjaxResult getWorkCenter();
/**
*
* @param equPlan
* @return
*/
AjaxResult initUpdatePlanInfo(EquPlan equPlan);
}

@ -1,23 +1,32 @@
package com.op.device.service.impl;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.*;
import com.op.device.mapper.*;
import com.op.system.api.domain.SysUser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.device.service.IEquPlanService;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import static com.op.common.core.web.domain.AjaxResult.success;
/**
* Service
*
*
* @author Open Platform
* @date 2023-10-16
*/
@ -31,8 +40,16 @@ public class EquPlanServiceImpl implements IEquPlanService {
private EquCheckItemDetailMapper equCheckItemDetailMapper;
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
private EquEquipmentMapper equEquipmentMapper;
@Autowired
private EquEquipmentMapper equEquipmentMapper;
@Autowired
private EquPlanPersonMapper equPlanPersonMapper;
@Autowired
private EquPlanStandardMapper equPlanStandardMapper;
@Autowired
private EquPlanDetailMapper equPlanDetailMapper;
@Autowired
private EquPlanEquMapper equPlanEquMapper;
/**
*
@ -83,7 +100,33 @@ public class EquPlanServiceImpl implements IEquPlanService {
@Override
@DS("#header.poolName")
public AjaxResult insertEquPlan(EquPlan equPlan) {
// 处理计划信息
// 获取计划流水号
String planSerialNum = String.format("%03d", equPlanMapper.selectSerialNumber());
//获取当前所选工厂
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
String str = request.getHeader(key.substring(8));
int index = str.indexOf("_");
String factory = str.substring(index + 1);
equPlan.setPlanId(IdUtils.fastSimpleUUID());
equPlan.setPlanCode((DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + planSerialNum));
equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));
equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));
equPlan.setFactoryCode(factory);
equPlan.setCreateBy(SecurityContextHolder.getUserName());
equPlan.setCreateTime(DateUtils.getNowDate());
equPlan.setUpdateBy(SecurityContextHolder.getUserName());
equPlan.setUpdateTime(DateUtils.getNowDate());
// 插入设备、人员、检查项、标准信息
insertCommonInfo(equPlan, factory);
// 主计划插入数据库
equPlanMapper.insertEquPlan(equPlan);
return success();
}
@ -95,9 +138,28 @@ public class EquPlanServiceImpl implements IEquPlanService {
*/
@Override
@DS("#header.poolName")
public int updateEquPlan(EquPlan equPlan) {
equPlan.setUpdateTime(DateUtils.getNowDate());
return equPlanMapper.updateEquPlan(equPlan);
public AjaxResult updateEquPlan(EquPlan equPlan) {
// 更新巡检计划
equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));
equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));
equPlanMapper.updateEquPlan(equPlan);
// 删除该计划下设备、人员、检查项、标准
equPlanPersonMapper.deleteEquPlanPersonByPlanCode(equPlan.getPlanCode());
equPlanDetailMapper.deleteEquPlanDetailByPlanCode(equPlan.getPlanCode());
equPlanEquMapper.deleteEquPlanEquByPlanCode(equPlan.getPlanCode());
equPlanStandardMapper.deleteEquPlanStandardByPlanCode(equPlan.getPlanCode());
//获取当前所选工厂
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
String str = request.getHeader(key.substring(8));
int index = str.indexOf("_");
String factory = str.substring(index + 1);
// 插入设备、人员、检查项、标准信息
insertCommonInfo(equPlan, factory);
return success();
}
/**
@ -108,8 +170,17 @@ public class EquPlanServiceImpl implements IEquPlanService {
*/
@Override
@DS("#header.poolName")
public int deleteEquPlanByPlanIds(String[] planIds) {
return equPlanMapper.deleteEquPlanByPlanIds(planIds);
public AjaxResult deleteEquPlanByPlanIds(String[] planIds) {
// 逻辑删除信息
for (String id : planIds) {
EquPlan equPlan = equPlanMapper.selectEquPlanByPlanId(id);
equPlanMapper.delEquPlanByPlanCode(equPlan.getPlanCode());
equPlanPersonMapper.delEquPlanPersonByPlanCode(equPlan.getPlanCode());
equPlanDetailMapper.delEquPlanDetailByPlanCode(equPlan.getPlanCode());
equPlanEquMapper.delEquPlanEquByPlanCode(equPlan.getPlanCode());
equPlanStandardMapper.delEquPlanStandardByPlanCode(equPlan.getPlanCode());
}
return success();
}
/**
@ -121,19 +192,20 @@ public class EquPlanServiceImpl implements IEquPlanService {
@Override
@DS("#header.poolName")
public int deleteEquPlanByPlanId(String planId) {
return equPlanMapper.deleteEquPlanByPlanId(planId);
return 1;
}
/**
* list
* @param equEquipment
* @return
*/
@Override
@DS("#header.poolName")
public List<EquEquipment> getEquList(EquEquipment equEquipment) {
return equEquipmentMapper.selectEquEquipmentList(equEquipment);
}
/**
* list
*
* @param equEquipment
* @return
*/
@Override
@DS("#header.poolName")
public List<EquEquipment> getEquList(EquEquipment equEquipment) {
return equEquipmentMapper.selectEquEquipmentList(equEquipment);
}
/**
* -
@ -173,6 +245,7 @@ public class EquPlanServiceImpl implements IEquPlanService {
/**
* list
*
* @return
*/
@Override
@ -182,4 +255,194 @@ public class EquPlanServiceImpl implements IEquPlanService {
List<SysUser> personList = sysUserMapper.selectSysUserList(sysUser);
return success(personList);
}
/**
*
*
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult getWorkCenter() {
//获取当前所选工厂
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
String str = request.getHeader(key.substring(8));
int index = str.indexOf("_");
String factory = str.substring(index + 1);
equPlanMapper.selectWorkCenter(factory);
return success(equPlanMapper.selectWorkCenter(factory));
}
/**
*
*
* @param equPlan
* @return
*/
@Override
@DS("#header.poolName")
public AjaxResult initUpdatePlanInfo(EquPlan equPlan) {
// 获取计划信息
EquPlan plan = equPlanMapper.selectEquPlanByPlanCode(equPlan.getPlanCode());
// 处理计划信息
List<Date> planTimeArray = new ArrayList<>();
planTimeArray.add(plan.getPlanLoopStart());
planTimeArray.add(plan.getPlanLoopEnd());
plan.setPlanTimeArray(planTimeArray);
// 获取人员信息
List<EquPlanPerson> personList = equPlanPersonMapper.selectEquPlanPersonByPlanCode(equPlan.getPlanCode());
List<Long> persons = new ArrayList<>();
for (EquPlanPerson person : personList) {
persons.add(person.getUserId());
}
// 获取设备信息
List<EquPlanEqu> equipmentList = equPlanEquMapper.selectEquPlanEquByPlanCode(equPlan.getPlanCode());
for (EquPlanEqu equipment : equipmentList) {
// 获取检查项list
EquPlanDetail selectDetail = new EquPlanDetail();
selectDetail.setParentCode(equipment.getCode());
selectDetail.setPlanCode(equPlan.getPlanCode());
List<EquPlanDetail> detailList = equPlanDetailMapper.selectEquPlanDetailList(selectDetail);
for (EquPlanDetail detail : detailList) {
// 获取标准list
EquPlanStandard selectStandard = new EquPlanStandard();
selectStandard.setParentCode(detail.getCode());
selectStandard.setPlanCode(equPlan.getPlanCode());
List<EquPlanStandard> standardList = equPlanStandardMapper.selectEquPlanStandardList(selectStandard);
// 置入标准
detail.setEquPlanStandardList(standardList);
}
// 置入检查项
equipment.setEquPlanDetailList(detailList);
}
plan.setEquipmentItem(equipmentList);
plan.setPersonListVO(persons);
return success(plan);
}
/**
*
*
* @param equPlan
* @param factory
*/
private void insertCommonInfo(EquPlan equPlan, String factory) {
// 处理计划-巡检人员信息
List<SysUser> personList = equPlan.getPersonList();
for (SysUser user : personList) {
EquPlanPerson equPlanPerson = new EquPlanPerson();
equPlanPerson.setId(IdUtils.fastSimpleUUID());
equPlanPerson.setUserId(user.getUserId());
equPlanPerson.setPlanCode(equPlan.getPlanCode());
equPlanPerson.setFactoryCode(factory);
equPlanPerson.setCreateBy(SecurityContextHolder.getUserName());
equPlanPerson.setCreateTime(DateUtils.getNowDate());
equPlanPerson.setUpdateBy(SecurityContextHolder.getUserName());
equPlanPerson.setUpdateTime(DateUtils.getNowDate());
equPlanPersonMapper.insertEquPlanPerson(equPlanPerson);
}
// 处理计划1-n设备信息
List<EquPlanEqu> equipmentItemList = equPlan.getEquipmentItem();
// 计划-设备流水号
int equipmentCodeTemp = 0;
for (EquPlanEqu equipment : equipmentItemList) {
equipment.setId(IdUtils.fastSimpleUUID());
equipment.setPlanCode(equPlan.getPlanCode());
equipment.setCode("E" + equPlan.getPlanCode() + String.format("%02d", ++equipmentCodeTemp));
equipment.setParentCode(equPlan.getPlanCode());
equipment.setFactoryCode(factory);
equipment.setCreateBy(SecurityContextHolder.getUserName());
equipment.setCreateTime(DateUtils.getNowDate());
equipment.setUpdateBy(SecurityContextHolder.getUserName());
equipment.setUpdateTime(DateUtils.getNowDate());
// 处理检查项信息
List<EquCheckItem> equCheckItemList = equipment.getEquCheckItemList();
if (equCheckItemList != null) {
// 计划检查项流水号
int itemCodeTemp = 0;
for (EquCheckItem item : equCheckItemList) {
if (item != null) {
EquPlanDetail planDetail = new EquPlanDetail();
BeanUtils.copyProperties(item, planDetail);
planDetail.setId(IdUtils.fastSimpleUUID());
planDetail.setPlanCode(equPlan.getPlanCode());
planDetail.setCode("C" + equPlan.getPlanCode() + String.format("%02d", ++itemCodeTemp));
planDetail.setParentCode(equipment.getCode());
planDetail.setCreateBy(SecurityContextHolder.getUserName());
planDetail.setCreateTime(DateUtils.getNowDate());
planDetail.setUpdateBy(SecurityContextHolder.getUserName());
planDetail.setUpdateTime(DateUtils.getNowDate());
// 处理标准
List<EquCheckItemDetail> equCheckItemDetailList = item.getEquCheckItemDetailList();
// 检查项详情流水号
int detailCodeTemp = 0;
// 判断是否插入检查项
boolean checkInsert = false;
for (EquCheckItemDetail detail : equCheckItemDetailList) {
if (detail.getShowFlag()) {
checkInsert = true;
EquPlanStandard planStandard = new EquPlanStandard();
BeanUtils.copyProperties(detail, planStandard);
planStandard.setId(IdUtils.fastSimpleUUID());
planStandard.setParentCode(planDetail.getCode());
planStandard.setPlanCode(equPlan.getPlanCode());
planStandard.setCode("D" + equPlan.getPlanCode() + String.format("%02d", ++detailCodeTemp));
planStandard.setCreateBy(SecurityContextHolder.getUserName());
planStandard.setCreateTime(DateUtils.getNowDate());
planStandard.setUpdateBy(SecurityContextHolder.getUserName());
planStandard.setUpdateTime(DateUtils.getNowDate());
// 详情插入数据库
equPlanStandardMapper.insertEquPlanStandard(planStandard);
}
}
// 检查项详情为空则不生成检查项信息-检查项插入数据库
if (checkInsert) {
equPlanDetailMapper.insertEquPlanDetail(planDetail);
}
}
}
// 设备插入数据库
equPlanEquMapper.insertEquPlanEqu(equipment);
}
}
}
}

@ -8,6 +8,7 @@
<result property="id" column="id" />
<result property="code" column="code" />
<result property="planId" column="plan_id" />
<result property="planCode" column="plan_code" />
<result property="parentCode" column="parent_code" />
<result property="itemCode" column="item_code" />
<result property="itemName" column="item_name" />
@ -27,7 +28,7 @@
</resultMap>
<sql id="selectEquPlanDetailVo">
select id, code, plan_id, parent_code, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_detail
select id, code, plan_id,plan_code, parent_code, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_detail
</sql>
<select id="selectEquPlanDetailList" parameterType="EquPlanDetail" resultMap="EquPlanDetailResult">
@ -35,6 +36,7 @@
<where>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="planId != null and planId != ''"> and plan_id = #{planId}</if>
<if test="planCode != null and planCode != ''"> and plan_code = #{planCode}</if>
<if test="parentCode != null and parentCode != ''"> and parent_code = #{parentCode}</if>
<if test="itemCode != null and itemCode != ''"> and item_code = #{itemCode}</if>
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
@ -54,12 +56,18 @@
where id = #{id}
</select>
<select id="selectEquPlanDetailByPlanCode" parameterType="String" resultMap="EquPlanDetailResult">
<include refid="selectEquPlanDetailVo"/>
where plan_code = #{planCode} and del_flag = '0'
</select>
<insert id="insertEquPlanDetail" parameterType="EquPlanDetail">
insert into equ_plan_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="code != null">code,</if>
<if test="planId != null">plan_id,</if>
<if test="planCode != null">plan_code,</if>
<if test="parentCode != null">parent_code,</if>
<if test="itemCode != null">item_code,</if>
<if test="itemName != null">item_name,</if>
@ -81,6 +89,7 @@
<if test="id != null">#{id},</if>
<if test="code != null">#{code},</if>
<if test="planId != null">#{planId},</if>
<if test="planCode != null">#{planCode},</if>
<if test="parentCode != null">#{parentCode},</if>
<if test="itemCode != null">#{itemCode},</if>
<if test="itemName != null">#{itemName},</if>
@ -105,6 +114,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="code != null">code = #{code},</if>
<if test="planId != null">plan_id = #{planId},</if>
<if test="planCode != null">plan_code = #{planCode},</if>
<if test="parentCode != null">parent_code = #{parentCode},</if>
<if test="itemCode != null">item_code = #{itemCode},</if>
<if test="itemName != null">item_name = #{itemName},</if>
@ -135,4 +145,12 @@
#{id}
</foreach>
</delete>
<delete id="deleteEquPlanDetailByPlanCode">
delete from equ_plan_detail where plan_code = #{planCode}
</delete>
<delete id="delEquPlanDetailByPlanCode">
update equ_plan_detail set del_flag = '1' where plan_code = #{planCode}
</delete>
</mapper>

@ -7,6 +7,7 @@
<resultMap type="EquPlanEqu" id="EquPlanEquResult">
<result property="id" column="id" />
<result property="code" column="code" />
<result property="planCode" column="plan_code" />
<result property="parentCode" column="parent_code" />
<result property="equipmentCode" column="equipment_code" />
<result property="equipmentName" column="equipment_name" />
@ -22,13 +23,14 @@
</resultMap>
<sql id="selectEquPlanEquVo">
select id, code, parent_code, equipment_code, equipment_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_equ
select id, code, parent_code,plan_code, equipment_code, equipment_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_equ
</sql>
<select id="selectEquPlanEquList" parameterType="EquPlanEqu" resultMap="EquPlanEquResult">
<include refid="selectEquPlanEquVo"/>
<where>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="planCode != null and planCode != ''"> and plan_code = #{planCode}</if>
<if test="parentCode != null and parentCode != ''"> and parent_code = #{parentCode}</if>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
<if test="equipmentName != null and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
@ -44,12 +46,18 @@
where id = #{id}
</select>
<select id="selectEquPlanEquByPlanCode" parameterType="String" resultMap="EquPlanEquResult">
<include refid="selectEquPlanEquVo"/>
where plan_code = #{planCode} and del_flag = '0'
</select>
<insert id="insertEquPlanEqu" parameterType="EquPlanEqu">
insert into equ_plan_equ
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="code != null and code != ''">code,</if>
<if test="parentCode != null and parentCode != ''">parent_code,</if>
<if test="planCode != null and planCode != ''">plan_code,</if>
<if test="equipmentCode != null and equipmentCode != ''">equipment_code,</if>
<if test="equipmentName != null and equipmentName != ''">equipment_name,</if>
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
@ -66,6 +74,7 @@
<if test="id != null">#{id},</if>
<if test="code != null and code != ''">#{code},</if>
<if test="parentCode != null and parentCode != ''">#{parentCode},</if>
<if test="planCode != null and planCode != ''">#{planCode},</if>
<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
<if test="equipmentName != null and equipmentName != ''">#{equipmentName},</if>
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
@ -85,6 +94,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="code != null and code != ''">code = #{code},</if>
<if test="parentCode != null and parentCode != ''">parent_code = #{parentCode},</if>
<if test="planCode != null and planCode != ''">plan_code = #{planCode},</if>
<if test="equipmentCode != null and equipmentCode != ''">equipment_code = #{equipmentCode},</if>
<if test="equipmentName != null and equipmentName != ''">equipment_name = #{equipmentName},</if>
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
@ -110,4 +120,12 @@
#{id}
</foreach>
</delete>
<delete id="deleteEquPlanEquByPlanCode">
delete from equ_plan_equ where plan_code = #{planCode}
</delete>
<delete id="delEquPlanEquByPlanCode">
update equ_plan_equ set del_flag = '1' where plan_code = #{planCode}
</delete>
</mapper>

@ -67,12 +67,30 @@
<if test="updateTimeStart != null "> and CONVERT(date,update_time) >= #{updateTimeStart}</if>
<if test="updateTimeEnd != null "> and #{updateTimeEnd} >= CONVERT(date,update_time)</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
and del_flag = '0'
</where>
</select>
<select id="selectEquPlanByPlanId" parameterType="String" resultMap="EquPlanResult">
<include refid="selectEquPlanVo"/>
where plan_id = #{planId}
where plan_id = #{planId} and del_flag = '0'
</select>
<select id="selectSerialNumber" resultType="java.lang.Integer">
SELECT COUNT(plan_id)+1 AS serialNum
FROM equ_plan
WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0'
</select>
<select id="selectWorkCenter" resultType="com.op.device.domain.WorkCenter">
select factory_id AS 'factoryId', factory_name AS 'factoryName', factory_code AS 'factoryCode', f_type AS 'fType'
from sys_factory
where parent_id = (select factory_id from sys_factory where factory_code = #{factory}) and f_type = 'c'
</select>
<select id="selectEquPlanByPlanCode" parameterType="String" resultMap="EquPlanResult">
<include refid="selectEquPlanVo"/>
where plan_code = #{planCode} and del_flag = '0'
</select>
<insert id="insertEquPlan" parameterType="EquPlan">
@ -159,15 +177,12 @@
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createTimeStart != null "> and CONVERT(date,create_time) >= #{createTimeStart}</if>
<if test="createTimeEnd != null "> and #{createTimeEnd} >= CONVERT(date,create_time)</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="updateTimeStart != null "> and CONVERT(date,update_time) >= #{updateTimeStart}</if>
<if test="updateTimeEnd != null "> and #{updateTimeEnd} >= CONVERT(date,update_time)</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
and del_flag = '0'
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where plan_id = #{planId}
where plan_id = #{planId} and del_flag = '0'
</update>
<delete id="deleteEquPlanByPlanId" parameterType="String">
@ -180,4 +195,8 @@
#{planId}
</foreach>
</delete>
<delete id="delEquPlanByPlanCode">
update equ_plan set del_flag = '1' where plan_code = #{planCode} and del_flag = '0'
</delete>
</mapper>

@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.device.mapper.EquPlanPersonMapper">
<resultMap type="EquPlanPerson" id="EquPlanPersonResult">
<result property="id" column="id" />
<result property="planCode" column="plan_code" />
<result property="userId" column="user_id" />
<result property="userName" column="user_name" />
<result property="factoryCode" column="factory_code" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectEquPlanPersonVo">
select id, plan_code, user_id, user_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_person
</sql>
<select id="selectEquPlanPersonList" parameterType="EquPlanPerson" resultMap="EquPlanPersonResult">
<include refid="selectEquPlanPersonVo"/>
<where>
<if test="planCode != null and planCode != ''"> and plan_code = #{planCode}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
</where>
</select>
<select id="selectEquPlanPersonById" parameterType="String" resultMap="EquPlanPersonResult">
<include refid="selectEquPlanPersonVo"/>
where id = #{id}
</select>
<select id="selectEquPlanPersonByPlanCode" parameterType="String" resultMap="EquPlanPersonResult">
<include refid="selectEquPlanPersonVo"/>
where plan_code = #{planCode} and del_flag = '0'
</select>
<insert id="insertEquPlanPerson" parameterType="EquPlanPerson">
insert into equ_plan_person
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="planCode != null and planCode != ''">plan_code,</if>
<if test="userId != null">user_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="planCode != null and planCode != ''">#{planCode},</if>
<if test="userId != null">#{userId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateEquPlanPerson" parameterType="EquPlanPerson">
update equ_plan_person
<trim prefix="SET" suffixOverrides=",">
<if test="planCode != null and planCode != ''">plan_code = #{planCode},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteEquPlanPersonById" parameterType="String">
delete from equ_plan_person where id = #{id}
</delete>
<delete id="deleteEquPlanPersonByIds" parameterType="String">
delete from equ_plan_person where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteEquPlanPersonByPlanCode">
delete from equ_plan_person where plan_code = #{planCode}
</delete>
<delete id="delEquPlanPersonByPlanCode">
update equ_plan_person set del_flag = '1' where plan_code = #{planCode}
</delete>
</mapper>

@ -8,6 +8,7 @@
<result property="id" column="id" />
<result property="code" column="code" />
<result property="parentCode" column="parent_code" />
<result property="planCode" column="plan_code" />
<result property="detailCode" column="detail_code" />
<result property="standardType" column="standard_type" />
<result property="standardName" column="standard_name" />
@ -26,7 +27,7 @@
</resultMap>
<sql id="selectEquPlanStandardVo">
select id, code, parent_code, detail_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_standard
select id, code, parent_code,plan_code, detail_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_standard
</sql>
<select id="selectEquPlanStandardList" parameterType="EquPlanStandard" resultMap="EquPlanStandardResult">
@ -34,6 +35,7 @@
<where>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="parentCode != null and parentCode != ''"> and parent_code = #{parentCode}</if>
<if test="planCode != null and planCode != ''"> and plan_code = #{planCode}</if>
<if test="detailCode != null and detailCode != ''"> and detail_code = #{detailCode}</if>
<if test="standardType != null and standardType != ''"> and standard_type = #{standardType}</if>
<if test="standardName != null and standardName != ''"> and standard_name like concat('%', #{standardName}, '%')</if>
@ -52,12 +54,18 @@
where id = #{id}
</select>
<select id="selectEquPlanStandardByPlanCode" parameterType="String" resultMap="EquPlanStandardResult">
<include refid="selectEquPlanStandardVo"/>
where plan_code = #{planCode} and del_flag ='0'
</select>
<insert id="insertEquPlanStandard" parameterType="EquPlanStandard">
insert into equ_plan_standard
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="code != null">code,</if>
<if test="parentCode != null">parent_code,</if>
<if test="planCode != null">plan_code,</if>
<if test="detailCode != null">detail_code,</if>
<if test="standardType != null">standard_type,</if>
<if test="standardName != null">standard_name,</if>
@ -78,6 +86,7 @@
<if test="id != null">#{id},</if>
<if test="code != null">#{code},</if>
<if test="parentCode != null">#{parentCode},</if>
<if test="planCode != null">#{planCode},</if>
<if test="detailCode != null">#{detailCode},</if>
<if test="standardType != null">#{standardType},</if>
<if test="standardName != null">#{standardName},</if>
@ -101,6 +110,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="code != null">code = #{code},</if>
<if test="parentCode != null">parent_code = #{parentCode},</if>
<if test="planCode != null">plan_code = #{planCode},</if>
<if test="detailCode != null">detail_code = #{detailCode},</if>
<if test="standardType != null">standard_type = #{standardType},</if>
<if test="standardName != null">standard_name = #{standardName},</if>
@ -130,4 +140,12 @@
#{id}
</foreach>
</delete>
<delete id="deleteEquPlanStandardByPlanCode">
delete from equ_plan_standard where plan_code = #{planCode}
</delete>
<delete id="delEquPlanStandardByPlanCode">
update equ_plan_standard set del_flag = '1' where plan_code = #{planCode}
</delete>
</mapper>

@ -61,7 +61,7 @@ public class MesReportWorkController extends BaseController {
*
*/
@RequiresPermissions("mes:reportWork:export")
@Log(title = "报工报表", businessType = BusinessType.EXPORT)
//@Log(title = "报工报表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MesReportWork mesReportWork) {
List<MesReportWork> list = mesReportWorkService.selectMesReportWorkList(mesReportWork);
@ -82,7 +82,7 @@ public class MesReportWorkController extends BaseController {
*
*/
@RequiresPermissions("mes:reportWork:add")
@Log(title = "报工报表", businessType = BusinessType.INSERT)
//@Log(title = "报工报表", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MesReportWork mesReportWork) {
mesReportWork.setId(IdUtils.fastSimpleUUID());
@ -93,7 +93,7 @@ public class MesReportWorkController extends BaseController {
*
*/
@RequiresPermissions("mes:reportWork:edit")
@Log(title = "报工报表", businessType = BusinessType.UPDATE)
//@Log(title = "报工报表", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MesReportWork mesReportWork) {
return toAjax(mesReportWorkService.updateMesReportWork(mesReportWork));
@ -103,7 +103,7 @@ public class MesReportWorkController extends BaseController {
*
*/
@RequiresPermissions("mes:reportWork:remove")
@Log(title = "报工报表", businessType = BusinessType.DELETE)
//@Log(title = "报工报表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(mesReportWorkService.deleteMesReportWorkByIds(ids));
@ -125,7 +125,7 @@ public class MesReportWorkController extends BaseController {
*
*/
@RequiresPermissions("mes:processFinish:list")
@Log(title = "工单各工序完成记录", businessType = BusinessType.EXPORT)
//@Log(title = "工单各工序完成记录", businessType = BusinessType.EXPORT)
@PostMapping("/processFinishExport")
public void processFinishExport(HttpServletResponse response, MesProcessReport mesProcessReport) {
List<MesProcessReport> list = mesReportWorkService.getProcessFinishList(mesProcessReport);

@ -48,7 +48,7 @@ public class ProRfidProcessDetailController extends BaseController {
* rfid
*/
@RequiresPermissions("mes:detail:export")
@Log(title = "生产rfid流程", businessType = BusinessType.EXPORT)
//@Log(title = "生产rfid流程", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ProRfidProcessDetail proRfidProcessDetail) {
List<ProRfidProcessDetail> list = proRfidProcessDetailService.selectProRfidProcessDetailList(proRfidProcessDetail);
@ -69,7 +69,7 @@ public class ProRfidProcessDetailController extends BaseController {
* rfid
*/
@RequiresPermissions("mes:detail:add")
@Log(title = "生产rfid流程", businessType = BusinessType.INSERT)
//@Log(title = "生产rfid流程", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ProRfidProcessDetail proRfidProcessDetail) {
return toAjax(proRfidProcessDetailService.insertProRfidProcessDetail(proRfidProcessDetail));
@ -79,7 +79,7 @@ public class ProRfidProcessDetailController extends BaseController {
* rfid
*/
@RequiresPermissions("mes:detail:edit")
@Log(title = "生产rfid流程", businessType = BusinessType.UPDATE)
//@Log(title = "生产rfid流程", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ProRfidProcessDetail proRfidProcessDetail) {
return toAjax(proRfidProcessDetailService.updateProRfidProcessDetail(proRfidProcessDetail));
@ -89,7 +89,7 @@ public class ProRfidProcessDetailController extends BaseController {
* rfid
*/
@RequiresPermissions("mes:detail:remove")
@Log(title = "生产rfid流程", businessType = BusinessType.DELETE)
//@Log(title = "生产rfid流程", businessType = BusinessType.DELETE)
@DeleteMapping("/{recordIds}")
public AjaxResult remove(@PathVariable String[] recordIds) {
return toAjax(proRfidProcessDetailService.deleteProRfidProcessDetailByRecordIds(recordIds));

@ -38,7 +38,7 @@ public class WCSInterfaceController extends BaseController {
* @param
* @return
*/
@Log(title = "下一工序机台集合获取", businessType = BusinessType.WCS)
//"下一工序机台集合获取"
@PostMapping("/requestDestinationStations")
public WCSDTO requestDestinationStations(@RequestBody WCSDTO wcsdto) {
if(StringUtils.isBlank(wcsdto.getFactory())){
@ -48,7 +48,7 @@ public class WCSInterfaceController extends BaseController {
}
return WCInterfaceService.requestDestinationStations(wcsdto);
}
@Log(title = "下一工序机台集合获取(手持)", businessType = BusinessType.WCS)
// "下一工序机台集合获取(手持)"
@PostMapping("/pdaRequestDestinationStations")
public AjaxResult pdaRequestDestinationStations(@RequestBody WCSDTO wcsdto) {
if(StringUtils.isBlank(wcsdto.getFactory())){
@ -57,7 +57,7 @@ public class WCSInterfaceController extends BaseController {
return success(WCInterfaceService.requestDestinationStations(wcsdto));
}
@Log(title = "获取料罐用量(废弃,留着以后给别的功能用)", businessType = BusinessType.GRANT)
// "获取料罐用量(废弃,留着以后给别的功能用)"
@PostMapping("/saveLGusedLog")
public AjaxResult saveLGusedLog(@RequestBody List<LGInfoDto> lgdtos) {
if(CollectionUtils.isEmpty(lgdtos)){
@ -72,12 +72,17 @@ public class WCSInterfaceController extends BaseController {
/**
* MES
*/
@Log(title = "MES看板-获取工厂列表", businessType = BusinessType.GRANT)
@PostMapping("/getBoardFactory")
public AjaxResult getBoardFactory(@RequestBody BoardDTO boardDTO) {
return success(WCInterfaceService.getBoardFactory(boardDTO));
}
@Log(title = "MES看板", businessType = BusinessType.GRANT)
@PostMapping("/getBoardShifts")
public AjaxResult getProShifts(@RequestBody BoardDTO boardDTO) {
if(StringUtils.isBlank(boardDTO.getFactory())){
return error("[factory] is not null");
}
return success(WCInterfaceService.getProShifts(boardDTO));
}
@PostMapping("/getMesBoardEquProductionToday")
public AjaxResult getMesBoardEquProductionToday(@RequestBody BoardDTO boardDTO) {
if(StringUtils.isBlank(boardDTO.getFactory())){
@ -87,6 +92,10 @@ public class WCSInterfaceController extends BaseController {
boardDTO.setYmd(DateUtils.getDate());
}
// if(StringUtils.isBlank(boardDTO.getShiftId())){
// return error("[shiftId] is not null");
// }
if(StringUtils.isEmpty(boardDTO.getEquTypeCode())){//设备类型
return error("[equTypeCode] is not null");
}

@ -6,6 +6,7 @@ import java.util.Map;
import com.op.mes.domain.*;
import com.op.mes.domain.dto.SysFactoryDto;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
/**
* Mapper
@ -13,6 +14,7 @@ import org.apache.ibatis.annotations.MapKey;
* @author Open Platform
* @date 2023-08-24
*/
@Mapper
public interface MesReportWorkMapper {
/**
*

@ -1,6 +1,7 @@
package com.op.mes.service;
import com.op.common.core.web.domain.AjaxResult;
import com.op.mes.domain.MesShift;
import com.op.mes.domain.dto.BaseEquipmentDto;
import com.op.mes.domain.dto.LGInfoDto;
import com.op.system.api.domain.SysDept;
@ -25,4 +26,6 @@ public interface IWCSInterfaceService {
List<SysDept> getBoardFactory(BoardDTO boardDTO);
String saveLGusedLog(List<LGInfoDto> lgdtos);
List<MesShift> getProShifts(BoardDTO boardDTO);
}

@ -5,23 +5,19 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.bean.BeanUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.mes.domain.MesStationArrive;
import com.op.mes.domain.dto.BaseEquipmentDto;
import com.op.mes.domain.MesShift;
import com.op.mes.domain.dto.LGInfoDto;
import com.op.mes.mapper.MesMapper;
import com.op.mes.mapper.MesStationArriveMapper;
import com.op.mes.mapper.MesReportWorkMapper;
import com.op.mes.mapper.ProRfidProcessDetailMapper;
import com.op.mes.service.IWCSInterfaceService;
import com.op.system.api.domain.SysDept;
import com.op.system.api.domain.dto.BoardDTO;
import com.op.system.api.domain.dto.WCSDTO;
import com.op.system.api.domain.dto.WCSDataDTO;
import com.op.system.api.domain.dto.WCSDataItemsDTO;
import com.op.system.api.domain.mes.ProRfidProcessDetail;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.*;
@ -41,7 +37,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
@Autowired
private ProRfidProcessDetailMapper proRfidProcessDetailMapper;
@Autowired
private MesStationArriveMapper mesStationArriveMapper;
private MesReportWorkMapper mesReportWorkMapper;
/**
* JSON
@ -169,6 +165,14 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
return mesMapper.getBoardFactory(boardDTO);
}
@Override
public List<MesShift> getProShifts(BoardDTO boardDTO) {
DynamicDataSourceContextHolder.push("ds_"+boardDTO.getFactory());// 这是数据源的key
return mesReportWorkMapper.selectProShift();
}
@Override
public String saveLGusedLog(List<LGInfoDto> lgdtos) {
DynamicDataSourceContextHolder.push("ds_"+lgdtos.get(0).getFactoryCode());// 这是数据源的key
@ -183,7 +187,6 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
return "保存成功条数:"+saveNum;
}
public static void main(String args[]){
System.out.println(DateUtils.getDate());
}

@ -91,6 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join base_equipment equ on mt.equipmentCode = equ.equipment_code
where CONVERT(varchar(10),mt.update_time, 120) = #{ymd} and equ.equipment_name is not null
and equ.equipment_type_code = #{equTypeCode}
<if test="shiftId != null and shiftId != ''">
and mt.shift_id = #{shiftId}
</if>
group by equ.equipment_type_code,
equ.equipment_type_name
</select>
@ -103,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join base_equipment equ on mt.equipmentCode = equ.equipment_code
where CONVERT(varchar(10),mt.update_time, 120) = #{ymd} and equ.equipment_name is not null
and equ.equipment_type_code = #{equTypeCode}
<if test="shiftId != null and shiftId != ''">
and mt.shift_id = #{shiftId}
</if>
group by mt.equipmentCode,
equ.equipment_name,
equ.equipment_type_code
@ -120,6 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join base_equipment equ on mt.equipmentCode = equ.equipment_code
where CONVERT(varchar(10),mt.create_time, 120) = #{ymd} and equ.equipment_name is not null
and equ.equipment_type_code = #{equTypeCode} and mt.status = 2
<if test="shiftId != null and shiftId != ''">
and mt.shift_id = #{shiftId}
</if>
group by equ.equipment_type_code,
equ.equipment_type_name
</select>
@ -132,6 +141,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join base_equipment equ on mt.equipmentCode = equ.equipment_code
where CONVERT(varchar(10),mt.create_time, 120) = #{ymd} and equ.equipment_name is not null
and equ.equipment_type_code = #{equTypeCode} and mt.status = 2
<if test="shiftId != null and shiftId != ''">
and mt.shift_id = #{shiftId}
</if>
group by mt.equipmentCode,
equ.equipment_name,
equ.equipment_type_code

@ -0,0 +1,87 @@
package com.op.quality.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.quality.domain.QcCheckTaskDetail;
import com.op.quality.service.IQcCheckTaskDetailService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* Controller
*
* @author Open Platform
* @date 2023-10-19
*/
@RestController
@RequestMapping("/qcDetail")
public class QcCheckTaskDetailController extends BaseController {
@Autowired
private IQcCheckTaskDetailService qcCheckTaskDetailService;
/**
*
*/
@GetMapping("/list")
public TableDataInfo list(QcCheckTaskDetail qcCheckTaskDetail) {
startPage();
List<QcCheckTaskDetail> list = qcCheckTaskDetailService.selectQcCheckTaskDetailList(qcCheckTaskDetail);
return getDataTable(list);
}
/**
*
*/
@PostMapping("/export")
public void export(HttpServletResponse response, QcCheckTaskDetail qcCheckTaskDetail) {
List<QcCheckTaskDetail> list = qcCheckTaskDetailService.selectQcCheckTaskDetailList(qcCheckTaskDetail);
ExcelUtil<QcCheckTaskDetail> util = new ExcelUtil<QcCheckTaskDetail>(QcCheckTaskDetail.class);
util.exportExcel(response, list, "检验任务详情数据");
}
/**
*
*/
@GetMapping(value = "/{recordId}")
public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
return success(qcCheckTaskDetailService.selectQcCheckTaskDetailByRecordId(recordId));
}
/**
*
*/
@PostMapping
public AjaxResult add(@RequestBody QcCheckTaskDetail qcCheckTaskDetail) {
return toAjax(qcCheckTaskDetailService.insertQcCheckTaskDetail(qcCheckTaskDetail));
}
/**
*
*/
@PutMapping
public AjaxResult edit(@RequestBody QcCheckTaskDetail qcCheckTaskDetail) {
return toAjax(qcCheckTaskDetailService.updateQcCheckTaskDetail(qcCheckTaskDetail));
}
/**
*
*/
@DeleteMapping("/{recordIds}")
public AjaxResult remove(@PathVariable String[] recordIds) {
return toAjax(qcCheckTaskDetailService.deleteQcCheckTaskDetailByRecordIds(recordIds));
}
}

@ -0,0 +1,109 @@
package com.op.quality.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.quality.domain.QcBomComponent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.service.IQcCheckTaskIncomeService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* Controller
*
* @author Open Platform
* @date 2023-10-19
*/
@RestController
@RequestMapping("/qcIncome")
public class QcCheckTaskIncomeController extends BaseController {
@Autowired
private IQcCheckTaskIncomeService qcCheckTaskIncomeService;
/**
*
*/
@RequiresPermissions("quality:qcIncome:list")
@GetMapping("/list")
public TableDataInfo list(QcCheckTaskIncome qcCheckTaskIncome) {
startPage();
List<QcCheckTaskIncome> list = qcCheckTaskIncomeService.selectQcCheckTaskIncomeList(qcCheckTaskIncome);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("quality:qcIncome:export")
@Log(title = "来料检验", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, QcCheckTaskIncome qcCheckTaskIncome) {
List<QcCheckTaskIncome> list = qcCheckTaskIncomeService.selectQcCheckTaskIncomeList(qcCheckTaskIncome);
ExcelUtil<QcCheckTaskIncome> util = new ExcelUtil<QcCheckTaskIncome>(QcCheckTaskIncome.class);
util.exportExcel(response, list, "来料检验数据");
}
/**
*
*/
@RequiresPermissions("quality:qcIncome:query")
@GetMapping(value = "/{recordId}")
public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
return success(qcCheckTaskIncomeService.selectQcCheckTaskIncomeByRecordId(recordId));
}
/**
*
*/
@RequiresPermissions("quality:qcIncome:add")
@Log(title = "来料检验", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
return toAjax(qcCheckTaskIncomeService.insertQcCheckTaskIncome(qcCheckTaskIncome));
}
/**
*
*/
@RequiresPermissions("quality:qcIncome:edit")
@Log(title = "来料检验", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
return toAjax(qcCheckTaskIncomeService.updateQcCheckTaskIncome(qcCheckTaskIncome));
}
/**
*
*/
@RequiresPermissions("quality:qcIncome:remove")
@Log(title = "来料检验", businessType = BusinessType.DELETE)
@DeleteMapping("/{recordIds}")
public AjaxResult remove(@PathVariable String[] recordIds) {
return toAjax(qcCheckTaskIncomeService.deleteQcCheckTaskIncomeByRecordIds(recordIds));
}
/**
* BOM
*/
@GetMapping("/getQcListBom")
public TableDataInfo getQcListBom(QcBomComponent bomComponent) {
startPage();
List<QcBomComponent> list = qcCheckTaskIncomeService.getQcListBom(bomComponent);
return getDataTable(list);
}
}

@ -0,0 +1,97 @@
package com.op.quality.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.quality.domain.QcCheckTaskProduce;
import com.op.quality.service.IQcCheckTaskProduceService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* Controller
*
* @author Open Platform
* @date 2023-10-19
*/
@RestController
@RequestMapping("/qcProduce")
public class QcCheckTaskProduceController extends BaseController {
@Autowired
private IQcCheckTaskProduceService qcCheckTaskProduceService;
/**
*
*/
@RequiresPermissions("quality:qcProduce:list")
@GetMapping("/list")
public TableDataInfo list(QcCheckTaskProduce qcCheckTaskProduce) {
startPage();
List<QcCheckTaskProduce> list = qcCheckTaskProduceService.selectQcCheckTaskProduceList(qcCheckTaskProduce);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("quality:qcProduce:export")
@Log(title = "生产过程检验任务", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, QcCheckTaskProduce qcCheckTaskProduce) {
List<QcCheckTaskProduce> list = qcCheckTaskProduceService.selectQcCheckTaskProduceList(qcCheckTaskProduce);
ExcelUtil<QcCheckTaskProduce> util = new ExcelUtil<QcCheckTaskProduce>(QcCheckTaskProduce.class);
util.exportExcel(response, list, "生产过程检验任务数据");
}
/**
*
*/
@RequiresPermissions("quality:qcProduce:query")
@GetMapping(value = "/{recordId}")
public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
return success(qcCheckTaskProduceService.selectQcCheckTaskProduceByRecordId(recordId));
}
/**
*
*/
@RequiresPermissions("quality:qcProduce:add")
@Log(title = "生产过程检验任务", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody QcCheckTaskProduce qcCheckTaskProduce) {
return toAjax(qcCheckTaskProduceService.insertQcCheckTaskProduce(qcCheckTaskProduce));
}
/**
*
*/
@RequiresPermissions("quality:qcProduce:edit")
@Log(title = "生产过程检验任务", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody QcCheckTaskProduce qcCheckTaskProduce) {
return toAjax(qcCheckTaskProduceService.updateQcCheckTaskProduce(qcCheckTaskProduce));
}
/**
*
*/
@RequiresPermissions("quality:qcProduce:remove")
@Log(title = "生产过程检验任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{recordIds}")
public AjaxResult remove(@PathVariable String[] recordIds) {
return toAjax(qcCheckTaskProduceService.deleteQcCheckTaskProduceByRecordIds(recordIds));
}
}

@ -0,0 +1,97 @@
package com.op.quality.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.quality.domain.QcCheckTaskWarehousing;
import com.op.quality.service.IQcCheckTaskWarehousingService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* Controller
*
* @author Open Platform
* @date 2023-10-19
*/
@RestController
@RequestMapping("/qcWarehousing")
public class QcCheckTaskWarehousingController extends BaseController {
@Autowired
private IQcCheckTaskWarehousingService qcCheckTaskWarehousingService;
/**
*
*/
@RequiresPermissions("quality:qcWarehousing:list")
@GetMapping("/list")
public TableDataInfo list(QcCheckTaskWarehousing qcCheckTaskWarehousing) {
startPage();
List<QcCheckTaskWarehousing> list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("quality:qcWarehousing:export")
@Log(title = "成品入库检验任务", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, QcCheckTaskWarehousing qcCheckTaskWarehousing) {
List<QcCheckTaskWarehousing> list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing);
ExcelUtil<QcCheckTaskWarehousing> util = new ExcelUtil<QcCheckTaskWarehousing>(QcCheckTaskWarehousing.class);
util.exportExcel(response, list, "成品入库检验任务数据");
}
/**
*
*/
@RequiresPermissions("quality:qcWarehousing:query")
@GetMapping(value = "/{recordId}")
public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
return success(qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingByRecordId(recordId));
}
/**
*
*/
@RequiresPermissions("quality:qcWarehousing:add")
@Log(title = "成品入库检验任务", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody QcCheckTaskWarehousing qcCheckTaskWarehousing) {
return toAjax(qcCheckTaskWarehousingService.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing));
}
/**
*
*/
@RequiresPermissions("quality:qcWarehousing:edit")
@Log(title = "成品入库检验任务", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody QcCheckTaskWarehousing qcCheckTaskWarehousing) {
return toAjax(qcCheckTaskWarehousingService.updateQcCheckTaskWarehousing(qcCheckTaskWarehousing));
}
/**
*
*/
@RequiresPermissions("quality:qcWarehousing:remove")
@Log(title = "成品入库检验任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{recordIds}")
public AjaxResult remove(@PathVariable String[] recordIds) {
return toAjax(qcCheckTaskWarehousingService.deleteQcCheckTaskWarehousingByRecordIds(recordIds));
}
}

@ -0,0 +1,303 @@
package com.op.quality.domain;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* BOM base_bom_component
*
* @author Open Platform
* @date 2023-08-04
*/
public class QcBomComponent extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键 */
private String handle;
/** BOM单号 */
@Excel(name = "BOM单号")
private String bomCode;
private String bomName;
/** 工厂/站点 */
@Excel(name = "工厂/站点")
private String site;
/** 物料编码 */
@Excel(name = "物料编码")
private String productCode;
/** 组件上层物料编码 */
@Excel(name = "组件上层物料编码")
private String cumc;
/** 组件编码 */
@Excel(name = "组件编码")
private String component;
/** BOM层次 */
@Excel(name = "BOM层次")
private String bomHierarchy;
/** 项目编号 */
@Excel(name = "项目编号")
private String projectNo;
/** 标准用量 */
@Excel(name = "标准用量")
private Long standardDosage;
/** 损耗率 */
@Excel(name = "损耗率")
private Long lossRate;
/** 损耗额 */
@Excel(name = "损耗额")
private Long lossAmount;
/** 含损耗用量 */
@Excel(name = "含损耗用量")
private Long cilosses;
/** 组件数量单位 */
@Excel(name = "组件数量单位")
private String componentUnit;
/** 组件采购标志 */
@Excel(name = "组件采购标志")
private String componentProFlag;
/** 物料供应标识 */
@Excel(name = "物料供应标识")
private String msi;
/** 成本核算标识相关 */
@Excel(name = "成本核算标识相关")
private String sanka;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private String attr3;
//虚拟字段
@Excel(name = "组件上层物料名称")
private String componentName;
/** 产品描述 */
@Excel(name = "产品描述")
private String productDescZh;
// private List<BaseBomComponent> children;
//
// public List<BaseBomComponent> getChildren() {
// return children;
// }
//
// public void setChildren(List<BaseBomComponent> children) {
// this.children = children;
// }
public void setHandle(String handle) {
this.handle = handle;
}
public String getHandle() {
return handle;
}
public void setBomCode(String bomCode) {
this.bomCode = bomCode;
}
public String getBomCode() {
return bomCode;
}
public void setBomName(String bomName) {
this.bomName = bomName;
}
public String getBomName() {
return bomName;
}
public void setSite(String site) {
this.site = site;
}
public String getSite() {
return site;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductCode() {
return productCode;
}
public void setProductDescZh(String productDescZh) {
this.productDescZh = productDescZh;
}
public String getProductDescZh() {
return productDescZh;
}
public void setCumc(String cumc) {
this.cumc = cumc;
}
public String getCumc() {
return cumc;
}
public void setComponent(String component) {
this.component = component;
}
public String getComponentName() {
return componentName;
}
public void setComponentName(String componentName) {
this.componentName = componentName;
}
public String getComponent() {
return component;
}
public void setBomHierarchy(String bomHierarchy) {
this.bomHierarchy = bomHierarchy;
}
public String getBomHierarchy() {
return bomHierarchy;
}
public void setProjectNo(String projectNo) {
this.projectNo = projectNo;
}
public String getProjectNo() {
return projectNo;
}
public void setStandardDosage(Long standardDosage) {
this.standardDosage = standardDosage;
}
public Long getStandardDosage() {
return standardDosage;
}
public void setLossRate(Long lossRate) {
this.lossRate = lossRate;
}
public Long getLossRate() {
return lossRate;
}
public void setLossAmount(Long lossAmount) {
this.lossAmount = lossAmount;
}
public Long getLossAmount() {
return lossAmount;
}
public void setCilosses(Long cilosses) {
this.cilosses = cilosses;
}
public Long getCilosses() {
return cilosses;
}
public void setComponentUnit(String componentUnit) {
this.componentUnit = componentUnit;
}
public String getComponentUnit() {
return componentUnit;
}
public void setComponentProFlag(String componentProFlag) {
this.componentProFlag = componentProFlag;
}
public String getComponentProFlag() {
return componentProFlag;
}
public void setMsi(String msi) {
this.msi = msi;
}
public String getMsi() {
return msi;
}
public void setSanka(String sanka) {
this.sanka = sanka;
}
public String getSanka() {
return sanka;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("handle", getHandle())
.append("bomCode", getBomCode())
.append("bomName", getBomName())
.append("site", getSite())
.append("productCode", getProductCode())
.append("productDescZh", getProductDescZh())
.append("cumc", getCumc())
.append("componentName", getComponentName())
.append("component", getComponent())
.append("bomHierarchy", getBomHierarchy())
.append("projectNo", getProjectNo())
.append("standardDosage", getStandardDosage())
.append("lossRate", getLossRate())
.append("lossAmount", getLossAmount())
.append("cilosses", getCilosses())
.append("componentUnit", getComponentUnit())
.append("componentProFlag", getComponentProFlag())
.append("msi", getMsi())
.append("sanka", getSanka())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

@ -0,0 +1,231 @@
package com.op.quality.domain;
import java.math.BigDecimal;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* qc_check_task_detail
*
* @author Open Platform
* @date 2023-10-19
*/
public class QcCheckTaskDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
/** id */
private String recordId;
/** 归属任务编码 */
@Excel(name = "归属任务编码")
private String belongTo;
/** 检验规则编号 */
@Excel(name = "检验规则编号")
private String orderNum;
/** 检验规则名称 */
@Excel(name = "检验规则名称")
private String ruleName;
/** 检验规则属性 */
@Excel(name = "检验规则属性")
private String propertyCode;
/** 检验方式 */
@Excel(name = "检验方式")
private String checkMode;
/** 检验工具 */
@Excel(name = "检验工具")
private String checkTool;
/** 单位 */
@Excel(name = "单位")
private String unitCode;
/** 检验标准 */
@Excel(name = "检验标准")
private String checkStandard;
/** 实际值 */
@Excel(name = "实际值")
private BigDecimal actualValue;
/** Y合格N不合格 */
@Excel(name = "Y合格N不合格")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private String attr4;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
/** 删除标识1删除0正常 */
private String delFlag;
public void setRecordId(String recordId) {
this.recordId = recordId;
}
public String getRecordId() {
return recordId;
}
public void setBelongTo(String belongTo) {
this.belongTo = belongTo;
}
public String getBelongTo() {
return belongTo;
}
public void setOrderNum(String orderNum) {
this.orderNum = orderNum;
}
public String getOrderNum() {
return orderNum;
}
public void setRuleName(String ruleName) {
this.ruleName = ruleName;
}
public String getRuleName() {
return ruleName;
}
public void setPropertyCode(String propertyCode) {
this.propertyCode = propertyCode;
}
public String getPropertyCode() {
return propertyCode;
}
public void setCheckMode(String checkMode) {
this.checkMode = checkMode;
}
public String getCheckMode() {
return checkMode;
}
public void setCheckTool(String checkTool) {
this.checkTool = checkTool;
}
public String getCheckTool() {
return checkTool;
}
public void setUnitCode(String unitCode) {
this.unitCode = unitCode;
}
public String getUnitCode() {
return unitCode;
}
public void setCheckStandard(String checkStandard) {
this.checkStandard = checkStandard;
}
public String getCheckStandard() {
return checkStandard;
}
public void setActualValue(BigDecimal actualValue) {
this.actualValue = actualValue;
}
public BigDecimal getActualValue() {
return actualValue;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("recordId", getRecordId())
.append("belongTo", getBelongTo())
.append("orderNum", getOrderNum())
.append("ruleName", getRuleName())
.append("propertyCode", getPropertyCode())
.append("checkMode", getCheckMode())
.append("checkTool", getCheckTool())
.append("unitCode", getUnitCode())
.append("checkStandard", getCheckStandard())
.append("actualValue", getActualValue())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("delFlag", getDelFlag())
.toString();
}
}

@ -0,0 +1,318 @@
package com.op.quality.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* qc_check_task_income
*
* @author Open Platform
* @date 2023-10-19
*/
public class QcCheckTaskIncome extends BaseEntity {
private static final long serialVersionUID = 1L;
/** id */
private String recordId;
/** 检验任务编号 */
@Excel(name = "检验任务编号")
private String checkNo;
/** 来料批次号 */
@Excel(name = "来料批次号")
private String incomeBatchNo;
/** 订单号 */
@Excel(name = "订单号")
private String orderNo;
/** 物料号 */
@Excel(name = "物料号")
private String materialCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 收货数量 */
@Excel(name = "收货数量")
private BigDecimal quality;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 供应商编码 */
@Excel(name = "供应商编码")
private String supplierCode;
/** 供应商名称 */
@Excel(name = "供应商名称")
private String supplierName;
/** 来料时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "来料时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date incomeTime;
/** 检测地点 */
@Excel(name = "检测地点")
private String checkLoc;
/** 检测状态 */
@Excel(name = "检测状态")
private String checkStatus;
/** 检测人工号 */
@Excel(name = "检测人工号")
private String checkManCode;
/** 检测人姓名 */
@Excel(name = "检测人姓名")
private String checkManName;
/** 检验时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
/** 检验结果Y合格 */
@Excel(name = "检验结果Y合格")
private String checkResult;
/** 是否启用1启用0停用 */
@Excel(name = "是否启用1启用0停用")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private String attr4;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
/** 删除标识1删除0正常 */
private String delFlag;
public void setRecordId(String recordId) {
this.recordId = recordId;
}
public String getRecordId() {
return recordId;
}
public void setCheckNo(String checkNo) {
this.checkNo = checkNo;
}
public String getCheckNo() {
return checkNo;
}
public void setIncomeBatchNo(String incomeBatchNo) {
this.incomeBatchNo = incomeBatchNo;
}
public String getIncomeBatchNo() {
return incomeBatchNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public String getOrderNo() {
return orderNo;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getMaterialName() {
return materialName;
}
public void setQuality(BigDecimal quality) {
this.quality = quality;
}
public BigDecimal getQuality() {
return quality;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setSupplierCode(String supplierCode) {
this.supplierCode = supplierCode;
}
public String getSupplierCode() {
return supplierCode;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public String getSupplierName() {
return supplierName;
}
public void setIncomeTime(Date incomeTime) {
this.incomeTime = incomeTime;
}
public Date getIncomeTime() {
return incomeTime;
}
public void setCheckLoc(String checkLoc) {
this.checkLoc = checkLoc;
}
public String getCheckLoc() {
return checkLoc;
}
public void setCheckStatus(String checkStatus) {
this.checkStatus = checkStatus;
}
public String getCheckStatus() {
return checkStatus;
}
public void setCheckManCode(String checkManCode) {
this.checkManCode = checkManCode;
}
public String getCheckManCode() {
return checkManCode;
}
public void setCheckManName(String checkManName) {
this.checkManName = checkManName;
}
public String getCheckManName() {
return checkManName;
}
public void setCheckTime(Date checkTime) {
this.checkTime = checkTime;
}
public Date getCheckTime() {
return checkTime;
}
public void setCheckResult(String checkResult) {
this.checkResult = checkResult;
}
public String getCheckResult() {
return checkResult;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("recordId", getRecordId())
.append("checkNo", getCheckNo())
.append("incomeBatchNo", getIncomeBatchNo())
.append("orderNo", getOrderNo())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("quality", getQuality())
.append("unit", getUnit())
.append("supplierCode", getSupplierCode())
.append("supplierName", getSupplierName())
.append("incomeTime", getIncomeTime())
.append("checkLoc", getCheckLoc())
.append("checkStatus", getCheckStatus())
.append("checkManCode", getCheckManCode())
.append("checkManName", getCheckManName())
.append("checkTime", getCheckTime())
.append("checkResult", getCheckResult())
.append("status", getStatus())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("delFlag", getDelFlag())
.toString();
}
}

@ -0,0 +1,318 @@
package com.op.quality.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* qc_check_task_produce
*
* @author Open Platform
* @date 2023-10-19
*/
public class QcCheckTaskProduce extends BaseEntity {
private static final long serialVersionUID = 1L;
/** id */
private String recordId;
/** 检验任务编号 */
@Excel(name = "检验任务编号")
private String checkNo;
/** 批次号 */
@Excel(name = "批次号")
private String batchNo;
/** 订单号 */
@Excel(name = "订单号")
private String orderNo;
/** 物料号 */
@Excel(name = "物料号")
private String materialCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 数量 */
@Excel(name = "数量")
private BigDecimal quality;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 所属车间编码 */
@Excel(name = "所属车间编码")
private String carCode;
/** 所属车间名称 */
@Excel(name = "所属车间名称")
private String carName;
/** 生产时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "生产时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date produceDate;
/** 检测地点 */
@Excel(name = "检测地点")
private String checkLoc;
/** 检测状态 */
@Excel(name = "检测状态")
private String checkStatus;
/** 检测人工号 */
@Excel(name = "检测人工号")
private String checkManCode;
/** 检测人姓名 */
@Excel(name = "检测人姓名")
private String checkManName;
/** 检验时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
/** 检验结果Y合格 */
@Excel(name = "检验结果Y合格")
private String checkResult;
/** 是否启用1启用0停用 */
@Excel(name = "是否启用1启用0停用")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private String attr4;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
/** 删除标识1删除0正常 */
private String delFlag;
public void setRecordId(String recordId) {
this.recordId = recordId;
}
public String getRecordId() {
return recordId;
}
public void setCheckNo(String checkNo) {
this.checkNo = checkNo;
}
public String getCheckNo() {
return checkNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public String getBatchNo() {
return batchNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public String getOrderNo() {
return orderNo;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getMaterialName() {
return materialName;
}
public void setQuality(BigDecimal quality) {
this.quality = quality;
}
public BigDecimal getQuality() {
return quality;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setCarCode(String carCode) {
this.carCode = carCode;
}
public String getCarCode() {
return carCode;
}
public void setCarName(String carName) {
this.carName = carName;
}
public String getCarName() {
return carName;
}
public void setProduceDate(Date produceDate) {
this.produceDate = produceDate;
}
public Date getProduceDate() {
return produceDate;
}
public void setCheckLoc(String checkLoc) {
this.checkLoc = checkLoc;
}
public String getCheckLoc() {
return checkLoc;
}
public void setCheckStatus(String checkStatus) {
this.checkStatus = checkStatus;
}
public String getCheckStatus() {
return checkStatus;
}
public void setCheckManCode(String checkManCode) {
this.checkManCode = checkManCode;
}
public String getCheckManCode() {
return checkManCode;
}
public void setCheckManName(String checkManName) {
this.checkManName = checkManName;
}
public String getCheckManName() {
return checkManName;
}
public void setCheckTime(Date checkTime) {
this.checkTime = checkTime;
}
public Date getCheckTime() {
return checkTime;
}
public void setCheckResult(String checkResult) {
this.checkResult = checkResult;
}
public String getCheckResult() {
return checkResult;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("recordId", getRecordId())
.append("checkNo", getCheckNo())
.append("batchNo", getBatchNo())
.append("orderNo", getOrderNo())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("quality", getQuality())
.append("unit", getUnit())
.append("carCode", getCarCode())
.append("carName", getCarName())
.append("produceDate", getProduceDate())
.append("checkLoc", getCheckLoc())
.append("checkStatus", getCheckStatus())
.append("checkManCode", getCheckManCode())
.append("checkManName", getCheckManName())
.append("checkTime", getCheckTime())
.append("checkResult", getCheckResult())
.append("status", getStatus())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("delFlag", getDelFlag())
.toString();
}
}

@ -0,0 +1,318 @@
package com.op.quality.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* qc_check_task_warehousing
*
* @author Open Platform
* @date 2023-10-19
*/
public class QcCheckTaskWarehousing extends BaseEntity {
private static final long serialVersionUID = 1L;
/** id */
private String recordId;
/** 检验任务编号 */
@Excel(name = "检验任务编号")
private String checkNo;
/** 批次号 */
@Excel(name = "批次号")
private String batchNo;
/** 订单号 */
@Excel(name = "订单号")
private String orderNo;
/** 物料号 */
@Excel(name = "物料号")
private String materialCode;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 数量 */
@Excel(name = "数量")
private BigDecimal quality;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 供应商编码 */
@Excel(name = "供应商编码")
private String supplierCode;
/** 供应商名称 */
@Excel(name = "供应商名称")
private String supplierName;
/** 来料时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "来料时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date incomeTime;
/** 检测地点 */
@Excel(name = "检测地点")
private String checkLoc;
/** 检测状态 */
@Excel(name = "检测状态")
private String checkStatus;
/** 检测人工号 */
@Excel(name = "检测人工号")
private String checkManCode;
/** 检测人姓名 */
@Excel(name = "检测人姓名")
private String checkManName;
/** 检验时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
/** 检验结果Y合格 */
@Excel(name = "检验结果Y合格")
private String checkResult;
/** 是否启用1启用0停用 */
@Excel(name = "是否启用1启用0停用")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private String attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private String attr4;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String factoryCode;
/** 删除标识1删除0正常 */
private String delFlag;
public void setRecordId(String recordId) {
this.recordId = recordId;
}
public String getRecordId() {
return recordId;
}
public void setCheckNo(String checkNo) {
this.checkNo = checkNo;
}
public String getCheckNo() {
return checkNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public String getBatchNo() {
return batchNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public String getOrderNo() {
return orderNo;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getMaterialName() {
return materialName;
}
public void setQuality(BigDecimal quality) {
this.quality = quality;
}
public BigDecimal getQuality() {
return quality;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setSupplierCode(String supplierCode) {
this.supplierCode = supplierCode;
}
public String getSupplierCode() {
return supplierCode;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public String getSupplierName() {
return supplierName;
}
public void setIncomeTime(Date incomeTime) {
this.incomeTime = incomeTime;
}
public Date getIncomeTime() {
return incomeTime;
}
public void setCheckLoc(String checkLoc) {
this.checkLoc = checkLoc;
}
public String getCheckLoc() {
return checkLoc;
}
public void setCheckStatus(String checkStatus) {
this.checkStatus = checkStatus;
}
public String getCheckStatus() {
return checkStatus;
}
public void setCheckManCode(String checkManCode) {
this.checkManCode = checkManCode;
}
public String getCheckManCode() {
return checkManCode;
}
public void setCheckManName(String checkManName) {
this.checkManName = checkManName;
}
public String getCheckManName() {
return checkManName;
}
public void setCheckTime(Date checkTime) {
this.checkTime = checkTime;
}
public Date getCheckTime() {
return checkTime;
}
public void setCheckResult(String checkResult) {
this.checkResult = checkResult;
}
public String getCheckResult() {
return checkResult;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("recordId", getRecordId())
.append("checkNo", getCheckNo())
.append("batchNo", getBatchNo())
.append("orderNo", getOrderNo())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
.append("quality", getQuality())
.append("unit", getUnit())
.append("supplierCode", getSupplierCode())
.append("supplierName", getSupplierName())
.append("incomeTime", getIncomeTime())
.append("checkLoc", getCheckLoc())
.append("checkStatus", getCheckStatus())
.append("checkManCode", getCheckManCode())
.append("checkManName", getCheckManName())
.append("checkTime", getCheckTime())
.append("checkResult", getCheckResult())
.append("status", getStatus())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("delFlag", getDelFlag())
.toString();
}
}

@ -0,0 +1,61 @@
package com.op.quality.mapper;
import java.util.List;
import com.op.quality.domain.QcCheckTaskDetail;
/**
* Mapper
*
* @author Open Platform
* @date 2023-10-19
*/
public interface QcCheckTaskDetailMapper {
/**
*
*
* @param recordId
* @return
*/
public QcCheckTaskDetail selectQcCheckTaskDetailByRecordId(String recordId);
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
public List<QcCheckTaskDetail> selectQcCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail);
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
public int insertQcCheckTaskDetail(QcCheckTaskDetail qcCheckTaskDetail);
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
public int updateQcCheckTaskDetail(QcCheckTaskDetail qcCheckTaskDetail);
/**
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskDetailByRecordId(String recordId);
/**
*
*
* @param recordIds
* @return
*/
public int deleteQcCheckTaskDetailByRecordIds(String[] recordIds);
}

@ -0,0 +1,64 @@
package com.op.quality.mapper;
import java.util.List;
import com.op.quality.domain.QcBomComponent;
import com.op.quality.domain.QcCheckTaskIncome;
/**
* Mapper
*
* @author Open Platform
* @date 2023-10-19
*/
public interface QcCheckTaskIncomeMapper {
/**
*
*
* @param recordId
* @return
*/
public QcCheckTaskIncome selectQcCheckTaskIncomeByRecordId(String recordId);
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
public List<QcCheckTaskIncome> selectQcCheckTaskIncomeList(QcCheckTaskIncome qcCheckTaskIncome);
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome);
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
public int updateQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome);
/**
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskIncomeByRecordId(String recordId);
/**
*
*
* @param recordIds
* @return
*/
public int deleteQcCheckTaskIncomeByRecordIds(String[] recordIds);
public List<QcBomComponent> getQcListBom(QcBomComponent bomComponent);
}

@ -0,0 +1,61 @@
package com.op.quality.mapper;
import java.util.List;
import com.op.quality.domain.QcCheckTaskProduce;
/**
* Mapper
*
* @author Open Platform
* @date 2023-10-19
*/
public interface QcCheckTaskProduceMapper {
/**
*
*
* @param recordId
* @return
*/
public QcCheckTaskProduce selectQcCheckTaskProduceByRecordId(String recordId);
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
public List<QcCheckTaskProduce> selectQcCheckTaskProduceList(QcCheckTaskProduce qcCheckTaskProduce);
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
public int insertQcCheckTaskProduce(QcCheckTaskProduce qcCheckTaskProduce);
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
public int updateQcCheckTaskProduce(QcCheckTaskProduce qcCheckTaskProduce);
/**
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskProduceByRecordId(String recordId);
/**
*
*
* @param recordIds
* @return
*/
public int deleteQcCheckTaskProduceByRecordIds(String[] recordIds);
}

@ -0,0 +1,61 @@
package com.op.quality.mapper;
import java.util.List;
import com.op.quality.domain.QcCheckTaskWarehousing;
/**
* Mapper
*
* @author Open Platform
* @date 2023-10-19
*/
public interface QcCheckTaskWarehousingMapper {
/**
*
*
* @param recordId
* @return
*/
public QcCheckTaskWarehousing selectQcCheckTaskWarehousingByRecordId(String recordId);
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
public List<QcCheckTaskWarehousing> selectQcCheckTaskWarehousingList(QcCheckTaskWarehousing qcCheckTaskWarehousing);
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing);
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
public int updateQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing);
/**
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskWarehousingByRecordId(String recordId);
/**
*
*
* @param recordIds
* @return
*/
public int deleteQcCheckTaskWarehousingByRecordIds(String[] recordIds);
}

@ -0,0 +1,60 @@
package com.op.quality.service;
import java.util.List;
import com.op.quality.domain.QcCheckTaskDetail;
/**
* Service
*
* @author Open Platform
* @date 2023-10-19
*/
public interface IQcCheckTaskDetailService {
/**
*
*
* @param recordId
* @return
*/
public QcCheckTaskDetail selectQcCheckTaskDetailByRecordId(String recordId);
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
public List<QcCheckTaskDetail> selectQcCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail);
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
public int insertQcCheckTaskDetail(QcCheckTaskDetail qcCheckTaskDetail);
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
public int updateQcCheckTaskDetail(QcCheckTaskDetail qcCheckTaskDetail);
/**
*
*
* @param recordIds
* @return
*/
public int deleteQcCheckTaskDetailByRecordIds(String[] recordIds);
/**
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskDetailByRecordId(String recordId);
}

@ -0,0 +1,64 @@
package com.op.quality.service;
import java.util.List;
import com.op.quality.domain.QcBomComponent;
import com.op.quality.domain.QcCheckTaskIncome;
/**
* Service
*
* @author Open Platform
* @date 2023-10-19
*/
public interface IQcCheckTaskIncomeService {
/**
*
*
* @param recordId
* @return
*/
public QcCheckTaskIncome selectQcCheckTaskIncomeByRecordId(String recordId);
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
public List<QcCheckTaskIncome> selectQcCheckTaskIncomeList(QcCheckTaskIncome qcCheckTaskIncome);
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome);
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
public int updateQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome);
/**
*
*
* @param recordIds
* @return
*/
public int deleteQcCheckTaskIncomeByRecordIds(String[] recordIds);
/**
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskIncomeByRecordId(String recordId);
public List<QcBomComponent> getQcListBom(com.op.quality.domain.QcBomComponent bomComponent);
}

@ -0,0 +1,60 @@
package com.op.quality.service;
import java.util.List;
import com.op.quality.domain.QcCheckTaskProduce;
/**
* Service
*
* @author Open Platform
* @date 2023-10-19
*/
public interface IQcCheckTaskProduceService {
/**
*
*
* @param recordId
* @return
*/
public QcCheckTaskProduce selectQcCheckTaskProduceByRecordId(String recordId);
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
public List<QcCheckTaskProduce> selectQcCheckTaskProduceList(QcCheckTaskProduce qcCheckTaskProduce);
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
public int insertQcCheckTaskProduce(QcCheckTaskProduce qcCheckTaskProduce);
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
public int updateQcCheckTaskProduce(QcCheckTaskProduce qcCheckTaskProduce);
/**
*
*
* @param recordIds
* @return
*/
public int deleteQcCheckTaskProduceByRecordIds(String[] recordIds);
/**
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskProduceByRecordId(String recordId);
}

@ -0,0 +1,60 @@
package com.op.quality.service;
import java.util.List;
import com.op.quality.domain.QcCheckTaskWarehousing;
/**
* Service
*
* @author Open Platform
* @date 2023-10-19
*/
public interface IQcCheckTaskWarehousingService {
/**
*
*
* @param recordId
* @return
*/
public QcCheckTaskWarehousing selectQcCheckTaskWarehousingByRecordId(String recordId);
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
public List<QcCheckTaskWarehousing> selectQcCheckTaskWarehousingList(QcCheckTaskWarehousing qcCheckTaskWarehousing);
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing);
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
public int updateQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing);
/**
*
*
* @param recordIds
* @return
*/
public int deleteQcCheckTaskWarehousingByRecordIds(String[] recordIds);
/**
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskWarehousingByRecordId(String recordId);
}

@ -0,0 +1,97 @@
package com.op.quality.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.quality.mapper.QcCheckTaskDetailMapper;
import com.op.quality.domain.QcCheckTaskDetail;
import com.op.quality.service.IQcCheckTaskDetailService;
/**
* Service
*
* @author Open Platform
* @date 2023-10-19
*/
@Service
public class QcCheckTaskDetailServiceImpl implements IQcCheckTaskDetailService {
@Autowired
private QcCheckTaskDetailMapper qcCheckTaskDetailMapper;
/**
*
*
* @param recordId
* @return
*/
@Override
@DS("#header.poolName")
public QcCheckTaskDetail selectQcCheckTaskDetailByRecordId(String recordId) {
return qcCheckTaskDetailMapper.selectQcCheckTaskDetailByRecordId(recordId);
}
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
@Override
@DS("#header.poolName")
public List<QcCheckTaskDetail> selectQcCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail) {
return qcCheckTaskDetailMapper.selectQcCheckTaskDetailList(qcCheckTaskDetail);
}
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
@Override
@DS("#header.poolName")
public int insertQcCheckTaskDetail(QcCheckTaskDetail qcCheckTaskDetail) {
qcCheckTaskDetail.setCreateTime(DateUtils.getNowDate());
return qcCheckTaskDetailMapper.insertQcCheckTaskDetail(qcCheckTaskDetail);
}
/**
*
*
* @param qcCheckTaskDetail
* @return
*/
@Override
@DS("#header.poolName")
public int updateQcCheckTaskDetail(QcCheckTaskDetail qcCheckTaskDetail) {
qcCheckTaskDetail.setUpdateTime(DateUtils.getNowDate());
return qcCheckTaskDetailMapper.updateQcCheckTaskDetail(qcCheckTaskDetail);
}
/**
*
*
* @param recordIds
* @return
*/
@Override
@DS("#header.poolName")
public int deleteQcCheckTaskDetailByRecordIds(String[] recordIds) {
return qcCheckTaskDetailMapper.deleteQcCheckTaskDetailByRecordIds(recordIds);
}
/**
*
*
* @param recordId
* @return
*/
@Override
@DS("#header.poolName")
public int deleteQcCheckTaskDetailByRecordId(String recordId) {
return qcCheckTaskDetailMapper.deleteQcCheckTaskDetailByRecordId(recordId);
}
}

@ -0,0 +1,105 @@
package com.op.quality.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.quality.domain.QcBomComponent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.quality.mapper.QcCheckTaskIncomeMapper;
import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.service.IQcCheckTaskIncomeService;
/**
* Service
*
* @author Open Platform
* @date 2023-10-19
*/
@Service
public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
@Autowired
private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper;
/**
*
*
* @param recordId
* @return
*/
@Override
@DS("#header.poolName")
public QcCheckTaskIncome selectQcCheckTaskIncomeByRecordId(String recordId) {
return qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeByRecordId(recordId);
}
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
@Override
@DS("#header.poolName")
public List<QcCheckTaskIncome> selectQcCheckTaskIncomeList(QcCheckTaskIncome qcCheckTaskIncome) {
return qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeList(qcCheckTaskIncome);
}
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
@Override
@DS("#header.poolName")
public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome) {
qcCheckTaskIncome.setCreateTime(DateUtils.getNowDate());
return qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome);
}
/**
*
*
* @param qcCheckTaskIncome
* @return
*/
@Override
@DS("#header.poolName")
public int updateQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome) {
qcCheckTaskIncome.setUpdateTime(DateUtils.getNowDate());
return qcCheckTaskIncomeMapper.updateQcCheckTaskIncome(qcCheckTaskIncome);
}
/**
*
*
* @param recordIds
* @return
*/
@Override
@DS("#header.poolName")
public int deleteQcCheckTaskIncomeByRecordIds(String[] recordIds) {
return qcCheckTaskIncomeMapper.deleteQcCheckTaskIncomeByRecordIds(recordIds);
}
/**
*
*
* @param recordId
* @return
*/
@Override
@DS("#header.poolName")
public int deleteQcCheckTaskIncomeByRecordId(String recordId) {
return qcCheckTaskIncomeMapper.deleteQcCheckTaskIncomeByRecordId(recordId);
}
@Override
@DS("#header.poolName")
public List<QcBomComponent> getQcListBom(QcBomComponent bomComponent) {
return qcCheckTaskIncomeMapper.getQcListBom(bomComponent);
}
}

@ -0,0 +1,97 @@
package com.op.quality.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.quality.mapper.QcCheckTaskProduceMapper;
import com.op.quality.domain.QcCheckTaskProduce;
import com.op.quality.service.IQcCheckTaskProduceService;
/**
* Service
*
* @author Open Platform
* @date 2023-10-19
*/
@Service
public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService {
@Autowired
private QcCheckTaskProduceMapper qcCheckTaskProduceMapper;
/**
*
*
* @param recordId
* @return
*/
@Override
@DS("#header.poolName")
public QcCheckTaskProduce selectQcCheckTaskProduceByRecordId(String recordId) {
return qcCheckTaskProduceMapper.selectQcCheckTaskProduceByRecordId(recordId);
}
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
@Override
@DS("#header.poolName")
public List<QcCheckTaskProduce> selectQcCheckTaskProduceList(QcCheckTaskProduce qcCheckTaskProduce) {
return qcCheckTaskProduceMapper.selectQcCheckTaskProduceList(qcCheckTaskProduce);
}
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
@Override
@DS("#header.poolName")
public int insertQcCheckTaskProduce(QcCheckTaskProduce qcCheckTaskProduce) {
qcCheckTaskProduce.setCreateTime(DateUtils.getNowDate());
return qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce);
}
/**
*
*
* @param qcCheckTaskProduce
* @return
*/
@Override
@DS("#header.poolName")
public int updateQcCheckTaskProduce(QcCheckTaskProduce qcCheckTaskProduce) {
qcCheckTaskProduce.setUpdateTime(DateUtils.getNowDate());
return qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce);
}
/**
*
*
* @param recordIds
* @return
*/
@Override
@DS("#header.poolName")
public int deleteQcCheckTaskProduceByRecordIds(String[] recordIds) {
return qcCheckTaskProduceMapper.deleteQcCheckTaskProduceByRecordIds(recordIds);
}
/**
*
*
* @param recordId
* @return
*/
@Override
@DS("#header.poolName")
public int deleteQcCheckTaskProduceByRecordId(String recordId) {
return qcCheckTaskProduceMapper.deleteQcCheckTaskProduceByRecordId(recordId);
}
}

@ -0,0 +1,97 @@
package com.op.quality.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.quality.mapper.QcCheckTaskWarehousingMapper;
import com.op.quality.domain.QcCheckTaskWarehousing;
import com.op.quality.service.IQcCheckTaskWarehousingService;
/**
* Service
*
* @author Open Platform
* @date 2023-10-19
*/
@Service
public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousingService {
@Autowired
private QcCheckTaskWarehousingMapper qcCheckTaskWarehousingMapper;
/**
*
*
* @param recordId
* @return
*/
@Override
@DS("#header.poolName")
public QcCheckTaskWarehousing selectQcCheckTaskWarehousingByRecordId(String recordId) {
return qcCheckTaskWarehousingMapper.selectQcCheckTaskWarehousingByRecordId(recordId);
}
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
@Override
@DS("#header.poolName")
public List<QcCheckTaskWarehousing> selectQcCheckTaskWarehousingList(QcCheckTaskWarehousing qcCheckTaskWarehousing) {
return qcCheckTaskWarehousingMapper.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing);
}
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
@Override
@DS("#header.poolName")
public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) {
qcCheckTaskWarehousing.setCreateTime(DateUtils.getNowDate());
return qcCheckTaskWarehousingMapper.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing);
}
/**
*
*
* @param qcCheckTaskWarehousing
* @return
*/
@Override
@DS("#header.poolName")
public int updateQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) {
qcCheckTaskWarehousing.setUpdateTime(DateUtils.getNowDate());
return qcCheckTaskWarehousingMapper.updateQcCheckTaskWarehousing(qcCheckTaskWarehousing);
}
/**
*
*
* @param recordIds
* @return
*/
@Override
@DS("#header.poolName")
public int deleteQcCheckTaskWarehousingByRecordIds(String[] recordIds) {
return qcCheckTaskWarehousingMapper.deleteQcCheckTaskWarehousingByRecordIds(recordIds);
}
/**
*
*
* @param recordId
* @return
*/
@Override
@DS("#header.poolName")
public int deleteQcCheckTaskWarehousingByRecordId(String recordId) {
return qcCheckTaskWarehousingMapper.deleteQcCheckTaskWarehousingByRecordId(recordId);
}
}

@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.quality.mapper.QcCheckTaskDetailMapper">
<resultMap type="QcCheckTaskDetail" id="QcCheckTaskDetailResult">
<result property="recordId" column="record_id" />
<result property="belongTo" column="belong_to" />
<result property="orderNum" column="order_num" />
<result property="ruleName" column="rule_name" />
<result property="propertyCode" column="property_code" />
<result property="checkMode" column="check_mode" />
<result property="checkTool" column="check_tool" />
<result property="unitCode" column="unit_code" />
<result property="checkStandard" column="check_standard" />
<result property="actualValue" column="actual_value" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="factoryCode" column="factory_code" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectQcCheckTaskDetailVo">
select record_id, belong_to, order_num, rule_name, property_code, check_mode, check_tool, unit_code, check_standard, actual_value, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task_detail
</sql>
<select id="selectQcCheckTaskDetailList" parameterType="QcCheckTaskDetail" resultMap="QcCheckTaskDetailResult">
<include refid="selectQcCheckTaskDetailVo"/>
<where>
<if test="belongTo != null and belongTo != ''"> and belong_to = #{belongTo}</if>
<if test="orderNum != null and orderNum != ''"> and order_num = #{orderNum}</if>
<if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
<if test="propertyCode != null and propertyCode != ''"> and property_code = #{propertyCode}</if>
<if test="checkMode != null and checkMode != ''"> and check_mode = #{checkMode}</if>
<if test="checkTool != null and checkTool != ''"> and check_tool = #{checkTool}</if>
<if test="unitCode != null and unitCode != ''"> and unit_code = #{unitCode}</if>
<if test="checkStandard != null and checkStandard != ''"> and check_standard = #{checkStandard}</if>
<if test="actualValue != null "> and actual_value = #{actualValue}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
</where>
</select>
<select id="selectQcCheckTaskDetailByRecordId" parameterType="String" resultMap="QcCheckTaskDetailResult">
<include refid="selectQcCheckTaskDetailVo"/>
where record_id = #{recordId}
</select>
<insert id="insertQcCheckTaskDetail" parameterType="QcCheckTaskDetail">
insert into qc_check_task_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>
<if test="belongTo != null">belong_to,</if>
<if test="orderNum != null">order_num,</if>
<if test="ruleName != null">rule_name,</if>
<if test="propertyCode != null">property_code,</if>
<if test="checkMode != null">check_mode,</if>
<if test="checkTool != null">check_tool,</if>
<if test="unitCode != null">unit_code,</if>
<if test="checkStandard != null">check_standard,</if>
<if test="actualValue != null">actual_value,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordId != null">#{recordId},</if>
<if test="belongTo != null">#{belongTo},</if>
<if test="orderNum != null">#{orderNum},</if>
<if test="ruleName != null">#{ruleName},</if>
<if test="propertyCode != null">#{propertyCode},</if>
<if test="checkMode != null">#{checkMode},</if>
<if test="checkTool != null">#{checkTool},</if>
<if test="unitCode != null">#{unitCode},</if>
<if test="checkStandard != null">#{checkStandard},</if>
<if test="actualValue != null">#{actualValue},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateQcCheckTaskDetail" parameterType="QcCheckTaskDetail">
update qc_check_task_detail
<trim prefix="SET" suffixOverrides=",">
<if test="belongTo != null">belong_to = #{belongTo},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="ruleName != null">rule_name = #{ruleName},</if>
<if test="propertyCode != null">property_code = #{propertyCode},</if>
<if test="checkMode != null">check_mode = #{checkMode},</if>
<if test="checkTool != null">check_tool = #{checkTool},</if>
<if test="unitCode != null">unit_code = #{unitCode},</if>
<if test="checkStandard != null">check_standard = #{checkStandard},</if>
<if test="actualValue != null">actual_value = #{actualValue},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where record_id = #{recordId}
</update>
<delete id="deleteQcCheckTaskDetailByRecordId" parameterType="String">
delete from qc_check_task_detail where record_id = #{recordId}
</delete>
<delete id="deleteQcCheckTaskDetailByRecordIds" parameterType="String">
delete from qc_check_task_detail where record_id in
<foreach item="recordId" collection="array" open="(" separator="," close=")">
#{recordId}
</foreach>
</delete>
</mapper>

@ -0,0 +1,190 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.quality.mapper.QcCheckTaskIncomeMapper">
<resultMap type="QcCheckTaskIncome" id="QcCheckTaskIncomeResult">
<result property="recordId" column="record_id" />
<result property="checkNo" column="check_no" />
<result property="incomeBatchNo" column="income_batch_no" />
<result property="orderNo" column="order_no" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="quality" column="quality" />
<result property="unit" column="unit" />
<result property="supplierCode" column="supplier_code" />
<result property="supplierName" column="supplier_name" />
<result property="incomeTime" column="income_time" />
<result property="checkLoc" column="check_loc" />
<result property="checkStatus" column="check_status" />
<result property="checkManCode" column="check_man_code" />
<result property="checkManName" column="check_man_name" />
<result property="checkTime" column="check_time" />
<result property="checkResult" column="check_result" />
<result property="status" column="status" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="factoryCode" column="factory_code" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectQcCheckTaskIncomeVo">
select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task_income
</sql>
<select id="selectQcCheckTaskIncomeList" parameterType="QcCheckTaskIncome" resultMap="QcCheckTaskIncomeResult">
<include refid="selectQcCheckTaskIncomeVo"/>
<where>
<if test="checkNo != null and checkNo != ''"> and check_no = #{checkNo}</if>
<if test="incomeBatchNo != null and incomeBatchNo != ''"> and income_batch_no = #{incomeBatchNo}</if>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="quality != null "> and quality = #{quality}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="supplierCode != null and supplierCode != ''"> and supplier_code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="incomeTime != null "> and income_time = #{incomeTime}</if>
<if test="checkLoc != null and checkLoc != ''"> and check_loc = #{checkLoc}</if>
<if test="checkStatus != null and checkStatus != ''"> and check_status = #{checkStatus}</if>
<if test="checkManCode != null and checkManCode != ''"> and check_man_code = #{checkManCode}</if>
<if test="checkManName != null and checkManName != ''"> and check_man_name like concat('%', #{checkManName}, '%')</if>
<if test="checkTime != null "> and check_time = #{checkTime}</if>
<if test="checkResult != null and checkResult != ''"> and check_result = #{checkResult}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
</where>
</select>
<select id="selectQcCheckTaskIncomeByRecordId" parameterType="String" resultMap="QcCheckTaskIncomeResult">
<include refid="selectQcCheckTaskIncomeVo"/>
where record_id = #{recordId}
</select>
<select id="getQcListBom" resultType="com.op.quality.domain.QcBomComponent">
select product_code component,product_desc_zh componentName
from base_product
where del_flag = '0'
<if test="component != null and component != ''"> and product_code like concat('%', #{component}, '%')</if>
<if test="componentName != null and componentName != ''"> and product_desc_zh like concat('%', #{componentName}, '%')</if>
</select>
<insert id="insertQcCheckTaskIncome" parameterType="QcCheckTaskIncome">
insert into qc_check_task_income
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>
<if test="checkNo != null">check_no,</if>
<if test="incomeBatchNo != null">income_batch_no,</if>
<if test="orderNo != null">order_no,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
<if test="quality != null">quality,</if>
<if test="unit != null">unit,</if>
<if test="supplierCode != null">supplier_code,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="incomeTime != null">income_time,</if>
<if test="checkLoc != null">check_loc,</if>
<if test="checkStatus != null">check_status,</if>
<if test="checkManCode != null">check_man_code,</if>
<if test="checkManName != null">check_man_name,</if>
<if test="checkTime != null">check_time,</if>
<if test="checkResult != null">check_result,</if>
<if test="status != null">status,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordId != null">#{recordId},</if>
<if test="checkNo != null">#{checkNo},</if>
<if test="incomeBatchNo != null">#{incomeBatchNo},</if>
<if test="orderNo != null">#{orderNo},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
<if test="quality != null">#{quality},</if>
<if test="unit != null">#{unit},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="incomeTime != null">#{incomeTime},</if>
<if test="checkLoc != null">#{checkLoc},</if>
<if test="checkStatus != null">#{checkStatus},</if>
<if test="checkManCode != null">#{checkManCode},</if>
<if test="checkManName != null">#{checkManName},</if>
<if test="checkTime != null">#{checkTime},</if>
<if test="checkResult != null">#{checkResult},</if>
<if test="status != null">#{status},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateQcCheckTaskIncome" parameterType="QcCheckTaskIncome">
update qc_check_task_income
<trim prefix="SET" suffixOverrides=",">
<if test="checkNo != null">check_no = #{checkNo},</if>
<if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
<if test="orderNo != null">order_no = #{orderNo},</if>
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="quality != null">quality = #{quality},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="incomeTime != null">income_time = #{incomeTime},</if>
<if test="checkLoc != null">check_loc = #{checkLoc},</if>
<if test="checkStatus != null">check_status = #{checkStatus},</if>
<if test="checkManCode != null">check_man_code = #{checkManCode},</if>
<if test="checkManName != null">check_man_name = #{checkManName},</if>
<if test="checkTime != null">check_time = #{checkTime},</if>
<if test="checkResult != null">check_result = #{checkResult},</if>
<if test="status != null">status = #{status},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where record_id = #{recordId}
</update>
<delete id="deleteQcCheckTaskIncomeByRecordId" parameterType="String">
delete from qc_check_task_income where record_id = #{recordId}
</delete>
<delete id="deleteQcCheckTaskIncomeByRecordIds" parameterType="String">
delete from qc_check_task_income where record_id in
<foreach item="recordId" collection="array" open="(" separator="," close=")">
#{recordId}
</foreach>
</delete>
</mapper>

@ -0,0 +1,183 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.quality.mapper.QcCheckTaskProduceMapper">
<resultMap type="QcCheckTaskProduce" id="QcCheckTaskProduceResult">
<result property="recordId" column="record_id" />
<result property="checkNo" column="check_no" />
<result property="batchNo" column="batch_no" />
<result property="orderNo" column="order_no" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="quality" column="quality" />
<result property="unit" column="unit" />
<result property="carCode" column="car_code" />
<result property="carName" column="car_name" />
<result property="produceDate" column="produce_date" />
<result property="checkLoc" column="check_loc" />
<result property="checkStatus" column="check_status" />
<result property="checkManCode" column="check_man_code" />
<result property="checkManName" column="check_man_name" />
<result property="checkTime" column="check_time" />
<result property="checkResult" column="check_result" />
<result property="status" column="status" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="factoryCode" column="factory_code" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectQcCheckTaskProduceVo">
select record_id, check_no, batch_no, order_no, material_code, material_name, quality, unit, car_code, car_name, produce_date, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task_produce
</sql>
<select id="selectQcCheckTaskProduceList" parameterType="QcCheckTaskProduce" resultMap="QcCheckTaskProduceResult">
<include refid="selectQcCheckTaskProduceVo"/>
<where>
<if test="checkNo != null and checkNo != ''"> and check_no = #{checkNo}</if>
<if test="batchNo != null and batchNo != ''"> and batch_no = #{batchNo}</if>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="quality != null "> and quality = #{quality}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="carCode != null and carCode != ''"> and car_code = #{carCode}</if>
<if test="carName != null and carName != ''"> and car_name like concat('%', #{carName}, '%')</if>
<if test="produceDate != null "> and produce_date = #{produceDate}</if>
<if test="checkLoc != null and checkLoc != ''"> and check_loc = #{checkLoc}</if>
<if test="checkStatus != null and checkStatus != ''"> and check_status = #{checkStatus}</if>
<if test="checkManCode != null and checkManCode != ''"> and check_man_code = #{checkManCode}</if>
<if test="checkManName != null and checkManName != ''"> and check_man_name like concat('%', #{checkManName}, '%')</if>
<if test="checkTime != null "> and check_time = #{checkTime}</if>
<if test="checkResult != null and checkResult != ''"> and check_result = #{checkResult}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
</where>
</select>
<select id="selectQcCheckTaskProduceByRecordId" parameterType="String" resultMap="QcCheckTaskProduceResult">
<include refid="selectQcCheckTaskProduceVo"/>
where record_id = #{recordId}
</select>
<insert id="insertQcCheckTaskProduce" parameterType="QcCheckTaskProduce">
insert into qc_check_task_produce
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>
<if test="checkNo != null">check_no,</if>
<if test="batchNo != null">batch_no,</if>
<if test="orderNo != null">order_no,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
<if test="quality != null">quality,</if>
<if test="unit != null">unit,</if>
<if test="carCode != null">car_code,</if>
<if test="carName != null">car_name,</if>
<if test="produceDate != null">produce_date,</if>
<if test="checkLoc != null">check_loc,</if>
<if test="checkStatus != null">check_status,</if>
<if test="checkManCode != null">check_man_code,</if>
<if test="checkManName != null">check_man_name,</if>
<if test="checkTime != null">check_time,</if>
<if test="checkResult != null">check_result,</if>
<if test="status != null">status,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordId != null">#{recordId},</if>
<if test="checkNo != null">#{checkNo},</if>
<if test="batchNo != null">#{batchNo},</if>
<if test="orderNo != null">#{orderNo},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
<if test="quality != null">#{quality},</if>
<if test="unit != null">#{unit},</if>
<if test="carCode != null">#{carCode},</if>
<if test="carName != null">#{carName},</if>
<if test="produceDate != null">#{produceDate},</if>
<if test="checkLoc != null">#{checkLoc},</if>
<if test="checkStatus != null">#{checkStatus},</if>
<if test="checkManCode != null">#{checkManCode},</if>
<if test="checkManName != null">#{checkManName},</if>
<if test="checkTime != null">#{checkTime},</if>
<if test="checkResult != null">#{checkResult},</if>
<if test="status != null">#{status},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateQcCheckTaskProduce" parameterType="QcCheckTaskProduce">
update qc_check_task_produce
<trim prefix="SET" suffixOverrides=",">
<if test="checkNo != null">check_no = #{checkNo},</if>
<if test="batchNo != null">batch_no = #{batchNo},</if>
<if test="orderNo != null">order_no = #{orderNo},</if>
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="quality != null">quality = #{quality},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="carCode != null">car_code = #{carCode},</if>
<if test="carName != null">car_name = #{carName},</if>
<if test="produceDate != null">produce_date = #{produceDate},</if>
<if test="checkLoc != null">check_loc = #{checkLoc},</if>
<if test="checkStatus != null">check_status = #{checkStatus},</if>
<if test="checkManCode != null">check_man_code = #{checkManCode},</if>
<if test="checkManName != null">check_man_name = #{checkManName},</if>
<if test="checkTime != null">check_time = #{checkTime},</if>
<if test="checkResult != null">check_result = #{checkResult},</if>
<if test="status != null">status = #{status},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where record_id = #{recordId}
</update>
<delete id="deleteQcCheckTaskProduceByRecordId" parameterType="String">
delete from qc_check_task_produce where record_id = #{recordId}
</delete>
<delete id="deleteQcCheckTaskProduceByRecordIds" parameterType="String">
delete from qc_check_task_produce where record_id in
<foreach item="recordId" collection="array" open="(" separator="," close=")">
#{recordId}
</foreach>
</delete>
</mapper>

@ -0,0 +1,183 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.quality.mapper.QcCheckTaskWarehousingMapper">
<resultMap type="QcCheckTaskWarehousing" id="QcCheckTaskWarehousingResult">
<result property="recordId" column="record_id" />
<result property="checkNo" column="check_no" />
<result property="batchNo" column="batch_no" />
<result property="orderNo" column="order_no" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="quality" column="quality" />
<result property="unit" column="unit" />
<result property="supplierCode" column="supplier_code" />
<result property="supplierName" column="supplier_name" />
<result property="incomeTime" column="income_time" />
<result property="checkLoc" column="check_loc" />
<result property="checkStatus" column="check_status" />
<result property="checkManCode" column="check_man_code" />
<result property="checkManName" column="check_man_name" />
<result property="checkTime" column="check_time" />
<result property="checkResult" column="check_result" />
<result property="status" column="status" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="factoryCode" column="factory_code" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectQcCheckTaskWarehousingVo">
select record_id, check_no, batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task_warehousing
</sql>
<select id="selectQcCheckTaskWarehousingList" parameterType="QcCheckTaskWarehousing" resultMap="QcCheckTaskWarehousingResult">
<include refid="selectQcCheckTaskWarehousingVo"/>
<where>
<if test="checkNo != null and checkNo != ''"> and check_no = #{checkNo}</if>
<if test="batchNo != null and batchNo != ''"> and batch_no = #{batchNo}</if>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="quality != null "> and quality = #{quality}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="supplierCode != null and supplierCode != ''"> and supplier_code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="incomeTime != null "> and income_time = #{incomeTime}</if>
<if test="checkLoc != null and checkLoc != ''"> and check_loc = #{checkLoc}</if>
<if test="checkStatus != null and checkStatus != ''"> and check_status = #{checkStatus}</if>
<if test="checkManCode != null and checkManCode != ''"> and check_man_code = #{checkManCode}</if>
<if test="checkManName != null and checkManName != ''"> and check_man_name like concat('%', #{checkManName}, '%')</if>
<if test="checkTime != null "> and check_time = #{checkTime}</if>
<if test="checkResult != null and checkResult != ''"> and check_result = #{checkResult}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
</where>
</select>
<select id="selectQcCheckTaskWarehousingByRecordId" parameterType="String" resultMap="QcCheckTaskWarehousingResult">
<include refid="selectQcCheckTaskWarehousingVo"/>
where record_id = #{recordId}
</select>
<insert id="insertQcCheckTaskWarehousing" parameterType="QcCheckTaskWarehousing">
insert into qc_check_task_warehousing
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>
<if test="checkNo != null">check_no,</if>
<if test="batchNo != null">batch_no,</if>
<if test="orderNo != null">order_no,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
<if test="quality != null">quality,</if>
<if test="unit != null">unit,</if>
<if test="supplierCode != null">supplier_code,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="incomeTime != null">income_time,</if>
<if test="checkLoc != null">check_loc,</if>
<if test="checkStatus != null">check_status,</if>
<if test="checkManCode != null">check_man_code,</if>
<if test="checkManName != null">check_man_name,</if>
<if test="checkTime != null">check_time,</if>
<if test="checkResult != null">check_result,</if>
<if test="status != null">status,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordId != null">#{recordId},</if>
<if test="checkNo != null">#{checkNo},</if>
<if test="batchNo != null">#{batchNo},</if>
<if test="orderNo != null">#{orderNo},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
<if test="quality != null">#{quality},</if>
<if test="unit != null">#{unit},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="incomeTime != null">#{incomeTime},</if>
<if test="checkLoc != null">#{checkLoc},</if>
<if test="checkStatus != null">#{checkStatus},</if>
<if test="checkManCode != null">#{checkManCode},</if>
<if test="checkManName != null">#{checkManName},</if>
<if test="checkTime != null">#{checkTime},</if>
<if test="checkResult != null">#{checkResult},</if>
<if test="status != null">#{status},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateQcCheckTaskWarehousing" parameterType="QcCheckTaskWarehousing">
update qc_check_task_warehousing
<trim prefix="SET" suffixOverrides=",">
<if test="checkNo != null">check_no = #{checkNo},</if>
<if test="batchNo != null">batch_no = #{batchNo},</if>
<if test="orderNo != null">order_no = #{orderNo},</if>
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="quality != null">quality = #{quality},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="incomeTime != null">income_time = #{incomeTime},</if>
<if test="checkLoc != null">check_loc = #{checkLoc},</if>
<if test="checkStatus != null">check_status = #{checkStatus},</if>
<if test="checkManCode != null">check_man_code = #{checkManCode},</if>
<if test="checkManName != null">check_man_name = #{checkManName},</if>
<if test="checkTime != null">check_time = #{checkTime},</if>
<if test="checkResult != null">check_result = #{checkResult},</if>
<if test="status != null">status = #{status},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where record_id = #{recordId}
</update>
<delete id="deleteQcCheckTaskWarehousingByRecordId" parameterType="String">
delete from qc_check_task_warehousing where record_id = #{recordId}
</delete>
<delete id="deleteQcCheckTaskWarehousingByRecordIds" parameterType="String">
delete from qc_check_task_warehousing where record_id in
<foreach item="recordId" collection="array" open="(" separator="," close=")">
#{recordId}
</foreach>
</delete>
</mapper>

@ -1,2 +1,2 @@
call mvn install:install-file -Dfile=sapjco3.jar -DgroupId=com.sap -DartifactId=sapjco3 -Dversion=1.0.0 -Dpackaging=jar
call mvn install:install-file -Dfile=sapjco-3.0.8.jar -DgroupId=com.sap.conn -DartifactId=sapjco -Dversion=3.0.8 -Dpackaging=jar
@pause

@ -0,0 +1,5 @@
@echo -----------------------------------------------------------------------------
@echo 将工程打包
@echo -----------------------------------------------------------------------------
call mvn clean install -Dmaven.test.skip=true
@pause

@ -90,12 +90,11 @@
</dependency>
<!-- SAP JOC 3 -->
<dependency>
<groupId>com.sap</groupId>
<artifactId>sapjco3</artifactId>
<version>1.0.0</version>
<!-- <scope>system</scope>-->
<!-- <systemPath>${project.basedir}/src/main/lib/sapjco3.jar</systemPath>-->
</dependency>
<groupId>com.sap.conn</groupId>
<artifactId>sapjco</artifactId>
<version>3.0.8</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

@ -1,36 +1,33 @@
@echo off
echo --------------------------------自定义参数,启动前先修改--------------------------------------
echo --------------------------------<EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD>--------------------------------------
set jarName=op-modules-sap.jar
set profile=dev
set imageURI=192.168.202.36:30002/op-lanju/op-sap
rem echo 获取当前日期字符串
rem echo <EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>
for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
rem echo 获取当前时间字符串
rem echo <EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>ǰʱ<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>
for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
rem echo 如当前小时小于10将空格替换为0
rem echo <EFBFBD>統ǰСʱС<EFBFBD><EFBFBD>10<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ո<EFBFBD><EFBFBD>滻Ϊ0
set T=%T: =0%
rem echo 显示输出日期时间字符串
rem echo <EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>
set imageVersion=%D%%T%
::输出发版信息
echo jar包名称:%jarName%
echo 启动环境:%profile%
echo 镜像库地址:%imageURI%
echo 镜像版本:%imageVersion%
::<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
echo jar<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%jarName%
echo <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%profile%
echo <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ:%imageURI%
echo <EFBFBD><EFBFBD><EFBFBD><EFBFBD>:%imageVersion%
echo --------------------------------mvn package...--------------------------------
::call mvn clean package -Dmaven.test.skip=true
copy .\libsapjco3.so .\target\libsapjco3.so
copy .\sapjco3.jar .\target\sapjco3.jar
cd .\target
SET df=Dockerfile
if exist %df% (
del /f /s /q .\Dockerfile
)
echo --------------------------------创建Dockerfile--------------------------------
echo --------------------------------<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Dockerfile--------------------------------
echo FROM 192.168.202.36:30002/library/openjdk:8-sw66>> Dockerfile
::echo RUN apk add libuuid libuuid-devel >> Dockerfile
echo ADD libsapjco3.so /usr/lib/libsapjco3.so >> Dockerfile
echo ADD sapjco3.jar /usr/lib/sapjco3.jar >> Dockerfile
echo RUN chmod a+x -R /usr/lib/libsapjco3.so >> Dockerfile
echo ENV LD_LIBRARY_PATH /usr/lib >> Dockerfile
echo COPY %jarName% /application.jar >> Dockerfile

@ -60,6 +60,14 @@ public class ProRecipeContent extends BaseEntity
private String controlParameters;
private String safeDosage;
public void setRecipeId(String recipeId) {
this.recipeId = recipeId;
}
public void setSafeDosage(String safeDosage) {
this.safeDosage = safeDosage;
}
public void setContentId(String contentId)
{
this.contentId = contentId;

@ -305,16 +305,11 @@
</select>
<select id="selectBaseBomComponentList" parameterType="BomComponent" resultMap="BomComponentResult">
<!--select distinct bbc.bom_code,bp.product_desc_zh,right(bp.product_code,11) as pc,bbc.product_code-->
select bbc.bom_code,b1.product_desc_zh,bbc.product_code,bbc.component,bp.product_desc_zh as componentName
from base_bom_component bbc
left join base_product b1 on right(b1.product_code,11) = bbc.product_code
left join base_product bp on right(bp.product_code,11) = bbc.component
<where>
<if test="bomCode != null and bomCode != ''"> and bom_code like concat('%', #{bomCode}, '%')</if>
<if test="productDescZh != null and productDescZh != ''"> and b1.product_desc_zh like concat('%', #{productDescZh}, '%')</if>
<!-- <if test="component != null and component != ''"> and component like concat('%', #{component}, '%')</if>-->
</where>
select product_code component,product_desc_zh componentName
from base_product
where del_flag = '0'
<if test="component != null and component != ''"> and product_code like concat('%', #{component}, '%')</if>
<if test="componentName != null and componentName != ''"> and product_desc_zh like concat('%', #{componentName}, '%')</if>
</select>
<select id="getWorkCenterList" parameterType="SysFactory" resultMap="SysFactoryResult">

Loading…
Cancel
Save