diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java index 9849139e4..85bb73cd3 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java @@ -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; diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java index bb24e53eb..6e4177a6e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -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 list = equPlanService.getEquList(equEquipment); - return getDataTable(list); - } + /** + * 获取设备信息list + * + * @param equEquipment + * @return + */ + @RequiresPermissions("device:plan:list") + @GetMapping("/getEquList") + public TableDataInfo getEquList(EquEquipment equEquipment) { + startPage(); + List 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); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java index c8fa43a51..10220ddbe 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java @@ -131,6 +131,28 @@ public class EquPlan extends BaseEntity { private List equipmentItem; + private List personList; + + private List planTimeArray; + + private List personListVO; + + public List getPersonListVO() { + return personListVO; + } + + public void setPersonListVO(List personListVO) { + this.personListVO = personListVO; + } + + public List getPlanTimeArray() { + return planTimeArray; + } + + public void setPlanTimeArray(List planTimeArray) { + this.planTimeArray = planTimeArray; + } + public List getEquipmentItem() { return equipmentItem; } @@ -139,8 +161,6 @@ public class EquPlan extends BaseEntity { this.equipmentItem = equipmentItem; } - private List personList; - public List getPersonList() { return personList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java index ddb7f9701..49b55557f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java @@ -77,6 +77,17 @@ public class EquPlanDetail extends BaseEntity { // 关联-检查项->检查详情list private List equPlanStandardList; + // 主计划code + private String planCode; + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + public List getEquPlanStandardList() { return equPlanStandardList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java index 0d61f90a9..53f044e5d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java @@ -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; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanPerson.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanPerson.java new file mode 100644 index 000000000..bd1948b9f --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanPerson.java @@ -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(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java index f5b1ae8a9..982ec2122 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java @@ -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; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/WorkCenter.java b/op-modules/op-device/src/main/java/com/op/device/domain/WorkCenter.java new file mode 100644 index 000000000..0ce0e96b7 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/WorkCenter.java @@ -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; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java index 4a1b453bf..6253ac2b6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java @@ -58,4 +58,23 @@ public interface EquPlanDetailMapper { * @return 结果 */ public int deleteEquPlanDetailByIds(String[] ids); + + /** + * 通过主计划code获取计划详情信息 + * @param planCode + * @return + */ + List selectEquPlanDetailByPlanCode(String planCode); + + /** + * 通过主计划code删除检查项详情 + * @param planCode + */ + void deleteEquPlanDetailByPlanCode(String planCode); + + /** + * 逻辑删除 + * @param planCode + */ + void delEquPlanDetailByPlanCode(String planCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java index 3a8383361..7b498dcae 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java @@ -58,4 +58,23 @@ public interface EquPlanEquMapper { * @return 结果 */ public int deleteEquPlanEquByIds(String[] ids); + + /** + * 通过主计划code获取设备信息list + * @param planCode + * @return + */ + List selectEquPlanEquByPlanCode(String planCode); + + /** + * 通过主计划code删除设备信息 + * @param planCode + */ + void deleteEquPlanEquByPlanCode(String planCode); + + /** + * 逻辑删除 + * @param planCode + */ + void delEquPlanEquByPlanCode(String planCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java index 2695e4b49..2eebf5527 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java @@ -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 selectWorkCenter(String factory); + + /** + * 获取主计划信息 + * @param planCode + * @return + */ + EquPlan selectEquPlanByPlanCode(String planCode); + + /** + * 逻辑删除 + * @param planCode + */ + void delEquPlanByPlanCode(String planCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanPersonMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanPersonMapper.java new file mode 100644 index 000000000..4229cb741 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanPersonMapper.java @@ -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 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); + + /** + * 通过主计划code获取人员list + * @param planCode + * @return + */ + List selectEquPlanPersonByPlanCode(String planCode); + + /** + * 通过主计划code删除人员信息 + * @param planCode + */ + void deleteEquPlanPersonByPlanCode(String planCode); + + /** + * 逻辑删除 + * @param planCode + */ + void delEquPlanPersonByPlanCode(String planCode); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java index faaaeca13..561ba1643 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java @@ -58,4 +58,23 @@ public interface EquPlanStandardMapper { * @return 结果 */ public int deleteEquPlanStandardByIds(String[] ids); + + /** + * 通过主计划code获取标准信息 + * @param planCode + * @return + */ + List selectEquPlanStandardByPlanCode(String planCode); + + /** + * 通过主计划code删除标准信息 + * @param planCode + */ + void deleteEquPlanStandardByPlanCode(String planCode); + + /** + * 逻辑删除 + * @param planCode + */ + void delEquPlanStandardByPlanCode(String planCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java index 859711c4a..6948032ba 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java @@ -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); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index efecbfc2c..a779aa4c4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -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 getEquList(EquEquipment equEquipment) { - return equEquipmentMapper.selectEquEquipmentList(equEquipment); - } + /** + * 获取设备信息list + * + * @param equEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List 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 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 planTimeArray = new ArrayList<>(); + planTimeArray.add(plan.getPlanLoopStart()); + planTimeArray.add(plan.getPlanLoopEnd()); + plan.setPlanTimeArray(planTimeArray); + + + // 获取人员信息 + List personList = equPlanPersonMapper.selectEquPlanPersonByPlanCode(equPlan.getPlanCode()); + + List persons = new ArrayList<>(); + + for (EquPlanPerson person : personList) { + persons.add(person.getUserId()); + } + + // 获取设备信息 + List equipmentList = equPlanEquMapper.selectEquPlanEquByPlanCode(equPlan.getPlanCode()); + + for (EquPlanEqu equipment : equipmentList) { + // 获取检查项list + EquPlanDetail selectDetail = new EquPlanDetail(); + selectDetail.setParentCode(equipment.getCode()); + selectDetail.setPlanCode(equPlan.getPlanCode()); + List detailList = equPlanDetailMapper.selectEquPlanDetailList(selectDetail); + for (EquPlanDetail detail : detailList) { + // 获取标准list + EquPlanStandard selectStandard = new EquPlanStandard(); + selectStandard.setParentCode(detail.getCode()); + selectStandard.setPlanCode(equPlan.getPlanCode()); + List 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 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 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 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 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); + } + + } + + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml index 5e0a77038..15ffb1ebc 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml @@ -8,6 +8,7 @@ + @@ -27,7 +28,7 @@ - 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 + + insert into equ_plan_detail id, code, plan_id, + plan_code, parent_code, item_code, item_name, @@ -81,6 +89,7 @@ #{id}, #{code}, #{planId}, + #{planCode}, #{parentCode}, #{itemCode}, #{itemName}, @@ -105,6 +114,7 @@ code = #{code}, plan_id = #{planId}, + plan_code = #{planCode}, parent_code = #{parentCode}, item_code = #{itemCode}, item_name = #{itemName}, @@ -135,4 +145,12 @@ #{id} + + + delete from equ_plan_detail where plan_code = #{planCode} + + + + update equ_plan_detail set del_flag = '1' where plan_code = #{planCode} + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml index c5a504629..8813f53e7 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml @@ -7,6 +7,7 @@ + @@ -22,13 +23,14 @@ - 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 + + insert into equ_plan_equ id, code, parent_code, + plan_code, equipment_code, equipment_name, factory_code, @@ -66,6 +74,7 @@ #{id}, #{code}, #{parentCode}, + #{planCode}, #{equipmentCode}, #{equipmentName}, #{factoryCode}, @@ -85,6 +94,7 @@ code = #{code}, parent_code = #{parentCode}, + plan_code = #{planCode}, equipment_code = #{equipmentCode}, equipment_name = #{equipmentName}, factory_code = #{factoryCode}, @@ -110,4 +120,12 @@ #{id} + + + delete from equ_plan_equ where plan_code = #{planCode} + + + + update equ_plan_equ set del_flag = '1' where plan_code = #{planCode} + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml index f42a047b5..062eebd7c 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml @@ -67,12 +67,30 @@ and CONVERT(date,update_time) >= #{updateTimeStart} and #{updateTimeEnd} >= CONVERT(date,update_time) and update_by like concat('%', #{updateBy}, '%') + and del_flag = '0' + + + + + + @@ -159,15 +177,12 @@ attr2 = #{attr2}, attr3 = #{attr3}, del_flag = #{delFlag}, - and CONVERT(date,create_time) >= #{createTimeStart} - and #{createTimeEnd} >= CONVERT(date,create_time) - and create_by like concat('%', #{createBy}, '%') - and CONVERT(date,update_time) >= #{updateTimeStart} - and #{updateTimeEnd} >= CONVERT(date,update_time) - and update_by like concat('%', #{updateBy}, '%') - and del_flag = '0' + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, - where plan_id = #{planId} + where plan_id = #{planId} and del_flag = '0' @@ -180,4 +195,8 @@ #{planId} + + + update equ_plan set del_flag = '1' where plan_code = #{planCode} and del_flag = '0' + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanPersonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanPersonMapper.xml new file mode 100644 index 000000000..821cea6bd --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanPersonMapper.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + insert into equ_plan_person + + id, + plan_code, + user_id, + user_name, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{planCode}, + #{userId}, + #{userName}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan_person + + plan_code = #{planCode}, + user_id = #{userId}, + user_name = #{userName}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_plan_person where id = #{id} + + + + delete from equ_plan_person where id in + + #{id} + + + + + delete from equ_plan_person where plan_code = #{planCode} + + + + update equ_plan_person set del_flag = '1' where plan_code = #{planCode} + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml index 067fc5413..928746738 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml @@ -8,6 +8,7 @@ + @@ -26,7 +27,7 @@ - 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 + + insert into equ_plan_standard id, code, parent_code, + plan_code, detail_code, standard_type, standard_name, @@ -78,6 +86,7 @@ #{id}, #{code}, #{parentCode}, + #{planCode}, #{detailCode}, #{standardType}, #{standardName}, @@ -101,6 +110,7 @@ code = #{code}, parent_code = #{parentCode}, + plan_code = #{planCode}, detail_code = #{detailCode}, standard_type = #{standardType}, standard_name = #{standardName}, @@ -130,4 +140,12 @@ #{id} + + + delete from equ_plan_standard where plan_code = #{planCode} + + + + update equ_plan_standard set del_flag = '1' where plan_code = #{planCode} + \ No newline at end of file diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 8b5c90ace..2a3811487 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -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 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 list = mesReportWorkService.getProcessFinishList(mesProcessReport); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java index 918020eb3..cbd4500af 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java @@ -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 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)); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java index 863852300..a169d7dae 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java @@ -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 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"); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 0a15f0173..c6c8177f0 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -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 { /** * 查询报工报表 diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java index 9c74e4be4..b53c49dca 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java @@ -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 getBoardFactory(BoardDTO boardDTO); String saveLGusedLog(List lgdtos); + + List getProShifts(BoardDTO boardDTO); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 58062566a..020ab1849 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -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 getProShifts(BoardDTO boardDTO) { + DynamicDataSourceContextHolder.push("ds_"+boardDTO.getFactory());// 这是数据源的key + return mesReportWorkMapper.selectProShift(); + + } + @Override public String saveLGusedLog(List 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()); } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index f08736df5..0acd5a912 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -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} + + and mt.shift_id = #{shiftId} + group by equ.equipment_type_code, equ.equipment_type_name @@ -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} + + and mt.shift_id = #{shiftId} + 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 + + and mt.shift_id = #{shiftId} + group by equ.equipment_type_code, equ.equipment_type_name @@ -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 + + and mt.shift_id = #{shiftId} + group by mt.equipmentCode, equ.equipment_name, equ.equipment_type_code diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskDetailController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskDetailController.java new file mode 100644 index 000000000..ea23ac0c1 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskDetailController.java @@ -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 list = qcCheckTaskDetailService.selectQcCheckTaskDetailList(qcCheckTaskDetail); + return getDataTable(list); + } + + /** + * 导出检验任务详情列表 + */ + @PostMapping("/export") + public void export(HttpServletResponse response, QcCheckTaskDetail qcCheckTaskDetail) { + List list = qcCheckTaskDetailService.selectQcCheckTaskDetailList(qcCheckTaskDetail); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java new file mode 100644 index 000000000..68bc62dac --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -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 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 list = qcCheckTaskIncomeService.selectQcCheckTaskIncomeList(qcCheckTaskIncome); + ExcelUtil util = new ExcelUtil(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 list = qcCheckTaskIncomeService.getQcListBom(bomComponent); + return getDataTable(list); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java new file mode 100644 index 000000000..d0773a158 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java @@ -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 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 list = qcCheckTaskProduceService.selectQcCheckTaskProduceList(qcCheckTaskProduce); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java new file mode 100644 index 000000000..5c9a27bf0 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskWarehousingController.java @@ -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 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 list = qcCheckTaskWarehousingService.selectQcCheckTaskWarehousingList(qcCheckTaskWarehousing); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcBomComponent.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcBomComponent.java new file mode 100644 index 000000000..eecfb1b87 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcBomComponent.java @@ -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 children; +// +// public List getChildren() { +// return children; +// } +// +// public void setChildren(List 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(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java new file mode 100644 index 000000000..24eb45fad --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -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(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java new file mode 100644 index 000000000..b6b18817e --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -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(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java new file mode 100644 index 000000000..5a6914cc0 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -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(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java new file mode 100644 index 000000000..0d2206c53 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java @@ -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(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDetailMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDetailMapper.java new file mode 100644 index 000000000..54db74ecb --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDetailMapper.java @@ -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 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); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java new file mode 100644 index 000000000..cd1a8835d --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -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 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 getQcListBom(QcBomComponent bomComponent); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java new file mode 100644 index 000000000..b28e517cb --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java @@ -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 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); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskWarehousingMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskWarehousingMapper.java new file mode 100644 index 000000000..18ff40200 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskWarehousingMapper.java @@ -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 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); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDetailService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDetailService.java new file mode 100644 index 000000000..4618602a2 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDetailService.java @@ -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 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); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java new file mode 100644 index 000000000..4432d5124 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -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 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 getQcListBom(com.op.quality.domain.QcBomComponent bomComponent); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskProduceService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskProduceService.java new file mode 100644 index 000000000..86da5b816 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskProduceService.java @@ -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 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); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskWarehousingService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskWarehousingService.java new file mode 100644 index 000000000..47cdb3ea2 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskWarehousingService.java @@ -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 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); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDetailServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDetailServiceImpl.java new file mode 100644 index 000000000..dd250bfff --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDetailServiceImpl.java @@ -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 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); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java new file mode 100644 index 000000000..a97c6b1a6 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -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 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 getQcListBom(QcBomComponent bomComponent) { + return qcCheckTaskIncomeMapper.getQcListBom(bomComponent); + } + +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java new file mode 100644 index 000000000..c58fafba2 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -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 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); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java new file mode 100644 index 000000000..31eedbcd6 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -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 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); + } +} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml new file mode 100644 index 000000000..282348028 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into qc_check_task_detail + + 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, + + + #{recordId}, + #{belongTo}, + #{orderNum}, + #{ruleName}, + #{propertyCode}, + #{checkMode}, + #{checkTool}, + #{unitCode}, + #{checkStandard}, + #{actualValue}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + + + + + update qc_check_task_detail + + belong_to = #{belongTo}, + order_num = #{orderNum}, + rule_name = #{ruleName}, + property_code = #{propertyCode}, + check_mode = #{checkMode}, + check_tool = #{checkTool}, + unit_code = #{unitCode}, + check_standard = #{checkStandard}, + actual_value = #{actualValue}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag = #{delFlag}, + + where record_id = #{recordId} + + + + delete from qc_check_task_detail where record_id = #{recordId} + + + + delete from qc_check_task_detail where record_id in + + #{recordId} + + + \ No newline at end of file diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml new file mode 100644 index 000000000..2ad2c75ac --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + insert into qc_check_task_income + + 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, + + + #{recordId}, + #{checkNo}, + #{incomeBatchNo}, + #{orderNo}, + #{materialCode}, + #{materialName}, + #{quality}, + #{unit}, + #{supplierCode}, + #{supplierName}, + #{incomeTime}, + #{checkLoc}, + #{checkStatus}, + #{checkManCode}, + #{checkManName}, + #{checkTime}, + #{checkResult}, + #{status}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + + + + + update qc_check_task_income + + check_no = #{checkNo}, + income_batch_no = #{incomeBatchNo}, + order_no = #{orderNo}, + material_code = #{materialCode}, + material_name = #{materialName}, + quality = #{quality}, + unit = #{unit}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + income_time = #{incomeTime}, + check_loc = #{checkLoc}, + check_status = #{checkStatus}, + check_man_code = #{checkManCode}, + check_man_name = #{checkManName}, + check_time = #{checkTime}, + check_result = #{checkResult}, + status = #{status}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag = #{delFlag}, + + where record_id = #{recordId} + + + + delete from qc_check_task_income where record_id = #{recordId} + + + + delete from qc_check_task_income where record_id in + + #{recordId} + + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml new file mode 100644 index 000000000..ad9995bf1 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into qc_check_task_produce + + 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, + + + #{recordId}, + #{checkNo}, + #{batchNo}, + #{orderNo}, + #{materialCode}, + #{materialName}, + #{quality}, + #{unit}, + #{carCode}, + #{carName}, + #{produceDate}, + #{checkLoc}, + #{checkStatus}, + #{checkManCode}, + #{checkManName}, + #{checkTime}, + #{checkResult}, + #{status}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + + + + + update qc_check_task_produce + + check_no = #{checkNo}, + batch_no = #{batchNo}, + order_no = #{orderNo}, + material_code = #{materialCode}, + material_name = #{materialName}, + quality = #{quality}, + unit = #{unit}, + car_code = #{carCode}, + car_name = #{carName}, + produce_date = #{produceDate}, + check_loc = #{checkLoc}, + check_status = #{checkStatus}, + check_man_code = #{checkManCode}, + check_man_name = #{checkManName}, + check_time = #{checkTime}, + check_result = #{checkResult}, + status = #{status}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag = #{delFlag}, + + where record_id = #{recordId} + + + + delete from qc_check_task_produce where record_id = #{recordId} + + + + delete from qc_check_task_produce where record_id in + + #{recordId} + + + \ No newline at end of file diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml new file mode 100644 index 000000000..5f469c74d --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into qc_check_task_warehousing + + 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, + + + #{recordId}, + #{checkNo}, + #{batchNo}, + #{orderNo}, + #{materialCode}, + #{materialName}, + #{quality}, + #{unit}, + #{supplierCode}, + #{supplierName}, + #{incomeTime}, + #{checkLoc}, + #{checkStatus}, + #{checkManCode}, + #{checkManName}, + #{checkTime}, + #{checkResult}, + #{status}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + + + + + update qc_check_task_warehousing + + check_no = #{checkNo}, + batch_no = #{batchNo}, + order_no = #{orderNo}, + material_code = #{materialCode}, + material_name = #{materialName}, + quality = #{quality}, + unit = #{unit}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + income_time = #{incomeTime}, + check_loc = #{checkLoc}, + check_status = #{checkStatus}, + check_man_code = #{checkManCode}, + check_man_name = #{checkManName}, + check_time = #{checkTime}, + check_result = #{checkResult}, + status = #{status}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag = #{delFlag}, + + where record_id = #{recordId} + + + + delete from qc_check_task_warehousing where record_id = #{recordId} + + + + delete from qc_check_task_warehousing where record_id in + + #{recordId} + + + \ No newline at end of file diff --git a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml similarity index 100% rename from op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml rename to op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml diff --git a/op-modules/op-sap/install-sap-jar.bat b/op-modules/op-sap/install-sap-jar.bat index 9652b770e..c213decf1 100644 --- a/op-modules/op-sap/install-sap-jar.bat +++ b/op-modules/op-sap/install-sap-jar.bat @@ -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 \ No newline at end of file diff --git a/op-modules/op-sap/install.bat b/op-modules/op-sap/install.bat new file mode 100644 index 000000000..95745d7ff --- /dev/null +++ b/op-modules/op-sap/install.bat @@ -0,0 +1,5 @@ +@echo ----------------------------------------------------------------------------- +@echo 将工程打包 +@echo ----------------------------------------------------------------------------- +call mvn clean install -Dmaven.test.skip=true +@pause \ No newline at end of file diff --git a/op-modules/op-sap/pom.xml b/op-modules/op-sap/pom.xml index cec3f9b6e..88c22724e 100644 --- a/op-modules/op-sap/pom.xml +++ b/op-modules/op-sap/pom.xml @@ -90,12 +90,11 @@ - com.sap - sapjco3 - 1.0.0 - - - + com.sap.conn + sapjco + 3.0.8 + + junit junit diff --git a/op-modules/op-sap/push-sap.bat b/op-modules/op-sap/push-sap.bat index 81d7c0585..020feba33 100644 --- a/op-modules/op-sap/push-sap.bat +++ b/op-modules/op-sap/push-sap.bat @@ -1,36 +1,33 @@ @echo off -echo --------------------------------Զǰ޸-------------------------------------- +echo --------------------------------�Զ������������ǰ���޸�-------------------------------------- set jarName=op-modules-sap.jar set profile=dev set imageURI=192.168.202.36:30002/op-lanju/op-sap -rem echo ȡǰַ +rem echo ��ȡ��ǰ�����ַ��� for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c -rem echo ȡǰʱַ +rem echo ��ȡ��ǰʱ���ַ��� for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b -rem echo 統ǰСʱС10ո滻Ϊ0 +rem echo �統ǰСʱС��10�����ո��滻Ϊ0 set T=%T: =0% -rem echo ʾʱַ +rem echo ��ʾ�������ʱ���ַ��� set imageVersion=%D%%T% -::Ϣ -echo jar:%jarName% -echo :%profile% -echo ַ:%imageURI% -echo 汾:%imageVersion% +::���������Ϣ +echo jar������:%jarName% +echo ��������:%profile% +echo ������ַ:%imageURI% +echo ����汾:%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 --------------------------------����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 diff --git a/op-modules/op-sap/sapjco-3.0.8.jar b/op-modules/op-sap/sapjco-3.0.8.jar new file mode 100644 index 000000000..5974792d9 Binary files /dev/null and b/op-modules/op-sap/sapjco-3.0.8.jar differ diff --git a/op-modules/op-sap/src/main/lib/sapjco3.jar b/op-modules/op-sap/src/main/lib/sapjco3.jar deleted file mode 100644 index 8f123918d..000000000 Binary files a/op-modules/op-sap/src/main/lib/sapjco3.jar and /dev/null differ diff --git a/op-modules/op-technology/src/main/java/com/op/technology/domain/ProRecipeContent.java b/op-modules/op-technology/src/main/java/com/op/technology/domain/ProRecipeContent.java index 57ff24aff..66475d9e0 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/domain/ProRecipeContent.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/domain/ProRecipeContent.java @@ -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; diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml index f0bbdf005..dc3a4fa46 100644 --- a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml +++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml @@ -305,16 +305,11 @@