diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java index cbdf96f30..2a8dcaa2f 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java @@ -21,4 +21,10 @@ public interface RemoteDeviceService { @PostMapping("/deviceTask/createSpotCheckPlanTask") public R createSpotCheckPlanTask(); + + @PostMapping("/deviceTask/createPatrolCheckPlanTask") + public R createPatrolCheckPlanTask(); + + @PostMapping("/deviceTask/createMaintenancePlanTask") + public R createMaintenancePlanTask(); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDTO.java index 7dfdce5b4..51d30ba96 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDTO.java @@ -1,15 +1,14 @@ package com.op.system.api.domain.dto; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -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; - -import java.util.Date; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; /** - * 备料单对象 mes_prepare + * 备料单对象 mes_prepareDTO * * @author Open Platform * @date 2023-08-03 @@ -23,6 +22,7 @@ public class MesPrepareDTO extends BaseEntity { /** 工单编码 */ @Excel(name = "工单编码") private String workorderCode; + private String workorderCodeSap; /** 工单名称 */ @Excel(name = "工单名称") @@ -120,6 +120,25 @@ public class MesPrepareDTO extends BaseEntity { /** 工厂编码 */ @Excel(name = "工厂编码") private String factoryCode; + + private String dayStr; + + public String getWorkorderCodeSap() { + return workorderCodeSap; + } + + public void setWorkorderCodeSap(String workorderCodeSap) { + this.workorderCodeSap = workorderCodeSap; + } + + public String getDayStr() { + return dayStr; + } + + public void setDayStr(String dayStr) { + this.dayStr = dayStr; + } + public String getMaterialCode() { return materialCode; } @@ -305,37 +324,37 @@ public class MesPrepareDTO extends BaseEntity { @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("prepareId", getPrepareId()) - .append("workorderCode", getWorkorderCode()) - .append("workorderName", getWorkorderName()) - .append("parentOrder", getParentOrder()) - .append("orderId", getOrderId()) - .append("orderCode", getOrderCode()) - .append("productId", getProductId()) - .append("productCode", getProductCode()) - .append("prodType", getProdType()) - .append("productName", getProductName()) - .append("productSpc", getProductSpc()) - .append("wetDetailPlanId", getWetDetailPlanId()) - .append("productDate", getProductDate()) - .append("shiftId", getShiftId()) - .append("ancestors", getAncestors()) - .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("materialCode", getMaterialCode()) - .append("materialName", getMaterialName()) - .append("materialSpc", getMaterialSpc()) - .append("quantity", getQuantity()) - .append("unit", getUnit()) - .toString(); + .append("prepareId", getPrepareId()) + .append("workorderCode", getWorkorderCode()) + .append("workorderName", getWorkorderName()) + .append("parentOrder", getParentOrder()) + .append("orderId", getOrderId()) + .append("orderCode", getOrderCode()) + .append("productId", getProductId()) + .append("productCode", getProductCode()) + .append("prodType", getProdType()) + .append("productName", getProductName()) + .append("productSpc", getProductSpc()) + .append("wetDetailPlanId", getWetDetailPlanId()) + .append("productDate", getProductDate()) + .append("shiftId", getShiftId()) + .append("ancestors", getAncestors()) + .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("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("materialSpc", getMaterialSpc()) + .append("quantity", getQuantity()) + .append("unit", getUnit()) + .toString(); } } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java index d8c48f204..98e02a0ad 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java @@ -1,12 +1,11 @@ package com.op.system.api.domain.dto; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -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; - -import java.util.Date; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; /** * mes备料单明细对象 mes_prepare_detail @@ -42,7 +41,9 @@ public class MesPrepareDetailDTO extends BaseEntity { /** 生产数量 */ @Excel(name = "生产数量") - private Long quantity; + private String quantity; + + private String fundQuanlity; /** 工单生产日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -76,11 +77,57 @@ public class MesPrepareDetailDTO extends BaseEntity { /** 产品类型 */ @Excel(name = "产品类型") private String prodType; + /** 库位 */ + private String locator; + + private String needDate; + private String recoil; + private String buyFlag; + + public String getBuyFlag() { + return buyFlag; + } + + public void setBuyFlag(String buyFlag) { + this.buyFlag = buyFlag; + } /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String factoryCode; + public String getRecoil() { + return recoil; + } + + public void setRecoil(String recoil) { + this.recoil = recoil; + } + + public String getFundQuanlity() { + return fundQuanlity; + } + + public void setFundQuanlity(String fundQuanlity) { + this.fundQuanlity = fundQuanlity; + } + + public String getNeedDate() { + return needDate; + } + + public void setNeedDate(String needDate) { + this.needDate = needDate; + } + + public String getLocator() { + return locator; + } + + public void setLocator(String locator) { + this.locator = locator; + } + public void setRecordId(String recordId) { this.recordId = recordId; } @@ -123,11 +170,11 @@ public class MesPrepareDetailDTO extends BaseEntity { public String getUnit() { return unit; } - public void setQuantity(Long quantity) { + public void setQuantity(String quantity) { this.quantity = quantity; } - public Long getQuantity() { + public String getQuantity() { return quantity; } public void setProductDate(Date productDate) { @@ -197,27 +244,27 @@ public class MesPrepareDetailDTO extends BaseEntity { @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("recordId", getRecordId()) - .append("prepareId", getPrepareId()) - .append("materialCode", getMaterialCode()) - .append("materailName", getMaterailName()) - .append("materailSpc", getMaterailSpc()) - .append("unit", getUnit()) - .append("quantity", getQuantity()) - .append("productDate", getProductDate()) - .append("shiftId", getShiftId()) - .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("prodType", getProdType()) - .append("factoryCode", getFactoryCode()) - .toString(); + .append("recordId", getRecordId()) + .append("prepareId", getPrepareId()) + .append("materialCode", getMaterialCode()) + .append("materailName", getMaterailName()) + .append("materailSpc", getMaterailSpc()) + .append("unit", getUnit()) + .append("quantity", getQuantity()) + .append("productDate", getProductDate()) + .append("shiftId", getShiftId()) + .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("prodType", getProdType()) + .append("factoryCode", getFactoryCode()) + .toString(); } } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java index 6f1ea8644..58bbdbb73 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java @@ -161,6 +161,15 @@ public class MesReportWorkDTO extends BaseEntity { private String createTimeEnd; private String feedbackTimeStart; private String feedbackTimeEnd; + private String endReport; + + public String getEndReport() { + return endReport; + } + + public void setEndReport(String endReport) { + this.endReport = endReport; + } public BigDecimal getQuantitySplit() { return quantitySplit; diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java new file mode 100644 index 000000000..c070aa2ee --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java @@ -0,0 +1,45 @@ +package com.op.system.api.domain.quality; + +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; + +import java.math.BigDecimal; +import java.util.List; + +/** + * + *echart 图标实体 + * @author zxl + * @date 2023-07-18 + */ +public class ChartDTO { + private String name; + private String type; + private List data; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/FactoryDto.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/FactoryDto.java new file mode 100644 index 000000000..1964ae425 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/FactoryDto.java @@ -0,0 +1,126 @@ +package com.op.system.api.domain.quality; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.TreeEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 工厂模型对象 sys_factory + * + * @author Open Platform + * @date 2023-07-03 + */ +public class FactoryDto extends TreeEntity { + private static final long serialVersionUID = 1L; + + /** 工厂id */ + private Long factoryId; + + /** 部门名称 */ + @Excel(name = "工厂名称") + private String factoryName; + + /** 负责人 */ + @Excel(name = "负责人") + private String leader; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String phone; + + /** 邮箱 */ + @Excel(name = "邮箱") + private String email; + + /** 部门状态（0正常 */ + @Excel(name = "工厂状态") + private String status; + + /** 删除标志（0代表存在 */ + private String delFlag; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + public void setFactoryId(Long factoryId) { + this.factoryId = factoryId; + } + + public Long getFactoryId() { + return factoryId; + } + + public void setFactoryName(String factoryName) { + this.factoryName = factoryName; + } + + public String getFactoryName() { + return factoryName; + } + + public void setLeader(String leader) { + this.leader = leader; + } + + public String getLeader() { + return leader; + } + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPhone() { + return phone; + } + public void setEmail(String email) { + this.email = email; + } + + public String getEmail() { + return email; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("factoryId", getFactoryId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("factoryName", getFactoryName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .toString(); + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java index cdebef4b6..593f408b0 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java @@ -27,6 +27,16 @@ public class RemoteDeviceFallbackFactory implements FallbackFactory list = equRepairOrderService.getRepairPersonList(equEquipment); + List list = equRepairOrderService.getRepairPersonList(equTeamUser); return getDataTable(list); } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java index b67b4da2c..8aa3ab8e1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquSpareApplyController.java @@ -74,7 +74,7 @@ public class EquSpareApplyController extends BaseController { @Log(title = "申领记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EquSpareApply equSpareApply) { - return toAjax(equSpareApplyService.insertEquSpareApply(equSpareApply)); + return equSpareApplyService.insertEquSpareApply(equSpareApply); } /** @@ -94,7 +94,7 @@ public class EquSpareApplyController extends BaseController { @Log(title = "申领记录", businessType = BusinessType.DELETE) @DeleteMapping("/{applyIds}") public AjaxResult remove(@PathVariable String[] applyIds) { - return toAjax(equSpareApplyService.deleteEquSpareApplyByApplyIds(applyIds)); + return equSpareApplyService.deleteEquSpareApplyByApplyIds(applyIds); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java index 1aff0c837..0afa56733 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java @@ -74,6 +74,14 @@ public class EquFaultType extends BaseEntity { // 创建日期结束 private String createTimeEnd; + //故障大类 + // 字典名 + private String dictLabel; + + // 字典值 + private String dictValue; + + public List getCreateTimeArray() { return createTimeArray; } @@ -193,6 +201,22 @@ public class EquFaultType extends BaseEntity { return delFlag; } + public void setDictValue(String dictValue) { + this.dictValue = dictValue; + } + + public String getDictValue() { + return dictValue; + } + + public void setDictLabel(String dictLabel) { + this.dictLabel = dictLabel; + } + + public String getDictLabel() { + return dictLabel; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index c1ac1c741..3a9e700db 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -150,7 +150,202 @@ public class EquOrder extends BaseEntity { private int days; private String equipmentName; + //检查项列表 + private List standardList; + + /** 检查项名称 */ + private String itemName; + + /** 检查项方法/工具 */ + private String itemMethod; + + /** 维护类型编码 */ + private String itemType; + + /** 维护类型名称 */ + private String itemTypeName; + + /** 主键 */ + private String id; + public void setId(String id) { + this.id = id; + } + public String getId() { + return id; + } + + //标准列表 + public List getStandardList() { + return standardList; + } + public void setStandardList(List standardList) { + this.standardList = standardList; + } private String planRestrict; + private String outsourceCode; + + private List loopStartArray; + + private Date loopStart; + + private Date loopEnd; + + private List loopEndArray; + + private Date loopEndArrayStart; + + private Date getLoopEndArrayEnd; + + private List orderStartArray; + private Date orderStartArrayStart; + private Date orderStartArrayEnd; + private List orderEndArray; + private Date orderEndArrayStart; + private Date orderEndArrayEnd; + + private List upkeepPictures; + + private String picturePath; + + public String getPicturePath() { + return picturePath; + } + + public void setPicturePath(String picturePath) { + this.picturePath = picturePath; + } + + public List getUpkeepPictures() { + return upkeepPictures; + } + + public void setUpkeepPictures(List upkeepPictures) { + this.upkeepPictures = upkeepPictures; + } + + public List getOrderStartArray() { + return orderStartArray; + } + + public void setOrderStartArray(List orderStartArray) { + this.orderStartArray = orderStartArray; + } + + public Date getOrderStartArrayStart() { + return orderStartArrayStart; + } + + public void setOrderStartArrayStart(Date orderStartArrayStart) { + this.orderStartArrayStart = orderStartArrayStart; + } + + public Date getOrderStartArrayEnd() { + return orderStartArrayEnd; + } + + public void setOrderStartArrayEnd(Date orderStartArrayEnd) { + this.orderStartArrayEnd = orderStartArrayEnd; + } + + public List getOrderEndArray() { + return orderEndArray; + } + + public void setOrderEndArray(List orderEndArray) { + this.orderEndArray = orderEndArray; + } + + public Date getOrderEndArrayStart() { + return orderEndArrayStart; + } + + public void setOrderEndArrayStart(Date orderEndArrayStart) { + this.orderEndArrayStart = orderEndArrayStart; + } + + public Date getOrderEndArrayEnd() { + return orderEndArrayEnd; + } + + public void setOrderEndArrayEnd(Date orderEndArrayEnd) { + this.orderEndArrayEnd = orderEndArrayEnd; + } + + public List getLoopEndArray() { + return loopEndArray; + } + + public void setLoopEndArray(List loopEndArray) { + this.loopEndArray = loopEndArray; + } + + public Date getLoopEndArrayStart() { + return loopEndArrayStart; + } + + public void setLoopEndArrayStart(Date loopEndArrayStart) { + this.loopEndArrayStart = loopEndArrayStart; + } + + public Date getGetLoopEndArrayEnd() { + return getLoopEndArrayEnd; + } + + public void setGetLoopEndArrayEnd(Date getLoopEndArrayEnd) { + this.getLoopEndArrayEnd = getLoopEndArrayEnd; + } + + public List getLoopStartArray() { + return loopStartArray; + } + + public void setLoopStartArray(List loopStartArray) { + this.loopStartArray = loopStartArray; + } + + public Date getLoopStart() { + return loopStart; + } + + public void setLoopStart(Date loopStart) { + this.loopStart = loopStart; + } + + public Date getLoopEnd() { + return loopEnd; + } + + public void setLoopEnd(Date loopEnd) { + this.loopEnd = loopEnd; + } + + public String getOutsourceCode() { + return outsourceCode; + } + + public void setOutsourceCode(String outsourceCode) { + this.outsourceCode = outsourceCode; + } + + private List detailList; + + private List spareList; + + public List getSpareList() { + return spareList; + } + + public void setSpareList(List spareList) { + this.spareList = spareList; + } + + public List getDetailList() { + return detailList; + } + + public void setDetailList(List detailList) { + this.detailList = detailList; + } public String getPlanRestrict() { return planRestrict; @@ -439,6 +634,35 @@ public class EquOrder extends BaseEntity { return delFlag; } + //检查项详情 + public void setItemName(String itemName) { + this.itemName = itemName; + } + public String getItemName() { + return itemName; + } + + public void setItemMethod(String itemMethod) { + this.itemMethod = itemMethod; + } + public String getItemMethod() { + return itemMethod; + } + + public void setItemType(String itemType) { + this.itemType = itemType; + } + public String getItemType() { + return itemType; + } + + public void setItemTypeName(String itemTypeName) { + this.itemTypeName = itemTypeName; + } + public String getItemTypeName() { + return itemTypeName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java index 25b1ebecc..4fb380770 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java @@ -53,7 +53,7 @@ public class EquOrderDetail extends BaseEntity { /** 工厂 */ @Excel(name = "工厂") - private String factroyCode; + private String factoryCode; /** 备用字段1 */ @Excel(name = "备用字段1") @@ -143,12 +143,12 @@ public class EquOrderDetail extends BaseEntity { public String getItemTypeName() { return itemTypeName; } - public void setFactroyCode(String factroyCode) { - this.factroyCode = factroyCode; + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; } - public String getFactroyCode() { - return factroyCode; + public String getFactoryCode() { + return factoryCode; } public void setAttr1(String attr1) { this.attr1 = attr1; @@ -191,7 +191,7 @@ public class EquOrderDetail extends BaseEntity { .append("itemMethod", getItemMethod()) .append("itemType", getItemType()) .append("itemTypeName", getItemTypeName()) - .append("factroyCode", getFactroyCode()) + .append("factoryCode", getFactoryCode()) .append("attr1", getAttr1()) .append("attr2", getAttr2()) .append("attr3", getAttr3()) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java index 1071d4dea..4118bfdcc 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java @@ -1,6 +1,9 @@ package com.op.device.domain; import java.math.BigDecimal; +import java.util.List; + +import com.op.common.core.domain.BaseFileData; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -83,6 +86,7 @@ public class EquOrderStandard extends BaseEntity { // 图片路径 private String picturePath; + private List picturePaths; private String standardTypeName; @@ -96,8 +100,32 @@ public class EquOrderStandard extends BaseEntity { private String repairPicture; - //检查项检查方法 - private String itemMethod; + private String itemName; + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + private List checkPictrueList; + + public List getCheckPictrueList() { + return checkPictrueList; + } + + public void setCheckPictrueList(List checkPictrueList) { + this.checkPictrueList = checkPictrueList; + } + + public List getPicturePaths() { + return picturePaths; + } + public void setPicturePaths(List picturePaths) { + this.picturePaths = picturePaths; + } public String getRepairPicture() { return repairPicture; @@ -275,14 +303,6 @@ public class EquOrderStandard extends BaseEntity { return delFlag; } - //检查项检查方法 - public void setItemMethod(String itemMethod) { - this.itemMethod = itemMethod; - } - public String getItemMethod() { - return itemMethod; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java index a4903fcb6..6db1d97ad 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java @@ -61,6 +61,10 @@ public class EquOutsourceWork extends BaseEntity { @Excel(name = "委外用时") private String workCostTime; + /** 委外状态 */ + @Excel(name = "委外状态") + private String workStatus; + /** 备用字段1 */ @Excel(name = "备用字段1") private String attr1; @@ -185,6 +189,13 @@ public class EquOutsourceWork extends BaseEntity { return workCostTime; } + public void setWorkStatus(String workStatus) { + this.workStatus = workStatus; + } + public String getWorkStatus() { + return workStatus; + } + public void setAttr1(String attr1) { this.attr1 = attr1; } 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 12eb74045..a630e7d85 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 @@ -145,6 +145,106 @@ public class EquPlan extends BaseEntity { private String shutDown; private String planEquId; + private List loopStartArray; + + private Date loopStart; + + private Date loopEnd; + + private List loopEndArray; + + private Date loopEndArrayStart; + + private Date getLoopEndArrayEnd; + + private String workPerson; + + private String workOutsourcingUnit; + + private String workConnection; + + private String workReason; + + public String getWorkOutsourcingUnit() { + return workOutsourcingUnit; + } + + public void setWorkOutsourcingUnit(String workOutsourcingUnit) { + this.workOutsourcingUnit = workOutsourcingUnit; + } + + public String getWorkConnection() { + return workConnection; + } + + public void setWorkConnection(String workConnection) { + this.workConnection = workConnection; + } + + public String getWorkReason() { + return workReason; + } + + public void setWorkReason(String workReason) { + this.workReason = workReason; + } + + public String getWorkPerson() { + return workPerson; + } + + public void setWorkPerson(String workPerson) { + this.workPerson = workPerson; + } + + public List getLoopEndArray() { + return loopEndArray; + } + + public void setLoopEndArray(List loopEndArray) { + this.loopEndArray = loopEndArray; + } + + public Date getLoopEndArrayStart() { + return loopEndArrayStart; + } + + public void setLoopEndArrayStart(Date loopEndArrayStart) { + this.loopEndArrayStart = loopEndArrayStart; + } + + public Date getGetLoopEndArrayEnd() { + return getLoopEndArrayEnd; + } + + public void setGetLoopEndArrayEnd(Date getLoopEndArrayEnd) { + this.getLoopEndArrayEnd = getLoopEndArrayEnd; + } + + public Date getLoopEnd() { + return loopEnd; + } + + public void setLoopEnd(Date loopEnd) { + this.loopEnd = loopEnd; + } + + public Date getLoopStart() { + return loopStart; + } + + public void setLoopStart(Date loopStart) { + this.loopStart = loopStart; + } + + public List getLoopStartArray() { + return loopStartArray; + } + + public void setLoopStartArray(List loopStartArray) { + this.loopStartArray = loopStartArray; + } + public String getPlanEquId() { return planEquId; } 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 5b0adbfee..dbc4c85be 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 @@ -64,6 +64,16 @@ public class EquPlanEqu extends BaseEntity { // 主计划code private String planCode; + private String spareOnList; + + public String getSpareOnList() { + return spareOnList; + } + + public void setSpareOnList(String spareOnList) { + this.spareOnList = spareOnList; + } + // 备件 private List spareList; diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java index 18d96105c..60c6e759a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.domain.BaseFileData; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -51,9 +52,13 @@ public class EquRepairOrder extends BaseEntity { @Excel(name = "是否立即处理") private String orderHandle; - /** 报修人 */ - @Excel(name = "报修人") - private String orderRepairman; + /** 报修人编号 */ + @Excel(name = "报修人编号") + private String orderRepairmanCode; + + /** 报修人名字 */ + @Excel(name = "报修人名字") + private String orderRepairmanName; /** 联系方式 */ @Excel(name = "联系方式") @@ -168,7 +173,20 @@ public class EquRepairOrder extends BaseEntity { //图片文件 private String fileList; - private List files; + private List files; + + //检查项列表 + private List checkList; + + //时间列表 虚拟字段 + private List orderBreakdownTimeArray; + private List orderTimeArray; + //故障开始时间、故障结束时间 + private String orderBreakdownTimeStart; + private String orderBreakdownTimeEnd; + //报修开始时间、结束时间 + private String orderTimeStart; + private String orderTimeEnd; //图片文件 public String getFileList() { @@ -177,10 +195,10 @@ public class EquRepairOrder extends BaseEntity { public void setFileList(String fileList) { this.fileList = fileList; } - public List getFiles() { + public List getFiles() { return files; } - public void setFiles(List files) { + public void setFiles(List files) { this.files = files; } @@ -355,12 +373,20 @@ public class EquRepairOrder extends BaseEntity { public String getOrderHandle() { return orderHandle; } - public void setOrderRepairman(String orderRepairman) { - this.orderRepairman = orderRepairman; + public void setOrderRepairmanCode(String orderRepairmanCode) { + this.orderRepairmanCode = orderRepairmanCode; } - public String getOrderRepairman() { - return orderRepairman; + public String getOrderRepairmanCode() { + return orderRepairmanCode; + } + + public void setOrderRepairmanName(String orderRepairmanName) { + this.orderRepairmanName = orderRepairmanName; + } + + public String getOrderRepairmanName() { + return orderRepairmanName; } public void setOrderConnection(String orderConnection) { this.orderConnection = orderConnection; @@ -440,6 +466,56 @@ public class EquRepairOrder extends BaseEntity { return factoryCode; } + public List getCheckList() { + return checkList; + } + public void setCheckList(List checkList) { + this.checkList = checkList; + } + + //时间列表 + public List getOrderBreakdownTimeArray() { + return orderBreakdownTimeArray; + } + public void setOrderBreakdownTimeArray(List orderBreakdownTimeArray) { + this.orderBreakdownTimeArray = orderBreakdownTimeArray; + } + + public List getOrderTimeArray() { + return orderTimeArray; + } + public void setOrderTimeArray(List orderTimeArray) { + this.orderTimeArray = orderTimeArray; + } + + //故障开始时间、结束时间 + public String getOrderBreakdownTimeStart() { + return orderBreakdownTimeStart; + } + public void setOrderBreakdownTimeStart(String orderBreakdownTimeStart) { + this.orderBreakdownTimeStart = orderBreakdownTimeStart; + } + public String getOrderBreakdownTimeEnd() { + return orderBreakdownTimeEnd; + } + public void setOrderBreakdownTimeEnd(String orderBreakdownTimeEnd) { + this.orderBreakdownTimeEnd = orderBreakdownTimeEnd; + } + + //报修开始时间、结束时间 + public String getOrderTimeStart() { + return orderTimeStart; + } + public void setOrderTimeStart(String orderTimeStart) { + this.orderTimeStart = orderTimeStart; + } + public String getOrdeTimeEnd() { + return orderTimeEnd; + } + public void setOrderTimeEnd(String orderTimeEnd) { + this.orderTimeEnd = orderTimeEnd; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -451,7 +527,7 @@ public class EquRepairOrder extends BaseEntity { .append("orderSource", getOrderSource()) .append("orderTime", getOrderTime()) .append("orderHandle", getOrderHandle()) - .append("orderRepairman", getOrderRepairman()) + .append("orderRepairmanCode", getOrderRepairmanCode()) .append("orderConnection", getOrderConnection()) .append("orderStatus", getOrderStatus()) .append("orderRelevance", getOrderRelevance()) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index f5c53c28e..e55546bf5 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -1,9 +1,11 @@ package com.op.device.domain; +import java.math.BigDecimal; import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.domain.BaseFileData; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -80,9 +82,8 @@ public class EquRepairWorkOrder extends BaseEntity { private String workFaultDesc; /** 维修用时 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "维修用时", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date workCostTime; + @Excel(name = "维修用时") + private String workCostTime; /** 维修费用 */ @Excel(name = "维修费用") @@ -122,12 +123,21 @@ public class EquRepairWorkOrder extends BaseEntity { /** 维修开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "维修开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private String workStartTime; + private Date workStartTime; /** 维修结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "维修结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private String workEndTime; + private Date workEndTime; + + //维修停机真正开始时间 + private Date actualDownStartTime; + + //维修停机真正结束时间 + private Date actualDownEndTime; + + /** 联系方式 */ + private String workConnection; // 设备 /** 设备名称 */ @@ -150,6 +160,14 @@ public class EquRepairWorkOrder extends BaseEntity { @Excel(name = "部门") private String department; + /** 所属工作中心编码 */ + @Excel(name = "所属工作中心编码") + private String workshopCode; + + /** 所属工作中心名称 */ + @Excel(name = "所属工作中心名称") + private String workshopName; + //报修 /** 故障描述 */ @Excel(name = "故障描述") @@ -170,20 +188,16 @@ public class EquRepairWorkOrder extends BaseEntity { private Date orderTime; /** 报修人 */ - @Excel(name = "报修人") - private String orderRepairman; + private String orderRepairmanCode; - /** 联系方式 */ - @Excel(name = "联系方式") + /** 报修人联系方式 */ private String orderConnection; //班组 /** 班组名称 */ - @Excel(name = "班组名称") private String teamName; /** 班组人员 */ - @Excel(name = "班组人员") private String teamPerson; //时间列表 虚拟字段 @@ -204,16 +218,66 @@ public class EquRepairWorkOrder extends BaseEntity { /** 委外单位 */ private String workOutsourcingUnit; /** 联系方式 */ - private String workConnection; + private String outSourceConnection; //手持 //用户id private String userId; + //检查项列表 - private List checkList; + private List detailList; + + //维修前照片 + private String beforeRepairFile; + private List beforeRepairFiles; + + //维修后照片 + private String afterRepairFile; + private List afterRepairFiles; + //申领单列表 private List applyList; + //检查项列表 + private List standardList; + + //维修前 维修后 + public String getAfterRepairFile() { + return afterRepairFile; + } + public void setAfterRepairFile(String afterRepairFile) { + this.afterRepairFile = afterRepairFile; + } + + public List getAfterRepairFiles() { + return afterRepairFiles; + } + public void setAfterRepairFiles(List afterRepairFiles) { + this.afterRepairFiles = afterRepairFiles; + } + + public String getBeforeRepairFile() { + return beforeRepairFile; + } + public void setBeforeRepairFile(String beforeRepairFile) { + this.beforeRepairFile = beforeRepairFile; + } + + public List getBeforeRepairFiles() { + return beforeRepairFiles; + } + public void setBeforeRepairFiles(List beforeRepairFiles) { + this.beforeRepairFiles = beforeRepairFiles; + } + + //detailList 检查项详情 + public List getDetailList() { + return detailList; + } + public void setDetailList(List detailList) { + this.detailList = detailList; + } + //报修 public void setOrderDesc(String orderDesc) { this.orderDesc = orderDesc; @@ -243,12 +307,13 @@ public class EquRepairWorkOrder extends BaseEntity { return orderTime; } - public void setOrderRepairman(String orderRepairman) { - this.orderRepairman = orderRepairman; + public void setOrderRepairmanCode(String orderRepairmanCode) { + this.orderRepairmanCode = orderRepairmanCode; } - public String getOrderRepairman() { - return orderRepairman; + public String getOrderRepairmanCode() { + return orderRepairmanCode; } + public void setOrderConnection(String orderConnection) { this.orderConnection = orderConnection; } @@ -292,6 +357,20 @@ public class EquRepairWorkOrder extends BaseEntity { return department; } + public void setWorkshopCode(String workshopCode) { + this.workshopCode = workshopCode; + } + public String getWorkshopCode() { + return workshopCode; + } + + public void setWorkshopName(String workshopName) { + this.workshopName = workshopName; + } + public String getWorkshopName() { + return workshopName; + } + public void setWorkId(String workId) { this.workId = workId; } @@ -299,6 +378,7 @@ public class EquRepairWorkOrder extends BaseEntity { return workId; } + public void setOrderId(String orderId) { this.orderId = orderId; } @@ -397,10 +477,10 @@ public class EquRepairWorkOrder extends BaseEntity { return workFaultDesc; } - public void setWorkCostTime(Date workCostTime) { + public void setWorkCostTime(String workCostTime) { this.workCostTime = workCostTime; } - public Date getWorkCostTime() { + public String getWorkCostTime() { return workCostTime; } @@ -469,20 +549,27 @@ public class EquRepairWorkOrder extends BaseEntity { } //维修工单 新增字段 维修开始结束时间 - public void setWorkStartTime(String workStartTime) { + public void setWorkStartTime(Date workStartTime) { this.workStartTime = workStartTime; } - public String getWorkStartTime() { + public Date getWorkStartTime() { return workStartTime; } - public void setWorkEndTime(String workEndTime) { + public void setWorkEndTime(Date workEndTime) { this.workEndTime = workEndTime; } - public String getWorkEndTime() { + public Date getWorkEndTime() { return workEndTime; } + public void setWorkConnection(String workConnection) { + this.workConnection = workConnection; + } + public String getWorkConnection() { + return workConnection; + } + //班组 public void setTeamName(String teamName) { this.teamName = teamName; @@ -528,17 +615,17 @@ public class EquRepairWorkOrder extends BaseEntity { } //计划停机开始时间、结束时间 - public String getWorkPlanTimeStart() { - return workPlanTimeStart; + public Date getActualDownStartTime() { + return actualDownStartTime; } - public void setWorkPlanTimeStart(String workPlanTimeStart) { - this.workPlanTimeStart = workPlanTimeStart; + public void setActualDownStartTime(Date actualDownStartTime) { + this.actualDownStartTime = actualDownStartTime; } - public String getWorkPlanTimeEnd() { - return workPlanTimeEnd; + public Date getActualDownEndTime() { + return actualDownEndTime; } - public void setWorkPlanTimeEnd(String workPlanTimeEnd) { - this.workPlanTimeEnd = workPlanTimeEnd; + public void setActualDownEndTime(Date actualDownEndTime) { + this.actualDownEndTime = actualDownEndTime; } //委外维修人员/委外维修原因 虚拟字段 @@ -563,11 +650,11 @@ public class EquRepairWorkOrder extends BaseEntity { return workOutsourcingUnit; } - public void setWorkConnection(String workConnection) { - this.workConnection = workConnection; + public void setOutSourceConnection(String outSourceConnection) { + this.outSourceConnection = outSourceConnection; } - public String getWorkConnection() { - return workConnection; + public String getOutSourceConnection() { + return outSourceConnection; } //手持 用户userId @@ -578,13 +665,6 @@ public class EquRepairWorkOrder extends BaseEntity { return userId; } - public List getCheckList() { - return checkList; - } - public void setCheckList(List checkList) { - this.checkList = checkList; - } - public List getApplyList() { return applyList; } @@ -592,6 +672,46 @@ public class EquRepairWorkOrder extends BaseEntity { this.applyList = applyList; } + //实际停机开始时间、结束时间 + public String getWorkPlanTimeStart() { + return workPlanTimeStart; + } + public void setWorkPlanTimeStart(String workPlanTimeStart) { + this.workPlanTimeStart = workPlanTimeStart; + } + public String getWorkPlanTimeEnd() { + return workPlanTimeEnd; + } + public void setWorkPlanTimeEnd(String workPlanTimeEnd) { + this.workPlanTimeEnd = workPlanTimeEnd; + } + + //图片文件 + private String fileList; + private List files; + + //图片文件 + public String getFileList() { + return fileList; + } + public void setFileList(String fileList) { + this.fileList = fileList; + } + public List getFiles() { + return files; + } + public void setFiles(List files) { + this.files = files; + } + + //标准列表 + public List getStandardList() { + return standardList; + } + public void setStandardList(List standardList) { + this.standardList = standardList; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java index 682394d66..76bba57db 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java @@ -1,5 +1,6 @@ package com.op.device.domain; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -39,7 +40,7 @@ public class EquSpareApply extends BaseEntity { /** 数量 */ @Excel(name = "数量") - private Long spareQuantity; + private BigDecimal spareQuantity; /** 使用组线 */ @Excel(name = "使用组线") @@ -98,6 +99,35 @@ public class EquSpareApply extends BaseEntity { /** 领用类型 */ private String applyType ; + //批量新增申领记录 + private List spareApplyLists; + /** 库存表 id */ + private String storageId; + /** 总数量 */ + private BigDecimal amount; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialDesc; + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialDesc(String materialDesc) { + this.materialDesc = materialDesc; + } + public String getMaterialDesc() { + return materialDesc; + } + public List getApplyTimeArray() { return applyTimeArray; } @@ -157,11 +187,11 @@ public class EquSpareApply extends BaseEntity { public String getSpareModel() { return spareModel; } - public void setSpareQuantity(Long spareQuantity) { + public void setSpareQuantity(BigDecimal spareQuantity) { this.spareQuantity = spareQuantity; } - public Long getSpareQuantity() { + public BigDecimal getSpareQuantity() { return spareQuantity; } public void setSpareGroupLine(String spareGroupLine) { @@ -261,6 +291,31 @@ public class EquSpareApply extends BaseEntity { this.applyType=applyType; } + //批量新增申领记录 + public List getSpareApplyLists(){ + return this.spareApplyLists; + } + /** 领用类型 */ + public void setSpareApplyLists(List spareApplyLists){ + this.spareApplyLists = spareApplyLists; + } + + //id + public void setStorageId(String storageId) { + this.storageId = storageId; + } + public String getStorageId() { + return storageId; + } + + //总数量 + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + public BigDecimal getAmount() { + return amount; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java index dd1c8e929..389d814d3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquTeamUser.java @@ -41,6 +41,10 @@ public class EquTeamUser extends BaseEntity { @Excel(name = "人员拼接名字") private String teamUserName; + /** 手机号 */ + @Excel(name = "手机号") + private String phonenumber; + public void setId(String id) { this.id = id; } @@ -90,6 +94,14 @@ public class EquTeamUser extends BaseEntity { this.teamUserName = teamUserName; } + public void setPhonenumber(String phonenumber) { + this.phonenumber = phonenumber; + } + + public String getPhonenumber() { + return phonenumber; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java index 591d88a67..9f07ce356 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/PDADTO.java @@ -5,6 +5,26 @@ public class PDADTO { private String userId; private String planType; + private String orderCode; + + private String shutDown; + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getShutDown() { + return shutDown; + } + + public void setShutDown(String shutDown) { + this.shutDown = shutDown; + } + public String getUserId() { return userId; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java index 4189bab84..a2e126c74 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java @@ -1,9 +1,6 @@ package com.op.device.domain.vo; -import com.op.device.domain.EquOrder; -import com.op.device.domain.EquOrderDetail; -import com.op.device.domain.EquOrderEquSpare; -import com.op.device.domain.Equipment; +import com.op.device.domain.*; import java.util.List; @@ -12,13 +9,13 @@ public class InspectionWorkVO { private EquOrder order; private Equipment equ; private List detailList; - private List spareList; + private List spareList; - public List getSpareList() { + public List getSpareList() { return spareList; } - public void setSpareList(List spareList) { + public void setSpareList(List spareList) { this.spareList = spareList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceTaskMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceTaskMapper.java index fbdda61af..bfd4101e6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceTaskMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceTaskMapper.java @@ -21,4 +21,6 @@ public interface DeviceTaskMapper { List getPlans(EquPlan equPlan); EquOrder getNewTaskOrder(EquPlan quPlan); + + EquOrder getNewTaskOrder0(EquPlan plan); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java index 8f33ec256..914b2e935 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java @@ -3,6 +3,7 @@ package com.op.device.mapper; import java.util.List; import com.op.device.domain.EquFaultType; +import com.op.device.domain.EquRepairWorkOrder; /** * 故障类型维护Mapper接口 @@ -64,4 +65,7 @@ public interface EquFaultTypeMapper { * @return */ int selectSerialNumber(); + + //故障报修第一级 + List selectFirstLevelList(EquRepairWorkOrder equRepairWorkOrder); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFileMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFileMapper.java index 7b6d3fde5..ac521b1a9 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFileMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFileMapper.java @@ -74,4 +74,11 @@ public interface EquFileMapper { //删除照图片 public void deleteEquFileBySourceId(String orderId); + + /** + * 获取图片 + * @param selectTemp + * @return + */ + List selectUrlList(BaseFileData selectTemp); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java index 37e627431..6b289b43a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderDetailMapper.java @@ -78,4 +78,10 @@ public interface EquOrderDetailMapper { List selectEquOrderDetailByOrderCode(String orderCode); int insertEquOrderDetails(@Param("list") List details); + + /** + * 通过orderIds逻辑删除检查项信息 + * @param orderIds + */ + void delEquOrderDetailByorderIds(String[] orderIds); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java index 1cd90aa40..0b212828a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java @@ -70,4 +70,6 @@ public interface EquOrderEquMapper { int insertEquOrderEqus(@Param("list") List equs); + // 通过工单code查询设备order + EquOrderEqu selectEquOrderEquListByOrderCode(String orderCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquSpareMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquSpareMapper.java index 1d073bb6d..7207439d7 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquSpareMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquSpareMapper.java @@ -3,6 +3,8 @@ package com.op.device.mapper; import java.util.List; import com.op.device.domain.EquOrderEquSpare; +import com.op.device.domain.EquPlanEquSpare; +import org.apache.ibatis.annotations.Param; /** * 工单设备备件关联Mapper接口 @@ -72,4 +74,6 @@ public interface EquOrderEquSpareMapper { * @return */ List selectEquOrderEquSpareByOrderCode(String orderCode); + + int insertEquOrderEquSpares(@Param("list") List spares); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 6e251af65..23a437fed 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOrder; +import com.op.device.domain.EquOrderStandard; import com.op.device.domain.EquPlan; import com.op.device.domain.dto.PDADTO; import org.apache.ibatis.annotations.Mapper; @@ -120,4 +121,44 @@ public interface EquOrderMapper { */ List selectTodayTask(PDADTO pdadto); + /** + * 通过设备编码查询设备名称 + * @param equipmentCode + * @return + */ + String selectEquipmentNameByEquCode(String equipmentCode); + + /** + * 通过OrderCode查询对应所有检查项ID + * @param orderCode + * @return + */ + List getIdsByOrderCode(String orderCode); + + /** + * 只更新维修单号 + * @param equOrder + * @return + */ + void updateEquOrderRepairCode(EquOrder equOrder); + + /** + * 手持、PC获取维修点检、巡检检查项 + * @param + * @return + */ + List selectCheckListByWorkCode(EquOrder equOrder); + + /** + * 手持、PC获取报修点检、巡检检查项 + * @param + * @return + */ + List selectCheckListByRepairCode(EquOrder equOrder); + + /** + * 逻辑删除工单信息 + * @param orderIds + */ + void delEquOrderByOrderIds(String[] orderIds); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java index daad4389f..fd36f55f3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java @@ -68,5 +68,11 @@ public interface EquOrderPersonMapper { */ List selectEquOrderPersonByOrderCode(String orderCode); - int insertEquOrderPlans(@Param("list") List persons); + int insertEquOrderPersons(@Param("list") List persons); + + /** + * 通过工单ids逻辑删除人员信息 + * @param orderIds + */ + void delEquOrderPersonByorderIds(String[] orderIds); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java index 98ee5be5e..41308b975 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java @@ -71,11 +71,39 @@ public interface EquOrderStandardMapper { List selectEquOrderStandardByParentCode(String code); /** - * 手持维修工单关联检查项信息 - * @param equOrder - * @return + * 图片数据绑定 + * @param files */ + void insertBaseFileBatch(@Param("baseFiles")List files); + + /** + * 删除图片 + */ + void deleteBaseFileBySourceId(String id); + + /** + * 查询图片 + */ + public List getBaseFileBatch(String id); + + //PC查询点检巡检报修 + List selectPdaEquOrderList(EquOrderStandard equOrderStandard); public List selectPdaEquOrderList(EquOrder equOrder); int insertEquOrderStandards(@Param("list") List standards); + + /** + * 更新维修后标准 + */ + void updateStandardAfterRepair(EquOrderStandard equOrderStandard); + + /** + * 通过orderIds逻辑删除标准信息 + * @param orderIds + */ + void delEquOrderStandardByorderIds(String[] orderIds); + + + //更新标准 + void updateActualValues(EquOrderStandard standardList); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOutsourceWorkMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOutsourceWorkMapper.java index 532c5febd..9a7581e22 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOutsourceWorkMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOutsourceWorkMapper.java @@ -62,4 +62,7 @@ public interface EquOutsourceWorkMapper { //流水号 public int selectWorkCodeSerialNumber(); + + //通过repairCode删除存在的委外记录 + public void deleteEquOutsourceWorkByRepairCode(String workCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java index 61116121b..6e5f38d54 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java @@ -5,7 +5,9 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.domain.BaseFileData; import com.op.device.domain.EquEquipment; +import com.op.device.domain.EquFile; import com.op.device.domain.EquRepairOrder; +import com.op.device.domain.EquTeamUser; import org.apache.ibatis.annotations.Param; /** @@ -71,7 +73,7 @@ public interface EquRepairOrderMapper { //查询报修人员列表 @DS("master") - List getRepairPersonList(EquEquipment equEquipment); + List getRepairPersonList(EquTeamUser equTeamUser); /** * 通过报修code查询报修单信息 @@ -85,4 +87,23 @@ public interface EquRepairOrderMapper { * @param repairCode */ void deleteEquRepairOrderByRepairCode(String repairCode); + + /** + * 批量新增报修图片 + */ + Boolean insertBaseFileBatch(@Param("baseFiles") List baseFiles); + + /** + * 删除报修图片 + */ + void deleteBaseFileBySourceId(String OrderId); + + /** + * 查询图片 + */ + public List getBaseFileBatch(String orderId); + + //联系方式 + @DS("master") + EquTeamUser getRepairPhoneNumber(EquTeamUser equTeamUser); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java index 30d70d593..3393c5aa8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java @@ -3,8 +3,10 @@ package com.op.device.mapper; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.domain.BaseFileData; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.EquTeamUser; +import org.apache.ibatis.annotations.Param; /** * 维修工单Mapper接口 @@ -22,13 +24,20 @@ public interface EquRepairWorkOrderMapper { public EquRepairWorkOrder selectEquRepairWorkOrderByWorkId(String workId); /** - * 查询维修工单列表 + * 查询维修工单列表（待维修记录） * * @param equRepairWorkOrder 维修工单 * @return 维修工单集合 */ public List selectEquRepairWorkOrderList(EquRepairWorkOrder equRepairWorkOrder); + /** + * 查询维修工单列表（维修记录） + * + * @param equRepairWorkOrder 维修工单 + * @return 维修工单集合 + */ + public List selectRepairWorkOrderList(EquRepairWorkOrder equRepairWorkOrder); /** * 新增维修工单 * @@ -70,4 +79,29 @@ public interface EquRepairWorkOrderMapper { //获取维修人员列表 @DS("master") public List getMaintenancePersonList(EquTeamUser equTeamUser); + + /** + * 查询图片 + */ + public List getBaseFileBatch(String workId); + + /** + * 删除报修图片 + */ + void deleteBaseFileBySourceId(String workId); + + /** + * 批量新增报修图片 + */ + Boolean insertBaseFileBatch(@Param("baseFiles") List baseFiles); + + //更新维修工单状态 + void updateWorkStatus(String repairCode); + + /** + * 通过维修工单号查询维修单 + * @param workCode + * @return + */ + EquRepairWorkOrder selectEquRepairWorkOrderByWorkCode(String workCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java index 090a21ed4..c4e8580b1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java @@ -62,4 +62,35 @@ public interface EquSpareApplyMapper { //查询维修工单对应的备件申领记录 public List selectRepairSparePartsRecord(EquRepairWorkOrder equRepairWorkOrder); + + /** + * 获取流水单号 + * @return + */ + int selectSerialNumber(); + + /** + * 通过上级工单code查询申领表list + * @param orderCode + * @return + */ + List selectEquSpareApplyListByWorkCode(String orderCode); + + /** + * 通过保养工单ids逻辑删除备件申领表信息 + * @param orderIds + */ + void delEquSpareApplyByorderIds(String[] orderIds); + + /** + * 逻辑删除申领记录 + * @param applyIds + */ + void delEquSpareApplyByIds(String[] applyIds); + + /** + * 逻辑删除领用单 + * @param id + */ + void delEquSpareApplyByApplyId(String id); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java index a70eb5ee6..23f9d2229 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquTeamMapper.java @@ -73,6 +73,6 @@ public interface EquTeamMapper { public List selectTeamMembers(EquTeamUser equTeamUser); //查询特定人员 - @DS("master") + @DS("#master") public EquTeamUser selectTeamMember(EquTeamUser equTeamUser); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java index 70d7de075..e46cdd5b3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java @@ -3,6 +3,7 @@ package com.op.device.mapper; import java.math.BigDecimal; import java.util.List; +import com.op.device.domain.EquSpareApply; import com.op.device.domain.SparePartsLedger; /** @@ -67,4 +68,15 @@ public interface SparePartsLedgerMapper { */ BigDecimal selectRealAmountByMaterialCode(String materialCode); + /** + * 减少库存数量 + * @param apply + */ + void updateSpareNumReduce(EquSpareApply apply); + + /** + * 删除工单然后返还备件数量 + * @param apply + */ + void updateSpareNumAdd(EquSpareApply apply); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java new file mode 100644 index 000000000..5bf97ee92 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java @@ -0,0 +1,7 @@ +package com.op.device.service; + +/** + * 设备看板接口 + */ +public interface IDeviceInterfaceService { +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index ffe359e4a..f559fe145 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -90,4 +90,17 @@ public interface IDevicePDAService { * @return */ public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder); + + //获取设备故障类型 +// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder); + + //待处理 + AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder); + + /** + * 开始保养任务 + * @param pdadto + * @return + */ + AjaxResult startMaintenanceTask(PDADTO pdadto); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceTaskService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceTaskService.java index 67a2c7a43..4cb6b99f6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceTaskService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceTaskService.java @@ -13,4 +13,8 @@ import com.op.device.domain.EquPlan; public interface IDeviceTaskService { AjaxResult createSpotCheckPlanTask(); + + AjaxResult createPatrolCheckPlanTask(); + + AjaxResult createMaintenancePlanTask(); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java index da19e7c74..f6d051742 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquOrderService.java @@ -50,7 +50,7 @@ public interface IEquOrderService { * @param orderIds 需要删除的计划工单主键集合 * @return 结果 */ - public int deleteEquOrderByOrderIds(String[] orderIds); + public AjaxResult deleteEquOrderByOrderIds(String[] orderIds); /** * 删除计划工单信息 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java index 0af4af3af..097698abd 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java @@ -2,10 +2,9 @@ package com.op.device.service; import java.util.List; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.*; import com.op.device.domain.EquEquipment; -import com.op.device.domain.EquEquipment; -import com.op.device.domain.EquRepairOrder; -import com.op.device.domain.EquRepairWorkOrder; /** * 故障报修Service接口 @@ -44,7 +43,7 @@ public interface IEquRepairOrderService { * @param equRepairOrder 故障报修 * @return 结果 */ - public int updateEquRepairOrder(EquRepairOrder equRepairOrder); + public AjaxResult updateEquRepairOrder(EquRepairOrder equRepairOrder); /** * 批量删除故障报修 @@ -77,5 +76,5 @@ public interface IEquRepairOrderService { public int checkEquRepairOrder(EquRepairOrder equRepairOrder); //查询报修人员列表 - List getRepairPersonList(EquEquipment equEquipment); + List getRepairPersonList(EquTeamUser equTeamUser); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java index 6d4d67829..024cdd41f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquSpareApplyService.java @@ -2,6 +2,7 @@ package com.op.device.service; import java.util.List; +import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.EquSpareApply; @@ -34,7 +35,7 @@ public interface IEquSpareApplyService { * @param equSpareApply 申领记录 * @return 结果 */ - public int insertEquSpareApply(EquSpareApply equSpareApply); + public AjaxResult insertEquSpareApply(EquSpareApply equSpareApply); /** * 修改申领记录 @@ -50,7 +51,7 @@ public interface IEquSpareApplyService { * @param applyIds 需要删除的申领记录主键集合 * @return 结果 */ - public int deleteEquSpareApplyByApplyIds(String[] applyIds); + public AjaxResult deleteEquSpareApplyByApplyIds(String[] applyIds); /** * 删除申领记录信息 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java new file mode 100644 index 000000000..4806da53c --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -0,0 +1,11 @@ +package com.op.device.service.impl; + +import com.op.device.service.IDeviceInterfaceService; +import org.springframework.stereotype.Service; + +/** + * 看板接口实现类 + */ +@Service +public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 3a29211e6..b475a3626 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -23,10 +23,7 @@ import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; import static com.op.common.core.web.domain.AjaxResult.error; import static com.op.common.core.web.domain.AjaxResult.success; @@ -43,8 +40,6 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Autowired private EquOrderMapper equOrderMapper; @Autowired - private EquOrderEquMapper equOrderEquMapper; - @Autowired private EquOrderDetailMapper equOrderDetailMapper; @Autowired private EquOrderStandardMapper equOrderStandardMapper; @@ -65,6 +60,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Autowired private EquFileMapper equFileMapper; + @Autowired + private EquFaultTypeMapper equFaultTypeMapper; + /** * 获取今日巡检任务工单list-状态不为已完成 @@ -118,14 +116,22 @@ public class DevicePDAServiceImpl implements IDevicePDAService { order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()); - - List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getId()); + List detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode()); for (EquOrderDetail detail : detailList) { List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); + for (EquOrderStandard standard : standardList) { + // 未达标图片 + BaseFileData selectTemp = new BaseFileData(); + selectTemp.setSourceId(standard.getId()); + selectTemp.setImageType("3"); + List checkPictrueList = equFileMapper.selectUrlList(selectTemp); + if (checkPictrueList != null) { + standard.setCheckPictrueList(checkPictrueList); + } + } detail.setStandardList(standardList); } - equ.setDetailList(detailList); + order.setDetailList(detailList); // 人员信息 List users = equOrderPersonMapper.selectEquOrderPersonByOrderCode(order.getOrderCode()); @@ -136,9 +142,21 @@ public class DevicePDAServiceImpl implements IDevicePDAService { personList.add(personMapper.selectSysUserByUserId(Long.valueOf(id))); } + // 备件 + List spareList = equSpareApplyMapper.selectEquSpareApplyListByWorkCode(order.getOrderCode()); + if (spareList != null) { + order.setSpareList(spareList); + } + order.setPersonList(personList); - order.setEqu(equ); + // 保养图片 + BaseFileData selectTemp = new BaseFileData(); + selectTemp.setSourceId(equOrder.getId()); + List upkeepPictures = equFileMapper.selectUrlList(selectTemp); + if (upkeepPictures != null) { + order.setUpkeepPictures(upkeepPictures); + } return success(order); } @@ -168,9 +186,13 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } boolean hasError = false; + boolean maintenanceFlag = false; - EquOrderEqu equ = equOrder.getEqu(); - List detailList = equ.getDetailList(); + if (equOrder.getPlanType().equals("maintenance")) { + maintenanceFlag = true; + } + + List detailList = equOrder.getDetailList(); for (EquOrderDetail detail : detailList) { List standardList = detail.getStandardList(); for (EquOrderStandard standard : standardList) { @@ -199,18 +221,15 @@ public class DevicePDAServiceImpl implements IDevicePDAService { int up = standard.getActualValue().compareTo(standard.getDetailUpLimit()); int down = standard.getActualValue().compareTo(standard.getDetailDownLimit()); standard.setDetailReach("1"); - standard.setErrorFlag("0"); if (!(up != 1 && down != -1)) { hasError = true; - standard.setErrorFlag("1"); standard.setDetailReach("0"); } }else { - // TODO 未达标 + // 未达标 standard.setErrorFlag("0"); if (standard.getDetailReach().equals("0")) { hasError = true; - standard.setErrorFlag("1"); } } @@ -242,11 +261,11 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } // 报修信息 - if (checkRepair && hasError ) { + if (checkRepair && hasError && !maintenanceFlag) { // 获取故障报修流水号 EquRepairOrder equRepairOrder = new EquRepairOrder(); String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber()); - String equipmentCode = equOrder.getEqu().getEquipmentCode(); + String equipmentCode = equOrder.getEquipmentCode(); //报修单号 equRepairOrder.setOrderCode("BX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum); //在主表中存入报修单号信息 @@ -256,6 +275,16 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairOrder.setOrderId(IdUtils.fastSimpleUUID()); equRepairOrder.setCreateTime(DateUtils.getNowDate()); equRepairOrder.setCreateBy(SecurityUtils.getUsername()); + //报修人编码、故障时间、设备编码、报修时间、联系人联系方式-自动报修 + equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate()); + equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername()); + equRepairOrder.setEquipmentCode(equipmentCode); + equRepairOrder.setOrderTime(DateUtils.getNowDate()); + EquTeamUser equTeamUser = new EquTeamUser(); + equTeamUser.setUserName(SecurityUtils.getUsername()); + EquTeamUser equTeamUserList = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser); + equRepairOrder.setOrderConnection(equTeamUserList.getPhonenumber()); + equRepairOrder.setOrderRepairmanName(equTeamUserList.getNickName()); // 报修来源 if (equOrder.getPlanType().equals("inspection")){ equRepairOrder.setOrderSource("巡检"); @@ -274,7 +303,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } if (!hasError) { - // TODO 删除报修单 + // 删除报修单 if (equOrder.getRepairCode() != null) { if (!equOrder.getRepairCode().isEmpty()) { equRepairOrderMapper.deleteEquRepairOrderByRepairCode(equOrder.getRepairCode()); @@ -283,6 +312,29 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } } + // 保养逻辑 + if (maintenanceFlag) { + // 设置结束时间 + equOrder.setOrderEnd(DateUtils.getNowDate()); + //上传附件 + if (StringUtils.isNotEmpty(equOrder.getPicturePath())) { + String[] ids = equOrder.getPicturePath().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(equOrder.getOrderId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + files.add(file); + } + equFileMapper.insertEquFileBatch(files); + } + } + // 更新工单信息 equOrderMapper.updateEquOrder(equOrder); return success(); @@ -299,18 +351,45 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult addRepairRecord(EquRepairOrder equRepairOrder) { try { - equRepairOrder.setOrderId(IdUtils.fastSimpleUUID()); - // 获取故障报修流水号 +// equRepairOrder + //自动填入联系人 联系方式！！！！！ + String id = IdUtils.fastSimpleUUID(); + equRepairOrder.setOrderId(id); + // 新增 是需要获取故障报修流水号 String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber()); String equipmentCode = equRepairOrder.getEquipmentCode(); //报修单号 equRepairOrder.setOrderCode("BX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum); equRepairOrder.setCreateTime(DateUtils.getNowDate()); equRepairOrder.setCreateBy(SecurityUtils.getUsername()); + equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername()); + equRepairOrder.setOrderTime(DateUtils.getNowDate()); equRepairOrder.setOrderStatus("待审核"); -// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); -// String key = "#header.poolName"; -// equRepairOrder.setFactory(request.getHeader(key.substring(8)).replace("ds_","")); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + equRepairOrderMapper.insertEquRepairOrder(equRepairOrder); + + //删除照片 不需要清照片 因为是新增 + //新增文件 + if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) { + String[] ids1 = equRepairOrder.getFileList().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id1 : ids1) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id1.split("&fileName=")[1]); + file.setFileAddress(id1); + file.setSourceId(id); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + file.setImageType("3"); + files.add(file); + } + equRepairOrderMapper.insertBaseFileBatch(files); + } + return success("新增报修记录成功！"); } catch (Exception e) { return error(); @@ -318,14 +397,14 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } /** - * 获取维修记录 + * 获取维修记录(待维修) * * @param equRepairWorkOrder * @return */ @Override @DS("#header.poolName") - public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { + public AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder) { try { if (equRepairWorkOrder.getWorkPlanTimeArray() != null) { // 设置创建日期开始和结束值 @@ -352,7 +431,64 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } /** - * 获取维修记录 + * 开始保养任务 + * @param pdadto + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult startMaintenanceTask(PDADTO pdadto) { + EquOrder order = equOrderMapper.selectEquOrderByOrderCode(pdadto.getOrderCode()); + // 改为进行中 + order.setOrderStatus("3"); + // 设置是否停机保养 + order.setShutDown(pdadto.getShutDown()); + // 设置开始时间 + order.setOrderStart(DateUtils.getNowDate()); + // 设置保养人 + order.setPlanPerson(SecurityContextHolder.getUserName()); + // 更新数据表 + order.setUpdateBy(SecurityContextHolder.getUserName()); + order.setUpdateTime(DateUtils.getNowDate()); + equOrderMapper.updateEquOrder(order); + return success(); + } + + /** + * 获取维修记录（除了待维修） + * + * @param equRepairWorkOrder + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { + try { + if (equRepairWorkOrder.getWorkPlanTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equRepairWorkOrder.getWorkPlanTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equRepairWorkOrder.setWorkPlanTimeStart(formatter.format(equRepairWorkOrder.getWorkPlanTimeArray().get(0))); + equRepairWorkOrder.setWorkPlanTimeEnd(formatter.format(equRepairWorkOrder.getWorkPlanTimeArray().get(1))); + } + } + if (equRepairWorkOrder.getWorkPlanDownTimeArray() != null) { + // 设置更新日期开始和结束 + if (equRepairWorkOrder.getWorkPlanDownTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equRepairWorkOrder.setWorkPlanDownTimeStart(formatter.format(equRepairWorkOrder.getWorkPlanDownTimeArray().get(0))); + equRepairWorkOrder.setWorkPlanDownTimeEnd(formatter.format(equRepairWorkOrder.getWorkPlanDownTimeArray().get(1))); + } + } + + List list = equRepairWorkOrderMapper.selectRepairWorkOrderList(equRepairWorkOrder); + return success(list); + } catch (Exception e) { + return error(); + } + } + /** + * 获取维修人员 * * @param equTeamUser * @return @@ -378,11 +514,16 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult updateDowntime(EquRepairWorkOrder equRepairWorkOrder) { try { - if(equRepairWorkOrder.getWorkDownMachine().equals("0")){ - equRepairWorkOrder.setWorkPlanDownTime(null); + //不停机 那么实际停机开始时间和实际停机结束时间都没有 + //如果停机 那么实际停机时间就是传入的时间 + equRepairWorkOrder.setWorkStartTime(DateUtils.getNowDate()); + if(equRepairWorkOrder.getWorkDownMachine().equals("1")){ + equRepairWorkOrder.setActualDownStartTime(DateUtils.getNowDate()); } equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); + //维修中 + equRepairWorkOrder.setWorkStatus("2"); equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); return success("提交成功，开始维修！"); } catch (Exception e) { @@ -391,7 +532,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } /** - * 手持提交是否停机维修 停机维修的开始时间 + * * * @param equipmentId * @return @@ -421,13 +562,38 @@ public class DevicePDAServiceImpl implements IDevicePDAService { //查询对应检查项信息 EquOrder equOrder = new EquOrder(); equOrder.setWorkCode(list.getWorkCode()); - List checkLists = equOrderStandardMapper.selectPdaEquOrderList(equOrder); - list.setCheckList(checkLists); + //检查项 + List checkLists = equOrderMapper.selectCheckListByWorkCode(equOrder); + //每个检查项对应的检测标准 + for(EquOrder equOrder1 :checkLists){ + EquOrderStandard equOrderStandard = new EquOrderStandard(); + equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + equOrderStandard.setParentCode(equOrder1.getId()); + List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); + for(EquOrderStandard standardList :standardLists){ + //每个检查标准里面的照片 + List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + if (!CollectionUtils.isEmpty(files)) { + standardList.setPicturePaths(files); + } + standardList.setDetailReach(standardList.getRepairReach()); + standardList.setActualValue(standardList.getRepairValue()); + } + equOrder1.setStandardList(standardLists); + } + list.setDetailList(checkLists); + //备件申领单 EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder(); equRepairWorkOrder.setWorkCode(list.getWorkCode()); List applyLists = equSpareApplyMapper.selectRepairSparePartsRecord(equRepairWorkOrder); list.setApplyList(applyLists); + + //文件 + List files = equRepairWorkOrderMapper.getBaseFileBatch(workId); + if (!CollectionUtils.isEmpty(files)) { + list.setFiles(files); + } return success(list); } catch (Exception e) { return error(); @@ -443,30 +609,129 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Override @DS("#header.poolName") public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { - try { - //更新每一项点检/巡检检查项信息 - List equOrderStandards = equRepairWorkOrder.getCheckList(); - for(EquOrderStandard equOrderStandard:equOrderStandards){ - equOrderStandard.setUpdateBy(SecurityUtils.getUsername()); - equOrderStandard.setUpdateTime(DateUtils.getNowDate()); - equOrderStandardMapper.updateEquOrderStandard(equOrderStandard); + //判断是否停机 + EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); + if(list.getWorkDownMachine().equals("1")){ + //维修结束时间、维修真正停机时间 + equRepairWorkOrder.setActualDownEndTime(DateUtils.getNowDate()); } + equRepairWorkOrder.setWorkEndTime(DateUtils.getNowDate()); + //更新每一项点检/巡检检查项信息 + List checkLists = equRepairWorkOrder.getDetailList(); + for(EquOrder checkList:checkLists){ + checkList.setUpdateBy(SecurityUtils.getUsername()); + checkList.setUpdateTime(DateUtils.getNowDate()); + List standardLists = checkList.getStandardList(); + for(EquOrderStandard standardList :standardLists){ + //先删除每个检查项标准图片 + equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId()); + //图片 + if (StringUtils.isNotEmpty(standardList.getPicturePath())) { + String[] ids = standardList.getPicturePath().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(standardList.getId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + //维修后 + file.setImageType("4"); + files.add(file); + } + equOrderStandardMapper.insertBaseFileBatch(files); + } + standardList.setRepairReach(standardList.getDetailReach()); + standardList.setRepairValue(standardList.getActualValue()); + standardList.setUpdateTime(DateUtils.getNowDate()); + standardList.setUpdateBy(SecurityUtils.getUsername()); + equOrderStandardMapper.updateActualValues(standardList); + } + equOrderMapper.updateEquOrder(checkList); + } + //新建申领单 缺少code List equSpareApplies = equRepairWorkOrder.getApplyList(); for(EquSpareApply equSpareApply:equSpareApplies){ + //生成领料单code + String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equRepairWorkOrder.getWorkCode().substring(10); + equSpareApply.setApplyCode("A" + code ); equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); + //备品备件规格型号！！！！！ + //equSpareApply.setSpareModel(equSpareApply.getS); + equSpareApply.setSpareCode(equSpareApply.getMaterialCode()); + equSpareApply.setSpareName(equSpareApply.getMaterialDesc()); + equSpareApply.setApplyPeople(SecurityUtils.getUsername()); equSpareApply.setCreateBy(SecurityUtils.getUsername()); equSpareApply.setCreateTime(DateUtils.getNowDate()); equSpareApply.setApplyTime(DateUtils.getNowDate()); + equSpareApply.setSpareUseEquipment(equRepairWorkOrder.getEquipmentCode()); + equSpareApply.setWorkCode(equRepairWorkOrder.getWorkCode()); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); equSpareApplyMapper.insertEquSpareApply(equSpareApply); + +// SparePartsLedger sparePartsLedger = new SparePartsLedger(); +// sparePartsLedger. } - //维修人员名字？？？？前端能够提供吗？？？ + + //图片 + //先删除每个维修工单对应图片 + equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId()); + if (StringUtils.isNotEmpty(equRepairWorkOrder.getFileList())) { + String[] ids = equRepairWorkOrder.getFileList().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(equRepairWorkOrder.getWorkId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + //维修后 + file.setImageType("4"); + files.add(file); + } + equRepairWorkOrderMapper.insertBaseFileBatch(files); + } + //维修人：当前登录人 + //维修状态 + equRepairWorkOrder.setWorkStatus("1"); + //维修结束时间 + equRepairWorkOrder.setWorkPerson(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); + //需要更新设备状态????这里没做 return success("提交成功，维修完成！"); - } catch (Exception e) { - return error(); - } } + + /** + * 查询故障树 + * + * @param equRepairWorkOrder + * @return + */ +// @Override +// @DS("#header.poolName") +// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { +// // 查询一级数据 +// List firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder); +// // 一级list +// List firstTree = new ArrayList<>(); +// // 判空 +// if (!CollectionUtils.isEmpty(firstLevel)) { +// for(EquFaultType equFaultType : firstLevel){ +// +// } +// } +// +// return treeAll; +// } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index 187dd8cd6..c8777fcbf 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.op.device.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; @@ -55,9 +56,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { private EquPlanDetailMapper equPlanDetailMapper; @Autowired - private EquPlanEquMapper equPlanEquMapper; + private EquPlanEquSpareMapper equPlanEquSpareMapper; @Autowired - private EquOrderEquMapper equOrderEquMapper; + private EquOrderEquSpareMapper equOrderEquSpareMapper; @Autowired private EquPlanStandardMapper equPlanStandardMapper; @@ -70,13 +71,50 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { private EquOrderPersonMapper equOrderPersonMapper; @Autowired private RemoteUserService remoteUserService; + + @Autowired + private EquOutsourceWorkMapper equOutsourceWorkMapper; + @Autowired + private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; /** * 根据点检计划生成点检任务 * **/ @Override - public AjaxResult createSpotCheckPlanTask() { + // 加载sf-cloud库的sys_datasource + SysUser sysUser = new SysUser(); + sysUser.setUserId(1L); + R>> dateSources0 = remoteUserService.getPoolNameList(sysUser); + List> dateSources = dateSources0.getData(); + ExecutorService executorService = new ThreadPoolExecutor( + dateSources.size(), + dateSources.size(), + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue()); + try { + dateSources.forEach(dateSource -> { + logger.info("++++++++++++" + dateSource.get("poolName") + "++++点检开始++++++++++"); + Runnable run = () -> createSpotCheckPlanFunc(dateSource.get("poolName")); + executorService.execute(run); + }); + } catch (Exception e) { + logger.error("service == dataClearTask == exception", e); + return error("service == dataClearTask == exception"); + } finally { + executorService.shutdown(); + } + return success(); + } + + /** + * 根据巡检计划生成点检任务 + * **/ + @Override + public AjaxResult createPatrolCheckPlanTask() { + // 加载sf-cloud库的sys_datasource SysUser sysUser = new SysUser(); sysUser.setUserId(1L); @@ -90,8 +128,41 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { try { dateSources.forEach(dateSource -> { if("ds_1000".equals(dateSource.get("poolName"))){//TODO生产去掉 - logger.info("++++++++++++" + dateSource.get("poolName") + "++++点检开始++++++++++"); - Runnable run = () -> createSpotCheckPlanFunc(dateSource.get("poolName")); + logger.info("++++++++++++" + dateSource.get("poolName") + "++++巡检开始++++++++++"); + Runnable run = () -> createPatrolCheckPlanFunc(dateSource.get("poolName")); + executorService.execute(run); + } + }); + } catch (Exception e) { + logger.error("service == dataClearTask == exception", e); + return error("service == dataClearTask == exception"); + } finally { + executorService.shutdown(); + } + return success(); + } + + /** + * 根据保养计划生成点检任务 + * **/ + @Override + public AjaxResult createMaintenancePlanTask() { + + // 加载sf-cloud库的sys_datasource + SysUser sysUser = new SysUser(); + sysUser.setUserId(1L); + R>> dateSources0 = remoteUserService.getPoolNameList(sysUser); + List> dateSources = dateSources0.getData(); + ExecutorService executorService = new ThreadPoolExecutor( + dateSources.size(), + dateSources.size(), + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue()); + try { + dateSources.forEach(dateSource -> { + if("ds_1000".equals(dateSource.get("poolName"))){//TODO生产去掉 + logger.info("++++++++++++" + dateSource.get("poolName") + "++++保养开始++++++++++"); + Runnable run = () -> createMaintenancePlanFunc(dateSource.get("poolName")); executorService.execute(run); } }); @@ -115,7 +186,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan); if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ //生成点检计划 - int m = this.createSpotCheckPlan(plan); + int m = this.createOrderPlan(plan); if(m==0){ error("equ_order相关添加失败"); } @@ -124,9 +195,60 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { logger.info("++++++++++++" + poolName + "++++点检结束++++++++++"); } - private int createSpotCheckPlan(EquPlan plan){ + public void createPatrolCheckPlanFunc(String poolName){ + DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key + /**equ_plan equ_plan_equ**/ + EquPlan equPlan = new EquPlan(); + equPlan.setPlanType("inspection"); + List plans = deviceTaskMapper.getPlans(equPlan); + + for(EquPlan plan:plans){ + EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan); + if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ + //生成巡检计划 + int m = this.createOrderPlan(plan); + if(m==0){ + error("equ_order相关添加失败"); + } + } + } + logger.info("++++++++++++" + poolName + "++++巡检结束++++++++++"); + } + + public void createMaintenancePlanFunc(String poolName){ + DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key + /**equ_plan equ_plan_equ**/ + EquPlan equPlan = new EquPlan(); + equPlan.setPlanType("maintenance"); + List plans = deviceTaskMapper.getPlans(equPlan); + + for(EquPlan plan:plans){ + EquOrder hasTask = null; + if("1".equals(plan.getCalculationRule())){ + //根据order_start//1按上次保养时间 + hasTask = deviceTaskMapper.getNewTaskOrder0(plan); + }else if("0".equals(plan.getCalculationRule())){ + //根据createTime//0按固定周期 + hasTask = deviceTaskMapper.getNewTaskOrder(plan); + }else if("2".equals(plan.getCalculationRule())){ + //单次生成保养计划 + } + + if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ + //生成保养计划 + int m = this.createOrderPlan(plan); + if(m==0){ + error("equ_order相关添加失败"); + } + } + } + logger.info("++++++++++++" + poolName + "++++保养结束++++++++++"); + } + + private int createOrderPlan(EquPlan plan){ Date nowtime = DateUtils.getNowDate(); - String createBy = SecurityUtils.getUsername(); + String createBy = "job"; + String factory = plan.getFactoryCode(); int sce = 0; /**equ_plan->equ_order********************************************************************/ EquOrder order = new EquOrder(); @@ -139,36 +261,54 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { String serialNum = String.format("%03d",equOrderMapper.selectSerialNumber()); String orderCode = "O"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+serialNum; order.setOrderCode(orderCode); + + if("1".equals(plan.getUpkeep())) {//1委外工单 + order.setOutsourceCode("BW"+orderCode); + } /**equ_order**/ sce = equOrderMapper.insertEquOrder(order); - System.out.println("========equ_order:"+sce); + System.out.println(plan.getPlanCode()+"========equ_order:"+sce); + /**equ_plan_equ_spare->equ_spare_apply*************************************************************/ + EquPlanEquSpare equPlanEquSpare = new EquPlanEquSpare(); + equPlanEquSpare.setParentCode(plan.getPlanEquId()); + List spares = equPlanEquSpareMapper.selectEquPlanEquSpareList(equPlanEquSpare); - /**equ_plan_equ->equ_order_equ*************************************************************/ - EquPlanEqu equPlanEqu = new EquPlanEqu(); - equPlanEqu.setId(plan.getPlanEquId()); - List equs = equPlanEquMapper.selectEquPlanEquList(equPlanEqu); - if(CollectionUtils.isEmpty(equs)){ - return 0; + // 获取流水单号 + int applySerialNum = equSpareApplyMapper.selectSerialNumber(); + for (EquPlanEquSpare spare : spares) { + EquSpareApply apply = new EquSpareApply(); + apply.setApplyId(IdUtils.fastSimpleUUID()); + apply.setApplyCode("A"+orderCode+String.format("%03d",applySerialNum)); + applySerialNum++; + apply.setSpareCode(spare.getMaterialCode()); + apply.setSpareName(spare.getMaterialDesc()); + apply.setSpareModel(spare.getSpareType()); + apply.setSpareQuantity(spare.getApplyNum()); + apply.setFactoryCode(factory); + apply.setApplyPeople("job"); + apply.setWorkCode(orderCode); + apply.setCreateBy("job"); + apply.setCreateTime(nowtime); + apply.setSpareUseEquipment(plan.getEquipmentCode()); + apply.setApplyTime(nowtime); + // 插入备件信息 + equSpareApplyMapper.insertEquSpareApply(apply); + + // 减少备件仓库中备件数量 + sparePartsLedgerMapper.updateSpareNumReduce(apply); } - String orderEquId = IdUtils.fastSimpleUUID(); - //equs一定就一个实值 - for(EquPlanEqu equ:equs){ - equ.setId(orderEquId); - equ.setCreateTime(nowtime); - equ.setCreateBy(createBy); - equ.setDelFlag("0"); - equ.setCode(orderCode); + + if(!CollectionUtils.isEmpty(spares)){ + sce = equOrderEquSpareMapper.insertEquOrderEquSpares(spares); + System.out.println(plan.getPlanCode()+"========equ_spare_apply:"+sce); } - sce = equOrderEquMapper.insertEquOrderEqus(equs); - System.out.println("========equ_order_equ:"+sce); + + /**equ_plan_detail->equ_order_detail*******************************************************/ EquPlanDetail itqo = new EquPlanDetail(); itqo.setParentCode(plan.getPlanEquId()); itqo.setDelFlag("0"); List details = equPlanDetailMapper.selectEquPlanDetailList(itqo); - if(CollectionUtils.isEmpty(details)){ - return 0; - } List standards = new ArrayList<>(); List standards0 = null; @@ -192,33 +332,47 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { itme.setCreateTime(nowtime); itme.setCreateBy(createBy); itme.setDelFlag("0"); - itme.setParentCode(orderEquId); + itme.setParentCode(orderCode); + } + if(!CollectionUtils.isEmpty(details)) { + sce = equOrderDetailMapper.insertEquOrderDetails(details); + System.out.println(plan.getPlanCode() + "========equ_order_detail:" + sce); } - sce = equOrderDetailMapper.insertEquOrderDetails(details); - System.out.println("========equ_order_detail:"+sce); /**equ_plan_standard->equ_order_standard*******************************************************/ - if(CollectionUtils.isEmpty(standards)){ - return 0; + if(!CollectionUtils.isEmpty(standards)) { + sce = equOrderStandardMapper.insertEquOrderStandards(standards); + System.out.println(plan.getPlanCode() + "========equ_order_standard:" + sce); } - sce = equOrderStandardMapper.insertEquOrderStandards(standards); - System.out.println("========equ_order_detail:"+sce); /**equ_plan_person->equ_order_standard*********************************************************/ - EquPlanPerson equPlanPerson = new EquPlanPerson(); - equPlanPerson.setPlanCode(plan.getPlanCode()); - List persons = equPlanPersonMapper.selectEquPlanPersonList(equPlanPerson); - if(CollectionUtils.isEmpty(persons)){ - return 0; - } + if("1".equals(plan.getUpkeep())){//1委外 + EquOutsourceWork equOutsourceWork = new EquOutsourceWork(); + BeanUtils.copyProperties(plan,equOutsourceWork); + equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); + equOutsourceWork.setOrderCode(orderCode); + equOutsourceWork.setWorkCode(order.getOutsourceCode()); + equOutsourceWork.setWorkType("1");//1委外保养0委外维修 + equOutsourceWork.setCreateBy(createBy); + equOutsourceWork.setCreateTime(nowtime); + equOutsourceWork.setDelFlag("0"); + sce = equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); + System.out.println(plan.getPlanCode() + "========equ_outsource_work:" + sce); + }else { + EquPlanPerson equPlanPerson = new EquPlanPerson(); + equPlanPerson.setPlanCode(plan.getPlanCode()); + List persons = equPlanPersonMapper.selectEquPlanPersonList(equPlanPerson); - for(EquPlanPerson person:persons){ - person.setId(IdUtils.fastSimpleUUID()); - person.setCreateTime(nowtime); - person.setCreateBy(createBy); - person.setDelFlag("0"); - person.setPlanCode(orderCode); + for (EquPlanPerson person : persons) { + person.setId(IdUtils.fastSimpleUUID()); + person.setCreateTime(nowtime); + person.setCreateBy(createBy); + person.setDelFlag("0"); + person.setPlanCode(orderCode); + } + if (!CollectionUtils.isEmpty(persons)) { + sce = equOrderPersonMapper.insertEquOrderPersons(persons); + System.out.println(plan.getPlanCode() + "========equ_order_person:" + sce); + } } - sce = equOrderPersonMapper.insertEquOrderPlans(persons); - System.out.println("========equ_order_standard:"+sce); return sce; } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index d3d86bc4e..c982cff2c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -48,11 +48,15 @@ public class EquOrderServiceImpl implements IEquOrderService { @Autowired private PersonMapper personMapper; @Autowired - private EquOrderEquSpareMapper equOrderEquSpareMapper; - @Autowired private EquRepairOrderMapper equRepairOrderMapper; @Autowired private EquFileMapper equFileMapper; + @Autowired + private EquPlanMapper equPlanMapper; + @Autowired + private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; /** * 查询计划工单 @@ -70,23 +74,28 @@ public class EquOrderServiceImpl implements IEquOrderService { timeArray.add(order.getOrderStart()); timeArray.add(order.getOrderEnd()); order.setTimeArray(timeArray); + // 设置设备名称 + order.setEquipmentName(equOrderMapper.selectEquipmentNameByEquCode(order.getEquipmentCode())); + // 设置计划名称 order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(order.getPlanCode())); + // 工作中心（车间） order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()); - - List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getId()); + // 检查项 + List detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode()); for (EquOrderDetail detail : detailList) { + // 标准 List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); detail.setStandardList(standardList); } - equ.setDetailList(detailList); + order.setDetailList(detailList); - List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByParentCode(equ.getId()); + // 备件 + List spareList = equSpareApplyMapper.selectEquSpareApplyListByWorkCode(order.getOrderCode()); if (spareList.size() > 0) { - equ.setSpareList(spareList); + order.setSpareList(spareList); } // 人员信息 @@ -100,8 +109,6 @@ public class EquOrderServiceImpl implements IEquOrderService { order.setPersonList(personList); - order.setEqu(equ); - return order; } @@ -114,11 +121,41 @@ public class EquOrderServiceImpl implements IEquOrderService { @Override @DS("#header.poolName") public List selectEquOrderList(EquOrder equOrder) { + + if (equOrder.getLoopStartArray() != null) { + equOrder.setLoopStart(equOrder.getLoopStartArray().get(0)); + equOrder.setLoopEnd(equOrder.getLoopStartArray().get(1)); + } + if (equOrder.getLoopEndArray() != null) { + equOrder.setLoopEndArrayStart(equOrder.getLoopEndArray().get(0)); + equOrder.setGetLoopEndArrayEnd(equOrder.getLoopEndArray().get(1)); + } + if (equOrder.getOrderStartArray() != null) { + equOrder.setOrderStartArrayStart(equOrder.getOrderStartArray().get(0)); + equOrder.setOrderStartArrayEnd(equOrder.getOrderStartArray().get(1)); + } + if (equOrder.getOrderEndArray() != null) { + equOrder.setOrderEndArrayStart(equOrder.getOrderEndArray().get(0)); + equOrder.setOrderEndArrayEnd(equOrder.getOrderEndArray().get(1)); + } + List orderList = equOrderMapper.selectEquOrderList(equOrder); + //获取当前所选工厂 + 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); + + List workCenters = equPlanMapper.selectWorkCenter(factory); + for (EquOrder order : orderList) { - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()); - order.setEquipmentCode(equ.getEquipmentCode()); - order.setEquipmentName(equ.getEquipmentName()); + for (WorkCenter center : workCenters) { + if (center.getFactoryCode().equals(order.getPlanWorkshop())) { + order.setWorkCenterName(center.getFactoryName()); + } + } + order.setEquipmentName(equOrderMapper.selectEquipmentNameByEquCode(order.getEquipmentCode())); } return orderList; } @@ -161,9 +198,13 @@ public class EquOrderServiceImpl implements IEquOrderService { } boolean hasError = false; + boolean maintenanceFlag = false; - EquOrderEqu equ = equOrder.getEqu(); - List detailList = equ.getDetailList(); + if (equOrder.getPlanType().equals("maintenance")) { + maintenanceFlag = true; + } + + List detailList = equOrder.getDetailList(); for (EquOrderDetail detail : detailList) { List standardList = detail.getStandardList(); for (EquOrderStandard standard : standardList) { @@ -192,18 +233,13 @@ public class EquOrderServiceImpl implements IEquOrderService { int up = standard.getActualValue().compareTo(standard.getDetailUpLimit()); int down = standard.getActualValue().compareTo(standard.getDetailDownLimit()); standard.setDetailReach("1"); - standard.setErrorFlag("0"); if (!(up != 1 && down != -1)) { hasError = true; - standard.setErrorFlag("1"); standard.setDetailReach("0"); } } else { - // TODO 未达标 - standard.setErrorFlag("0"); if (standard.getDetailReach().equals("0")) { hasError = true; - standard.setErrorFlag("1"); } } @@ -235,11 +271,11 @@ public class EquOrderServiceImpl implements IEquOrderService { } // 报修信息 - if (checkRepair && hasError) { + if (checkRepair && hasError && !maintenanceFlag) { // 获取故障报修流水号 EquRepairOrder equRepairOrder = new EquRepairOrder(); String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber()); - String equipmentCode = equOrder.getEqu().getEquipmentCode(); + String equipmentCode = equOrder.getEquipmentCode(); //报修单号 equRepairOrder.setOrderCode("BX" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum); //在主表中存入报修单号信息 @@ -249,6 +285,18 @@ public class EquOrderServiceImpl implements IEquOrderService { equRepairOrder.setOrderId(IdUtils.fastSimpleUUID()); equRepairOrder.setCreateTime(DateUtils.getNowDate()); equRepairOrder.setCreateBy(SecurityUtils.getUsername()); + + //报修人编码、故障时间、设备编码、报修时间、联系人联系方式-自动报修 + equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate()); + equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername()); + equRepairOrder.setEquipmentCode(equipmentCode); + equRepairOrder.setOrderTime(DateUtils.getNowDate()); + EquTeamUser equTeamUser = new EquTeamUser(); + equTeamUser.setUserName(SecurityUtils.getUsername()); + EquTeamUser equTeamUserList = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser); + equRepairOrder.setOrderConnection(equTeamUserList.getPhonenumber()); + equRepairOrder.setOrderRepairmanName(equTeamUserList.getNickName()); + // 报修来源 if (equOrder.getPlanType().equals("inspection")) { equRepairOrder.setOrderSource("巡检"); @@ -267,7 +315,7 @@ public class EquOrderServiceImpl implements IEquOrderService { } if (!hasError) { - // TODO 删除报修单 + // 删除报修单 if (equOrder.getRepairCode() != null) { if (!equOrder.getRepairCode().isEmpty()) { equRepairOrderMapper.deleteEquRepairOrderByRepairCode(equOrder.getRepairCode()); @@ -276,6 +324,32 @@ public class EquOrderServiceImpl implements IEquOrderService { } } + // 保养逻辑 + if (maintenanceFlag) { + // 用时 + if (equOrder.getOrderStart() != null) { + long diffSeconds = (equOrder.getOrderEnd().getTime() - equOrder.getOrderStart().getTime()) / 60000; + equOrder.setOrderCostTime(String.valueOf(diffSeconds)); + } + // 保养图片 + if (StringUtils.isNotEmpty(equOrder.getPicturePath())) { + String[] ids = equOrder.getPicturePath().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(equOrder.getOrderId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + files.add(file); + } + equFileMapper.insertEquFileBatch(files); + } + } + // 更新工单信息 equOrderMapper.updateEquOrder(equOrder); return success(); @@ -289,8 +363,32 @@ public class EquOrderServiceImpl implements IEquOrderService { */ @Override @DS("#header.poolName") - public int deleteEquOrderByOrderIds(String[] orderIds) { - return equOrderMapper.deleteEquOrderByOrderIds(orderIds); + public AjaxResult deleteEquOrderByOrderIds(String[] orderIds) { + // 保养-备件逻辑 + for (String orderId : orderIds) { + EquOrder order = equOrderMapper.selectEquOrderByOrderId(orderId); + if (!order.getOrderStatus().equals("0")) { + return error(500,"工单已进行修改！不可删除！"); + } + if (order.getPlanType().equals("maintenance")) { + List applyList = equSpareApplyMapper.selectEquSpareApplyListByWorkCode(order.getOrderCode()); + for (EquSpareApply apply : applyList) { + // 返回备件数量 + sparePartsLedgerMapper.updateSpareNumAdd(apply); + } + } + } + // 逻辑删除获取人员 + equOrderPersonMapper.delEquOrderPersonByorderIds(orderIds); + // 逻辑删除标准信息 + equOrderStandardMapper.delEquOrderStandardByorderIds(orderIds); + // 逻辑删除检查项信息 + equOrderDetailMapper.delEquOrderDetailByorderIds(orderIds); + // 逻辑删除备件信息 + equSpareApplyMapper.delEquSpareApplyByorderIds(orderIds); + // 逻辑删除工单 + equOrderMapper.delEquOrderByOrderIds(orderIds); + return success(); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java index 869f05595..e07558949 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java @@ -32,6 +32,7 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { @Autowired private EquRepairWorkOrderMapper equRepairWorkOrderMapper; + /** * 查询委外工单 * @@ -65,6 +66,7 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { @Override @DS("#header.poolName") public int insertEquOutsourceWork(EquOutsourceWork equOutsourceWork) { + //新增的委外工单，不用报修单号、维修单号拼接 equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber()); String equipmentCode = equOutsourceWork.getEquipmentCode(); @@ -89,6 +91,11 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { @Override @DS("#header.poolName") public int updateEquOutsourceWork(EquOutsourceWork equOutsourceWork) { + //1完成委外 + if(equOutsourceWork.getWorkStatus().equals("1")){ + //更新维修工单状态 + equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode()); + } equOutsourceWork.setUpdateTime(DateUtils.getNowDate()); equOutsourceWork.setUpdateBy(SecurityUtils.getUsername()); return equOutsourceWorkMapper.updateEquOutsourceWork(equOutsourceWork); 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 a42b3e812..d72e0b73a 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 @@ -95,6 +95,14 @@ public class EquPlanServiceImpl implements IEquPlanService { equPlan.setUpdateTimeEnd(formatter.format(equPlan.getUpdateTimeArray().get(1))); } } + if (equPlan.getLoopStartArray() != null) { + equPlan.setLoopStart(equPlan.getLoopStartArray().get(0)); + equPlan.setLoopEnd(equPlan.getLoopStartArray().get(1)); + } + if (equPlan.getLoopEndArray() != null) { + equPlan.setLoopEndArrayStart(equPlan.getLoopEndArray().get(0)); + equPlan.setGetLoopEndArrayEnd(equPlan.getLoopEndArray().get(1)); + } List equPlans = equPlanMapper.selectEquPlanList(equPlan); //获取当前所选工厂 @@ -140,8 +148,10 @@ public class EquPlanServiceImpl implements IEquPlanService { equPlan.setPlanId(IdUtils.fastSimpleUUID()); equPlan.setPlanCode((DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + planSerialNum)); - equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0)); - equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1)); + if (equPlan.getPlanTimeArray().size() > 0) { + equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0)); + equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1)); + } equPlan.setFactoryCode(factory); equPlan.setCreateBy(SecurityContextHolder.getUserName()); equPlan.setCreateTime(DateUtils.getNowDate()); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index ba5e35e42..de1ffbacf 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.op.device.service.impl; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -9,18 +10,23 @@ import com.op.common.core.domain.BaseFileData; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.*; import com.op.device.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.service.IEquRepairOrderService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; 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.error; +import static com.op.common.core.web.domain.AjaxResult.success; + /** * 故障报修Service业务层处理 * @@ -42,7 +48,10 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { private EquOutsourceWorkMapper equOutsourceWorkMapper; @Autowired - private EquFileMapper equFileMapper; + private EquOrderStandardMapper equOrderStandardMapper; + + @Autowired + private EquOrderMapper equOrderMapper; /** * 查询故障报修 * @@ -53,10 +62,33 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { @DS("#header.poolName") public EquRepairOrder selectEquRepairOrderByOrderId(String orderId) { EquRepairOrder list = equRepairOrderMapper.selectEquRepairOrderByOrderId(orderId); - List files = equFileMapper.getEquFileBatch(orderId); + List files = equRepairOrderMapper.getBaseFileBatch(orderId); if (!CollectionUtils.isEmpty(files)) { list.setFiles(files); } + + //查询对应检查项信息 + EquOrder equOrder = new EquOrder(); + //报修单号 + equOrder.setRepairCode(list.getOrderCode()); + //检查项 + List checkLists = equOrderMapper.selectCheckListByRepairCode(equOrder); + //每个检查项对应的检测标准 + for(EquOrder equOrder1 :checkLists){ + EquOrderStandard equOrderStandard = new EquOrderStandard(); + equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + equOrderStandard.setParentCode(equOrder1.getId()); + List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); + for(EquOrderStandard standardList :standardLists){ + //每个检查标准里面的照片 + List file = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + if (!CollectionUtils.isEmpty(file)) { + standardList.setPicturePaths(file); + } + } + equOrder1.setStandardList(standardLists); + } + list.setCheckList(checkLists); return list; } @@ -69,6 +101,22 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { @Override @DS("#header.poolName") public List selectEquRepairOrderList(EquRepairOrder equRepairOrder) { + if (equRepairOrder.getOrderBreakdownTimeArray() != null) { + // 设置故障开始时间、结束时间 + if (equRepairOrder.getOrderBreakdownTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equRepairOrder.setOrderBreakdownTimeStart(formatter.format(equRepairOrder.getOrderBreakdownTimeArray().get(0))); + equRepairOrder.setOrderBreakdownTimeEnd(formatter.format(equRepairOrder.getOrderBreakdownTimeArray().get(1))); + } + } + if (equRepairOrder.getOrderTimeArray() != null) { + // 设置更新日期开始和结束 + if (equRepairOrder.getOrderTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equRepairOrder.setOrderTimeStart(formatter.format(equRepairOrder.getOrderTimeArray().get(0))); + equRepairOrder.setOrderTimeEnd(formatter.format(equRepairOrder.getOrderTimeArray().get(1))); + } + } return equRepairOrderMapper.selectEquRepairOrderList(equRepairOrder); } @@ -109,9 +157,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { file.setCreateTime(new Date()); files.add(file); } - equFileMapper.insertEquFileBatch(files); + equRepairOrderMapper.insertBaseFileBatch(files); } - return equRepairOrderMapper.insertEquRepairOrder(equRepairOrder); } @@ -124,14 +171,31 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { @Override @DS("#header.poolName") public int checkEquRepairOrder(EquRepairOrder equRepairOrder) { + //改了，不生成流水号，从第十位开始切割 + String code = equRepairOrder.getOrderCode().substring(10); + String workCode = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + code; + //判断是否是点检、巡检过来的 + if(equRepairOrder.getOrderSource().equals("点检") || equRepairOrder.getOrderSource().equals("巡检")){ + //更新检查项信息 + EquOrder equOrder = new EquOrder(); + List ids = equOrderMapper.getIdsByOrderCode(equRepairOrder.getOrderCode()); + for(String id :ids){ + EquOrder one = new EquOrder(); + one.setOrderId(id); + one.setWorkCode("WX" + workCode); + one.setUpdateBy(SecurityUtils.getUsername()); + one.setUpdateTime(DateUtils.getNowDate()); + //只更新其中一个信息 + equOrderMapper.updateEquOrderRepairCode(one); + } + } + if(equRepairOrder.getRepairDestination().equals("计划性维修")){ EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder(); //报修单号 equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode()); //维修单号 - String serialNum = String.format("%03d", equRepairWorkOrderMapper.selectWorkCodeSerialNumber()); - String equipmentCode = equRepairOrder.getEquipmentCode(); - equRepairWorkOrder.setWorkCode("WX"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum); + equRepairWorkOrder.setWorkCode("WX" + workCode); equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId()); equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode()); equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam()); @@ -160,22 +224,24 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); equRepairOrder.setOrderStatus("审核通过"); + }else if(equRepairOrder.getRepairDestination().equals("不维修")){ equRepairOrder.setOrderStatus("驳回"); + }else if(equRepairOrder.getRepairDestination().equals("委外维修")){ EquOutsourceWork equOutsourceWork = new EquOutsourceWork(); //委外工单编码、id、联系方式、委外单位、委外人员、委外原因 equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); equOutsourceWork.setOrderCode(equRepairOrder.getOrderCode()); - String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber()); - String equipmentCode = equRepairOrder.getEquipmentCode(); - equOutsourceWork.setEquipmentCode(equipmentCode); - equOutsourceWork.setWorkCode("WW"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum); + equOutsourceWork.setEquipmentCode(equRepairOrder.getEquipmentCode()); + equOutsourceWork.setWorkCode("WW" + workCode); equOutsourceWork.setRepairCode("无"); equOutsourceWork.setWorkConnection(equRepairOrder.getWorkConnection()); equOutsourceWork.setWorkOutsourcingUnit(equRepairOrder.getWorkOutsourcingUnit()); equOutsourceWork.setWorkPerson(equRepairOrder.getOutSourcePerson()); equOutsourceWork.setWorkReason(equRepairOrder.getOutSourceReason()); + //委外类型 维修委外 + equOutsourceWork.setWorkType("0"); equOutsourceWork.setCreateBy(SecurityUtils.getUsername()); equOutsourceWork.setCreateTime(DateUtils.getNowDate()); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); @@ -184,10 +250,38 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); equRepairOrder.setOrderStatus("审核通过"); }else if(equRepairOrder.getRepairDestination().equals("立即维修")){ - //立即维修 - //是否立即维修 1是 0 否 EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder(); + //报修单号 + equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode()); + //维修单号 + equRepairWorkOrder.setWorkCode("WX"+workCode); + equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId()); + equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode()); + equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam()); + //不委外 + equRepairWorkOrder.setWorkOutsource("0"); + equRepairWorkOrder.setOutWorkCode("无"); + //是否立即维修 1是 0 否 equRepairWorkOrder.setWorkHandle("0"); + //计划维修时间 + equRepairWorkOrder.setWorkPlanTime(equRepairOrder.getWorkPlanTime()); + //是否停机维修 停机维修时间 + if(equRepairOrder.getWorkPlanDownTime() != null){ + equRepairWorkOrder.setWorkDownMachine("1"); + equRepairWorkOrder.setWorkPlanDownTime(equRepairOrder.getWorkPlanDownTime()); + }else{ + equRepairWorkOrder.setWorkDownMachine("0"); + } + equRepairWorkOrder.setWorkFaultDesc(equRepairOrder.getOrderDesc()); + equRepairWorkOrder.setWorkStatus("0"); + equRepairWorkOrder.setWorkId(IdUtils.fastSimpleUUID()); + equRepairWorkOrder.setCreateTime(DateUtils.getNowDate()); + equRepairWorkOrder.setCreateBy(SecurityUtils.getUsername()); + //工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); equRepairOrder.setOrderStatus("审核通过"); } equRepairOrder.setUpdateTime(DateUtils.getNowDate()); @@ -201,30 +295,36 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { * @param equRepairOrder 故障报修 * @return 结果 */ + @Transactional//增加事务注解，出错时自动回滚 @Override @DS("#header.poolName") - public int updateEquRepairOrder(EquRepairOrder equRepairOrder) { - equFileMapper.deleteEquFileBySourceId(equRepairOrder.getOrderId()); - //上传附件 - if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) { - String[] ids = equRepairOrder.getFileList().split(","); - List files = new ArrayList<>(); - BaseFileData file = null; - for (String id : ids) { - file = new BaseFileData(); - file.setFileId(IdUtils.fastSimpleUUID()); - file.setFileAddress(id); - file.setFileName(id.split("&fileName=")[1]); - file.setSourceId(equRepairOrder.getOrderId()); - file.setCreateBy(SecurityUtils.getUsername()); - file.setCreateTime(new Date()); - files.add(file); + public AjaxResult updateEquRepairOrder(EquRepairOrder equRepairOrder) { + try{ + equRepairOrderMapper.deleteBaseFileBySourceId(equRepairOrder.getOrderId()); + //上传附件 + if (StringUtils.isNotEmpty(equRepairOrder.getFileList())) { + String[] ids = equRepairOrder.getFileList().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileAddress(id); + file.setFileName(id.split("&fileName=")[1]); + file.setSourceId(equRepairOrder.getOrderId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + files.add(file); + } + equRepairOrderMapper.insertBaseFileBatch(files); } - equFileMapper.insertEquFileBatch(files); - } - equRepairOrder.setUpdateTime(DateUtils.getNowDate()); - equRepairOrder.setUpdateBy(SecurityUtils.getUsername()); - return equRepairOrderMapper.updateEquRepairOrder(equRepairOrder); + equRepairOrder.setUpdateTime(DateUtils.getNowDate()); + equRepairOrder.setUpdateBy(SecurityUtils.getUsername()); + equRepairOrderMapper.updateEquRepairOrder(equRepairOrder); + return success("修改故障报修成功！"); + }catch (Exception e) { + return error(); + } } /** @@ -278,12 +378,12 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { /** * 查询报修人员列表 * - * @param equEquipment + * @param equTeamUser * @return */ @Override @DS("#header.poolName") - public List getRepairPersonList(EquEquipment equEquipment) { - return equRepairOrderMapper.getRepairPersonList(equEquipment); + public List getRepairPersonList(EquTeamUser equTeamUser) { + return equRepairOrderMapper.getRepairPersonList(equTeamUser); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index 2a172e84e..587462685 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -1,25 +1,28 @@ 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.domain.BaseFileData; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; -import com.op.device.domain.EquOutsourceWork; -import com.op.device.domain.EquTeamUser; -import com.op.device.mapper.EquOutsourceWorkMapper; +import com.op.device.domain.*; +import com.op.device.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.op.device.mapper.EquRepairWorkOrderMapper; -import com.op.device.domain.EquRepairWorkOrder; import com.op.device.service.IEquRepairWorkOrderService; +import org.springframework.util.CollectionUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; + /** * 维修工单Service业务层处理 * @@ -28,6 +31,12 @@ import javax.servlet.http.HttpServletRequest; */ @Service public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService { + @Autowired + private EquOrderMapper equOrderMapper; + + @Autowired + private EquOrderStandardMapper equOrderStandardMapper; + @Autowired private EquRepairWorkOrderMapper equRepairWorkOrderMapper; @@ -43,7 +52,41 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService @Override @DS("#header.poolName") public EquRepairWorkOrder selectEquRepairWorkOrderByWorkId(String workId) { - return equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId); + //查询报修前图片 + EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(workId); + List beforeFiles = equRepairWorkOrderMapper.getBaseFileBatch(list.getOrderId()); + if (!CollectionUtils.isEmpty(beforeFiles)) { + list.setBeforeRepairFiles(beforeFiles); + } + //查询维修后图片 + List afterFiles = equRepairWorkOrderMapper.getBaseFileBatch(workId); + if (!CollectionUtils.isEmpty(afterFiles)) { + list.setAfterRepairFiles(afterFiles); + } + + //查询报修前检查项图片 + EquOrder equOrder = new EquOrder(); + equOrder.setWorkCode(list.getWorkCode()); + //检查项 + List checkLists = equOrderMapper.selectCheckListByWorkCode(equOrder); + //每个检查项对应的检测标准 + for(EquOrder equOrder1 :checkLists){ + EquOrderStandard equOrderStandard = new EquOrderStandard(); + equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + equOrderStandard.setParentCode(equOrder1.getId()); + List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); + for(EquOrderStandard standardList :standardLists){ + //每个检查标准里面的照片 + List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + if (!CollectionUtils.isEmpty(files)) { + standardList.setPicturePaths(files); + } + } + equOrder1.setStandardList(standardLists); + } + list.setDetailList(checkLists); + + return list; } /** @@ -114,6 +157,34 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService } equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); + + //先删除每个维修工单对应图片 + equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId()); + if (StringUtils.isNotEmpty(equRepairWorkOrder.getAfterRepairFile())) { + String[] ids = equRepairWorkOrder.getAfterRepairFile().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(equRepairWorkOrder.getWorkId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(new Date()); + //维修后 + file.setImageType("4"); + files.add(file); + } + equRepairWorkOrderMapper.insertBaseFileBatch(files); + } + + //更新标准表 + for(EquOrderStandard equOrderStandard:equRepairWorkOrder.getStandardList()){ + equOrderStandard.setUpdateBy(SecurityUtils.getUsername()); + equOrderStandard.setUpdateTime(DateUtils.getNowDate()); + equOrderStandardMapper.updateStandardAfterRepair(equOrderStandard); + } return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); } @@ -151,20 +222,25 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService @Override @DS("#header.poolName") public int applyEquOutsourceWork(EquRepairWorkOrder equRepairWorkOrder) { + //如果存在之前的删掉重新增加,物理删除 + equOutsourceWorkMapper.deleteEquOutsourceWorkByRepairCode(equRepairWorkOrder.getWorkCode()); //转委外 EquOutsourceWork equOutsourceWork = new EquOutsourceWork(); equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); //委外工单号 - String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber()); - String equipmentCode = equRepairWorkOrder.getEquipmentCode(); + //String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber()); + //改了，不生成流水号，从第十位开始切割 + String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equRepairWorkOrder.getWorkCode().substring(10); + equOutsourceWork.setWorkCode("WW"+ code); equOutsourceWork.setOrderCode("无"); - equOutsourceWork.setWorkCode("WW"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equipmentCode + serialNum); - equOutsourceWork.setEquipmentCode(equipmentCode); + equOutsourceWork.setEquipmentCode(equRepairWorkOrder.getEquipmentCode()); equOutsourceWork.setRepairCode(equRepairWorkOrder.getWorkCode()); equOutsourceWork.setWorkReason(equRepairWorkOrder.getOutSourceReason()); equOutsourceWork.setWorkPerson(equRepairWorkOrder.getOutSourcePerson()); equOutsourceWork.setWorkOutsourcingUnit(equRepairWorkOrder.getWorkOutsourcingUnit()); equOutsourceWork.setWorkConnection(equRepairWorkOrder.getWorkConnection()); + //委外类型 维修委外 + equOutsourceWork.setWorkType("0"); equOutsourceWork.setCreateTime(DateUtils.getNowDate()); equOutsourceWork.setCreateBy(SecurityUtils.getUsername()); if(equRepairWorkOrder.getWorkId()!= null){ @@ -172,6 +248,10 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService equRepairWorkOrder.setOutWorkCode(equOutsourceWork.getWorkCode()); equRepairWorkOrderMapper.updateWorkOutsource(equRepairWorkOrder); } + //工厂号 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + equOutsourceWork.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); return equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java index e94737765..c695898a7 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java @@ -1,13 +1,20 @@ package com.op.device.service.impl; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; 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.common.security.utils.SecurityUtils; +import com.op.device.domain.EquOrder; import com.op.device.domain.EquRepairWorkOrder; +import com.op.device.domain.SparePartsLedger; +import com.op.device.mapper.EquOrderMapper; +import com.op.device.mapper.EquRepairWorkOrderMapper; +import com.op.device.mapper.SparePartsLedgerMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.mapper.EquSpareApplyMapper; @@ -18,6 +25,9 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + /** * 申领记录Service业务层处理 * @@ -28,10 +38,16 @@ import javax.servlet.http.HttpServletRequest; public class EquSpareApplyServiceImpl implements IEquSpareApplyService { @Autowired private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; + @Autowired + private EquRepairWorkOrderMapper equRepairWorkOrderMapper; + @Autowired + private EquOrderMapper equOrderMapper; /** * 查询申领记录 - * + * * @param applyId 申领记录主键 * @return 申领记录 */ @@ -43,7 +59,7 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { /** * 查询申领记录列表 - * + * * @param equSpareApply 申领记录 * @return 申领记录 */ @@ -63,26 +79,57 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { /** * 新增申领记录 - * + * * @param equSpareApply 申领记录 * @return 结果 */ @Override @DS("#header.poolName") - public int insertEquSpareApply(EquSpareApply equSpareApply) { - equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); - //工厂号 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String key = "#header.poolName"; - equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); - equSpareApply.setCreateTime(DateUtils.getNowDate()); - equSpareApply.setCreateBy(SecurityUtils.getUsername()); - return equSpareApplyMapper.insertEquSpareApply(equSpareApply); + public AjaxResult insertEquSpareApply(EquSpareApply equSpareApply) { + try { + //equSpareApply.getSpareApplyLists().size() 是在申领备件的时候进行的操作 + if(equSpareApply.getSpareApplyLists().size() >= 1){ + List list = equSpareApply.getSpareApplyLists(); + for(EquSpareApply applyList:list){ + applyList.setApplyId(IdUtils.fastSimpleUUID()); + //领用时间 + applyList.setApplyTime(DateUtils.getNowDate()); + //申领人 + applyList.setApplyPeople(SecurityUtils.getUsername()); + //工厂号 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + applyList.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + applyList.setCreateTime(DateUtils.getNowDate()); + applyList.setCreateBy(SecurityUtils.getUsername()); + equSpareApplyMapper.insertEquSpareApply(applyList); + //更新完备品申领单后，更新库存 + SparePartsLedger sparePartsLedger = new SparePartsLedger(); + sparePartsLedger.setStorageId(applyList.getStorageId()); + BigDecimal applyNum = applyList.getSpareQuantity(); + BigDecimal amount = applyList.getAmount(); + sparePartsLedger.setAmount(amount.subtract(applyNum)); + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + }else{ + equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); + //工厂号 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + equSpareApply.setCreateTime(DateUtils.getNowDate()); + equSpareApply.setCreateBy(SecurityUtils.getUsername()); + equSpareApplyMapper.insertEquSpareApply(equSpareApply); + } + return success("新增申领记录成功！"); + } catch (Exception e) { + return error(); + } } /** * 修改申领记录 - * + * * @param equSpareApply 申领记录 * @return 结果 */ @@ -95,20 +142,60 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { } /** - * 批量删除申领记录 - * + * TODO 批量删除申领记录 + * * @param applyIds 需要删除的申领记录主键 * @return 结果 */ @Override @DS("#header.poolName") - public int deleteEquSpareApplyByApplyIds(String[] applyIds) { - return equSpareApplyMapper.deleteEquSpareApplyByApplyIds(applyIds); + public AjaxResult deleteEquSpareApplyByApplyIds(String[] applyIds) { + boolean check = true; + // 校验 + for (String id : applyIds) { + EquSpareApply apply = equSpareApplyMapper.selectEquSpareApplyByApplyId(id); + int checkNull = 0; + if (apply.getWorkCode() != null) { + if (!apply.getWorkCode().isEmpty()) { + EquRepairWorkOrder workOrder = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkCode(apply.getWorkCode()); + if (workOrder != null) { + if (workOrder.getWorkStatus().equals("1")) { + check = false; + } + }else { + checkNull++; + } + EquOrder order = equOrderMapper.selectEquOrderByOrderCode(apply.getWorkCode()); + if (order != null) { + if (order.getOrderStatus().equals("1")){ + check = false; + } + }else { + checkNull++; + } + } + } + + if (checkNull == 2) { + return error(500,"关联单号信息为空！删除失败！"); + } + + if (check) { + // 回填数据 + sparePartsLedgerMapper.updateSpareNumAdd(apply); + // 逻辑删除领用单 + equSpareApplyMapper.delEquSpareApplyByApplyId(id); + }else { + return error(500,"关联工单状态已完成，不可删除！"); + } + + } + return success(); } /** * 删除申领记录信息 - * + * * @param applyId 申领记录主键 * @return 结果 */ diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java index df8779159..8941946bd 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquTeamServiceImpl.java @@ -52,7 +52,7 @@ public class EquTeamServiceImpl implements IEquTeamService { List equTeamUser1 = equTeamUserMapper.selectEquTeamUserList(equTeamUser); EquTeam equTeam = equTeamMapper.selectEquTeamById(id); equTeam.setSelectedData(equTeamUser1); - return equTeamMapper.selectEquTeamById(id); + return equTeam; } /** @@ -99,9 +99,9 @@ public class EquTeamServiceImpl implements IEquTeamService { list = equTeam.getRightData(); String userId = list.get(i); equTeamUser.setUserId(userId); - EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser); - equTeamUser.setUserName(memberList.getUserName()); - equTeamUser.setNickName(memberList.getNickName()); +// EquTeamUser memberList = equTeamMapper.selectTeamMember(equTeamUser); +// equTeamUser.setUserName(memberList.getUserName()); +// equTeamUser.setNickName(memberList.getNickName()); equTeamUserMapper.insertEquTeamUser(equTeamUser); } return success("新增设备班组成功！"); @@ -123,6 +123,7 @@ public class EquTeamServiceImpl implements IEquTeamService { try{ equTeam.setUpdateTime(DateUtils.getNowDate()); equTeam.setUpdateBy(SecurityUtils.getUsername()); + equTeamUserMapper.deleteEquTeamUserByTeamId(equTeam.getId()); equTeamMapper.updateEquTeam(equTeam); for(int i = 0;i equPlanEquList = equPlan.getEquipmentItem(); - EquPlanEqu equPlanEqu = equPlanEquList.get(0); - BeanUtils.copyProperties(equPlanEqu,equ); - equ.setId(IdUtils.fastSimpleUUID()); - equ.setParentCode(equOrder.getOrderId()); - equ.setOrderCode(equOrder.getOrderCode()); - equ.setFactoryCode(factory); - equ.setAttr1(""); - equ.setCreateBy(SecurityContextHolder.getUserName()); - // 设备插入 - equOrderEquMapper.insertEquOrderEqu(equ); + EquPlanEqu equPlanEqu = equPlan.getEquipmentItem().get(0); + // 生成工单-备件 - List spareList = new ArrayList<>(); List equSpareList = equPlanEqu.getSpareList(); - for (EquPlanEquSpare spare : equSpareList) { - EquOrderEquSpare spareTemp = new EquOrderEquSpare(); - BeanUtils.copyProperties(spare,spareTemp); - spareTemp.setId(IdUtils.fastSimpleUUID()); - spareTemp.setOrderCode(equOrder.getOrderCode()); - spareTemp.setParentCode(equ.getId()); - spareTemp.setFactoryCode(factory); - spareTemp.setCreateBy(SecurityContextHolder.getUserName()); - spareTemp.setCreateTime(DateUtils.getNowDate()); - spareTemp.setUpdateBy(SecurityContextHolder.getUserName()); - spareTemp.setUpdateTime(DateUtils.getNowDate()); - // 插入备件信息 - equOrderEquSpareMapper.insertEquOrderEquSpare(spareTemp); - spareList.add(spareTemp); + if (equSpareList != null) { + // 获取流水单号 + int applySerialNum = equSpareApplyMapper.selectSerialNumber(); + + for (EquPlanEquSpare spare : equSpareList) { + EquSpareApply apply = new EquSpareApply(); + apply.setApplyId(IdUtils.fastSimpleUUID()); + apply.setApplyCode("A"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+String.format("%03d",applySerialNum)); + applySerialNum++; + apply.setSpareCode(spare.getMaterialCode()); + apply.setSpareName(spare.getMaterialDesc()); + apply.setSpareModel(spare.getSpareType()); + apply.setSpareQuantity(spare.getApplyNum()); + apply.setFactoryCode(factory); + apply.setApplyPeople(SecurityContextHolder.getUserName()); + apply.setWorkCode(equOrder.getOrderCode()); + apply.setCreateBy(SecurityContextHolder.getUserName()); + apply.setCreateTime(DateUtils.getNowDate()); + apply.setSpareUseEquipment(equOrder.getEquipmentCode()); + apply.setApplyTime(DateUtils.getNowDate()); + // 插入备件信息 + equSpareApplyMapper.insertEquSpareApply(apply); + + // 减少备件仓库中备件数量 + sparePartsLedgerMapper.updateSpareNumReduce(apply); + } } - // 备件置入 - System.out.println(spareList); + // 生成工单-设备-保养项 List detailList = equPlanEqu.getEquPlanDetailList(); @@ -148,8 +153,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { BeanUtils.copyProperties(detail,equOrderDetail); equOrderDetail.setId(IdUtils.fastSimpleUUID()); equOrderDetail.setOrderCode(equOrder.getOrderCode()); - equOrderDetail.setParentCode(equ.getId()); - equOrderDetail.setFactroyCode(factory); + equOrderDetail.setFactoryCode(factory); equOrderDetail.setStandardList(orderStandardList); equOrderDetail.setCreateBy(SecurityContextHolder.getUserName()); equOrderDetail.setCreateTime(DateUtils.getNowDate()); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java index f7fbc4d22..7203edc3b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java @@ -1,6 +1,7 @@ package com.op.device.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.domain.BaseFileData; import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.*; import com.op.device.domain.vo.InspectionWorkVO; @@ -36,7 +37,9 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService { @Autowired private EquOrderEquSpareMapper equOrderEquSpareMapper; @Autowired - private EquOrderEquMapper equOrderEquMapper; + private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private EquFileMapper equFileMapper; /** * 查询巡检记录 @@ -56,13 +59,21 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService { order.setPlanName(equPlan.getPlanName()); } + // 保养图片 + BaseFileData selectTemp = new BaseFileData(); + selectTemp.setSourceId(orderId); + List upkeepPictures = equFileMapper.selectUrlList(selectTemp); + if (upkeepPictures != null) { + order.setUpkeepPictures(upkeepPictures); + } + // 查询备件信息 - List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode()); + List spareList = equSpareApplyMapper.selectEquSpareApplyListByWorkCode(order.getOrderCode()); // 替换循环周期 order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType())); - Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()).getEquipmentCode()); + Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(order.getEquipmentCode()); // 查询检查项、标准 List detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode()); @@ -82,6 +93,14 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService { standard.setDetailReach("达标"); } } + // 未达标图片 + selectTemp.setSourceId(standard.getId()); + selectTemp.setImageType("3"); + List checkPictrueList = equFileMapper.selectUrlList(selectTemp); + if (checkPictrueList != null) { + standard.setCheckPictrueList(checkPictrueList); + } + } detail.setStandardList(standardList); } diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml index 29c262a31..a190ac188 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml @@ -15,6 +15,14 @@ ep.plan_restrict planRestrict, ep.plan_type planType, ep.plan_outsource planOutsource, + ep.calculation_rule calculationRule, + ep.shut_down as 'shutDown', + ep.upkeep, + ep.work_person workPerson, + ep.work_outsourcing_unit workOutsourcingUnit, + ep.work_connection workConnection, + ep.work_reason workReason, + ep.plan_code planCode, epe.equipment_code equipmentCode, epe.equipment_name equipmentName, epe.id planEquId @@ -23,6 +31,9 @@ where ep.del_flag = '0' and epe.del_flag = '0' and ep.plan_status = '0' and ep.plan_type = #{planType} and CONVERT(varchar(10),GETDATE(), 120) >= CONVERT(varchar(10),ep.plan_loop_start, 120) + + and CONVERT(varchar(10),ep.plan_loop_end, 120) >= CONVERT(varchar(10),GETDATE(), 120) + + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml index 03432131d..437a399ad 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml @@ -60,7 +60,7 @@ SELECT COUNT(item_id)+1 AS serialNum FROM equ_check_item - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0' + WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_type - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0' + WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) @@ -125,4 +130,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{faultId} + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFileMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFileMapper.xml index ef5150b67..00829f881 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFileMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFileMapper.xml @@ -68,7 +68,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and image_type = #{imageType} - + + + insert into base_file file_id, @@ -105,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time) + INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type) VALUES ( @@ -115,7 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{baseFile.sourceId}, #{baseFile.remark}, #{baseFile.createBy}, - #{baseFile.createTime} + #{baseFile.createTime}, + #{baseFile.imageType} ) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquItemEquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquItemEquipmentMapper.xml index e58ca3995..fb8bc2847 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquItemEquipmentMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquItemEquipmentMapper.xml @@ -50,7 +50,7 @@ + + insert into equ_order_equ diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml index 33e4447f5..25c42457d 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml @@ -25,7 +25,10 @@ - select id, code, order_code, parent_code, material_code, material_desc, spare_type, apply_num, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_order_equ_spare + select id, code, order_code, parent_code, material_code, material_desc, + spare_type, apply_num, factory_code, attr1, attr2, attr3, del_flag, + create_by, create_time, update_by, update_time + from equ_order_equ_spare @@ -118,7 +128,7 @@ - where CONVERT(date,GETDATE()) > plan_loop_start and plan_type = #{planType} and del_flag = '0' and order_status != '1' and order_code in ( + where CONVERT(date,GETDATE()) >= plan_loop_start and plan_type = #{planType} and del_flag = '0' and order_status != '1' and order_code in ( select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code ) @@ -139,6 +149,10 @@ ) + + insert into equ_order @@ -178,7 +192,7 @@ repair_code, work_code, plan_restrict, - + outsource_code, #{orderId}, @@ -216,6 +230,7 @@ #{repairCode}, #{workCode}, #{planRestrict}, + #{outsourceCode}, @@ -255,6 +270,7 @@ order_inspect = #{orderInspect}, repair_code = #{repairCode}, work_code = #{workCode}, + outsource_code = #{outsourceCode}, where order_id = #{orderId} @@ -269,4 +285,69 @@ #{orderId} + + + update equ_order set del_flag = '1' where order_id in + + #{orderId} + + + + + + + + + + + + + + + + update equ_order + + update_by = #{updateBy}, + update_time = #{updateTime}, + work_code = #{workCode}, + + where order_id = #{orderId} + + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml index 5228e24e7..51a5b7013 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml @@ -82,7 +82,7 @@ #{updateTime}, - + insert into equ_order_person ( id, order_code, user_id, user_name, factory_code, @@ -92,7 +92,7 @@ ( #{item.id},#{item.planCode}, - #{item.userId},#{item.userName},#{item.factroyCode}, + #{item.userId},#{item.userName},#{item.factoryCode}, #{item.delFlag},#{item.createBy},#{item.createTime} ) @@ -127,4 +127,15 @@ #{id} + + + update equ_order_person + set del_flag = '1' + where del_flag = '0' and order_code in ( + select order_code from equ_order where del_flag = '0' and order_id in + + #{id} + + ) + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml index f42fe5c7f..6ce4fe557 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml @@ -31,11 +31,31 @@ - - - + + + + + + + + + + + + + + + + + + + select file_id, file_name, file_address, source_id, remark, attr1, + attr2, attr3, attr4, create_by, create_time, update_by, + update_time,image_type from base_file + + select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, @@ -141,33 +161,18 @@ - - INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time) - VALUES - - ( - #{baseFile.fileId}, - #{baseFile.fileName}, - #{baseFile.fileAddress}, - #{baseFile.sourceId}, - #{baseFile.remark}, - #{baseFile.createBy}, - #{baseFile.createTime} - ) - - insert into equ_order_standard( id, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit,detail_unit, - factory_code,del_flag, create_by, create_time,fault_type + factory_code,del_flag, create_by, create_time ) VALUES ( #{item.id},#{item.parentCode},#{item.planCode},#{item.standardType},#{item.standardName}, #{item.detailUpLimit},#{item.detailDownLimit},#{item.detailUnit}, - #{item.factroyCode},#{item.delFlag},#{item.createBy},#{item.createTime} + #{item.factoryCode},#{item.delFlag},#{item.createBy},#{item.createTime} ) @@ -204,6 +209,17 @@ where id = #{id} and del_flag = '0' + + update equ_order_standard + + repair_reach = #{repairReach}, + repair_value = #{repairValue}, + repair_picture = #{repairPicture}, + + where id = #{id} + and del_flag = '0' + + delete from equ_order_standard where id = #{id} @@ -215,25 +231,72 @@ - + + + + INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type) + VALUES + + ( + #{baseFile.fileId}, + #{baseFile.fileName}, + #{baseFile.fileAddress}, + #{baseFile.sourceId}, + #{baseFile.remark}, + #{baseFile.createBy}, + #{baseFile.createTime}, + #{baseFile.imageType} + ) + + + + + delete from base_file where source_id = #{sourceId} + + + + update equ_order_standard set del_flag = '1' + where del_flag = '0' and order_code in ( + select order_code from equ_order where del_flag = '0' and order_id in + + #{id} + + ) + + + + + + update equ_order_standard + + update_by = #{updateBy}, + update_time = #{updateTime}, + repair_reach = #{repairReach}, + repair_value = #{repairValue}, + + where id = #{id} + and del_flag = '0' + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml index c127939ae..405463bdd 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml @@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -35,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select work_id, work_code,order_code, repair_code, work_person, work_outsourcing_unit, work_connection, work_reason, work_type, equipment_code, work_cost, work_cost_time, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_outsource_work + select work_id, work_code,order_code, repair_code, work_person, work_outsourcing_unit, work_connection, work_reason, work_type, equipment_code, work_cost, work_cost_time,work_status, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_outsource_work @@ -134,4 +137,4 @@ update equ_plan_equ_spare 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/EquPlanMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml index 2f42777fd..c05b9aba5 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 @@ -34,10 +34,14 @@ + + + + - select plan_id, plan_code, plan_name, plan_workshop, plan_prod_line, equipment_name, equipment_code, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, plan_person, plan_status, plan_restrict, plan_type, plan_outsource, work_code, upkeep, calculation_rule, shut_down, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan + select plan_id, plan_code, plan_name, plan_workshop, plan_prod_line, equipment_name, equipment_code, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, plan_person, plan_status, plan_restrict, plan_type, plan_outsource, work_code, upkeep, calculation_rule, shut_down, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time , work_person, work_outsourcing_unit, work_connection,work_reason from equ_plan @@ -85,7 +97,7 @@ @@ -56,11 +84,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and order_code like concat('%', #{orderCode}, '%') and equipment_code like concat('%', #{equipmentCode}, '%') and order_desc like concat('%', #{orderDesc}, '%') - and order_breakdown_time = #{orderBreakdownTime} + + and CONVERT(date,order_breakdown_time) >= #{orderBreakdownTimeStart} + and #{orderBreakdownTimeEnd} >= CONVERT(date,order_breakdown_time) and order_source like concat('%', #{orderSource}, '%') - and order_time = #{orderTime} + + and CONVERT(date,order_time) >= #{orderTimeStart} + and #{orderTimeEnd} >= CONVERT(date,order_time) and order_handle = #{orderHandle} - and order_repairman like concat('%', #{orderRepairman}, '%') + and order_repairman_code like concat('%', #{orderRepairmanCode}, '%') + and order_repairman_name like concat('%', #{orderRepairmanName}, '%') and order_connection like concat('%', #{orderConnection}, '%') and order_status = #{orderStatus} and order_relevance = #{orderRelevance} @@ -87,7 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ero.order_source, ero.order_time, ero.order_handle, - ero.order_repairman, + ero.order_repairman_code, + ero.order_repairman_name, ero.order_connection, ero.order_status, ero.order_relevance, @@ -114,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from equ_repair_order ero left join base_equipment be on ero.equipment_code = be.equipment_code left join equ_repair_work_order rwo on ero.order_code = rwo.order_code - left join equ_outsource_work eow on ero.order_code = eow.work_code + left join equ_outsource_work eow on ero.order_code = eow.order_code where ero.order_id = #{orderId} and ero.del_flag = '0' ORDER BY create_time DESC @@ -131,7 +165,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order_source, order_time, order_handle, - order_repairman, + order_repairman_code, + order_repairman_name, order_connection, order_status, order_relevance, @@ -156,7 +191,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{orderSource}, #{orderTime}, #{orderHandle}, - #{orderRepairman}, + #{orderRepairmanCode}, + #{orderRepairmanName}, #{orderConnection}, #{orderStatus}, #{orderRelevance}, @@ -184,7 +220,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order_source = #{orderSource}, order_time = #{orderTime}, order_handle = #{orderHandle}, - order_repairman = #{orderRepairman}, + order_repairman_code = #{orderRepairmanCode}, + order_repairman_name = #{orderRepairmanName}, order_connection = #{orderConnection}, order_status = #{orderStatus}, order_relevance = #{orderRelevance}, @@ -236,9 +273,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_id AS userId, user_name AS userName, nick_name AS nickName, - CONCAT(nick_name,user_name) AS teamUserName + CONCAT(nick_name,user_name) AS teamUserName, + phonenumber AS phonenumber from sys_user - where del_flag = '0' + + and user_name like concat('%', #{userName}, '%') + and nick_name like concat('%', #{nickName}, '%') + and del_flag = '0' + + + + + + INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type) + VALUES + + ( + #{baseFile.fileId}, + #{baseFile.fileName}, + #{baseFile.fileAddress}, + #{baseFile.sourceId}, + #{baseFile.remark}, + #{baseFile.createBy}, + #{baseFile.createTime}, + #{baseFile.imageType} + ) + + + + + delete from base_file where source_id = #{sourceId} + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml index 6647de50b..6ca06eb60 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -23,6 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -43,18 +46,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - + + + + + + + + + + + + + + + + + + + + select file_id, file_name, file_address, source_id, remark, attr1, + attr2, attr3, attr4, create_by, create_time, update_by, + update_time,image_type from base_file + + select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code from equ_repair_work_order @@ -78,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" erwo.work_fault_desc, erwo.work_start_time, erwo.work_end_time, + erwo.actual_down_start_time, + erwo.actual_down_end_time, + erwo.work_connection, erwo.work_cost_time, erwo.work_cost, erwo.work_status, @@ -132,6 +163,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY erwo.create_time DESC + + + + + delete from base_file where source_id = #{sourceId} + + + + + + + + INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time,image_type) + VALUES + + ( + #{baseFile.fileId}, + #{baseFile.fileName}, + #{baseFile.fileAddress}, + #{baseFile.sourceId}, + #{baseFile.remark}, + #{baseFile.createBy}, + #{baseFile.createTime}, + #{baseFile.imageType} + ) + + + + + update equ_repair_work_order + set + work_status = '1' + where work_code = #{repairCode} + and del_flag = '0' + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml index 78e454e3d..12dcaf844 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml @@ -167,6 +167,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update equ_spare_apply set del_flag = '1' where del_flag = '0' and work_code in ( select order_code from + equ_order where del_flag = '0' and order_id in + + #{id} + + ) + + + + update equ_spare_apply set del_flag = '1' + where apply_id in + + #{id} + + + + + update equ_spare_apply set del_flag = '1' where apply_id = #{id} + + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml index b21528abe..e88125bb2 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquTeamMapper.xml @@ -129,4 +129,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = '0' + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml index dae6a04cd..af5cc8bb4 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquTeamUserMapper.xml @@ -21,13 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into mes_report_work @@ -471,6 +481,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, update_by, prod_type, + batch, + end_report, #{id}, @@ -507,6 +519,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{updateBy}, #{prodType}, + #{batch}, + #{endReport}, @@ -545,6 +559,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_time = #{updateTime}, update_by = #{updateBy}, + batch = #{batch}, + end_report = #{endReport}, where id = #{id} diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml index cab05f69e..bc0901f2b 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join pro_process pp on pp.process_id = ppd.next_process_id left join pro_process ppp on ppp.process_id = ppd.now_process_id left join pro_order_workorder pow on pow.workorder_code = ppd.workorder_code - order by ppd.in_time desc + and ppd.workorder_code like concat('%', #{workorderCode}, '%') and rfid like concat('%', #{rfid}, '%') @@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and work_batch_code = #{workBatchCode} and bind_status = #{bindStatus} + order by ppd.in_time desc + + + insert into mes_prepare_detail @@ -364,6 +384,90 @@ ) + + insert into mes_prepare + + prepare_id, + workorder_code, + workorder_name, + parent_order, + order_id, + order_code, + product_id, + product_code, + prod_type, + product_name, + product_spc, + wet_detail_plan_id, + product_date, + shift_id, + ancestors, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + material_code, + material_name, + material_spc, + unit, + quantity, + + + #{prepareId}, + #{workorderCode}, + #{workorderName}, + #{parentOrder}, + #{orderId}, + #{orderCode}, + #{productId}, + #{productCode}, + #{prodType}, + #{productName}, + #{productSpc}, + #{wetDetailPlanId}, + #{productDate}, + #{shiftId}, + #{ancestors}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{materialCode}, + #{materialName}, + #{materialSpc}, + #{unit}, + #{quantity}, + + + + INSERT INTO mes_prepare_detail ( + record_id,prepare_id,material_code,material_name,unit, + quantity,create_by,create_time,factory_code,status, + locator,need_date,recoil,fund_quanlity,buy_flag + )VALUES + + ( + #{d.recordId},#{d.prepareId},#{d.materialCode},#{d.materailName},#{d.unit}, + #{d.quantity},#{d.createBy},#{d.createTime},#{d.factoryCode},#{d.status}, + #{d.locator},#{d.needDate},#{d.recoil},#{d.fundQuanlity},#{d.buyFlag} + ) + + + update pro_order_workorder @@ -403,12 +507,12 @@ where workorder_id = #{workorderId} - + update pro_order_workorder set status = 'w1' - where workorder_code in - - #{workorderCode} + where workorder_id in + + #{workorderId} and del_flag = '0' @@ -419,6 +523,20 @@ where workorder_code = #{workorderId} and del_flag = '0' + + update pro_order_workorder + + prod_line_code = #{prodLineCode}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where workorder_id = #{workorderId} + + + update pro_order_workorder + set status = 'w1' + where workorder_id = #{workorderId} + update pro_order_workorder diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java index 712a07809..80182e835 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java @@ -44,13 +44,13 @@ public class QcCheckReportIncomeController extends BaseController { public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){ - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start + if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ + qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate()+" 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end + qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java index 3bc6bd595..da833bb85 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java @@ -44,13 +44,13 @@ public class QcCheckReportProduceController extends BaseController { public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){ - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start + if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ + qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate()+" 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end + qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end } startPage(); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java index 2c097d628..37021e76b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java @@ -44,13 +44,13 @@ public class QcCheckReportProductController extends BaseController { public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){ - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start + if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ + qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate()+" 00:00:00");//start LocalDate date = LocalDate.now(); LocalDate dateEnd = date.plusDays(1); DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end + qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ 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 index f6e875209..361dcc581 100644 --- 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 @@ -7,9 +7,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.common.core.utils.DateUtils; import com.op.common.security.utils.SecurityUtils; -import com.op.quality.domain.QcBomComponent; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcSupplier; +import com.op.quality.domain.*; import com.op.system.api.domain.SysRole; import com.op.system.api.domain.SysUser; import org.apache.commons.lang.StringUtils; @@ -25,7 +23,6 @@ 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; @@ -219,4 +216,10 @@ public class QcCheckTaskIncomeController extends BaseController { return toAjax(qcCheckTaskIncomeService.commitCheckResult(qcCheckTaskIncome)); } + /**不良类型**/ + @PutMapping("/getDefectList") + public List getDefectList(@RequestBody QcDefectType qcDefectType) { + return qcCheckTaskIncomeService.getDefectList(qcDefectType); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java new file mode 100644 index 000000000..980096f2f --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java @@ -0,0 +1,92 @@ +package com.op.quality.controller; + +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; +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.QcDefectType; +import com.op.quality.service.IQcDefectTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 不良类型维护Controller + * + * @author wws + * @date 2023-10-12 + */ +@RestController +@RequestMapping("/defectType") +public class QcDefectTypeController extends BaseController { + @Autowired + private IQcDefectTypeService qcDefectTypeService; + + /** + * 查询不良类型维护列表 + */ + @RequiresPermissions("quality:defectType:list") + @GetMapping("/list") + public TableDataInfo list(QcDefectType qcDefectType) { + startPage(); + List list = qcDefectTypeService.selectQcDefectTypeList(qcDefectType); + return getDataTable(list); + } + + /** + * 导出不良类型维护列表 + */ + @RequiresPermissions("quality:defectType:export") + @Log(title = "不良类型维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcDefectType qcDefectType) { + List list = qcDefectTypeService.selectQcDefectTypeList(qcDefectType); + ExcelUtil util = new ExcelUtil(QcDefectType.class); + util.exportExcel(response, list, "不良类型维护数据"); + } + + /** + * 获取不良类型维护详细信息 + */ + @RequiresPermissions("quality:defectType:query") + @GetMapping(value = "/{defectId}") + public AjaxResult getInfo(@PathVariable("defectId") String defectId) { + return success(qcDefectTypeService.selectQcDefectTypeByDefectId(defectId)); + } + + /** + * 新增不良类型维护 + */ + @RequiresPermissions("quality:defectType:add") + @Log(title = "不良类型维护", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcDefectType qcDefectType) { + return qcDefectTypeService.insertQcDefectType(qcDefectType); + } + + /** + * 修改不良类型维护 + */ + @RequiresPermissions("quality:defectType:edit") + @Log(title = "不良类型维护", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcDefectType qcDefectType) { + return qcDefectTypeService.updateQcDefectType(qcDefectType); + } + + /** + * 删除不良类型维护 + */ + @RequiresPermissions("quality:defectType:remove") + @Log(title = "不良类型维护", businessType = BusinessType.DELETE) + @DeleteMapping("/{defectIds}") + public AjaxResult remove(@PathVariable String[] defectIds) { + return toAjax(qcDefectTypeService.deleteQcDefectTypeByDefectIds(defectIds)); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java index d5edb2a2c..c863f96fa 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java @@ -1,7 +1,19 @@ package com.op.quality.controller; -import java.util.List; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import com.op.common.core.utils.DateUtils; +import com.op.system.api.domain.quality.ChartDTO; +import com.op.system.api.domain.quality.FactoryDto; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -39,6 +51,17 @@ public class QcStaticTableController extends BaseController { @RequiresPermissions("quality:qcTableIncome:list") @GetMapping("/getIncomeTableList") public TableDataInfo getIncomeTableList(QcStaticTable qcStaticTable) { + if(StringUtils.isNotBlank(qcStaticTable.getSupplierCode())){ + List codes = Arrays.asList(qcStaticTable.getSupplierCode().split(",")); + qcStaticTable.setSupplierCodes(codes); + } + //默认时间范围T 00:00:00~T+1 00:00:00 + if(StringUtils.isEmpty(qcStaticTable.getYearMonth())){ + LocalDate date = LocalDate.now(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM"); + String ymStr = dtf.format(date); + qcStaticTable.setYearMonth(ymStr);//end + } startPage(); List list = qcStaticTableService.selectQcStaticTableList(qcStaticTable); return getDataTable(list); @@ -55,18 +78,138 @@ public class QcStaticTableController extends BaseController { * 生产过程质量报表 */ @RequiresPermissions("quality:gcTableProduce:list") - @GetMapping("/getProduceTableList") - public TableDataInfo getProduceList(QcStaticTable qcStaticTable) { - startPage(); - List list = qcStaticTableService.selectQcStaticTableList(qcStaticTable); - return getDataTable(list); + @GetMapping("/getProduceChartData") + public QcStaticTable getProduceChartData(QcStaticTable qcStaticTable) { + QcStaticTable resultdto = new QcStaticTable(); + //默认时间范围T 00:00:00~T+1 00:00:00 + if(StringUtils.isEmpty(qcStaticTable.getYmArrayStart())){ + LocalDate date = LocalDate.now(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM"); + String ymStr = dtf.format(date); + qcStaticTable.setYmArrayStart(ymStr); + qcStaticTable.setYmArrayEnd(ymStr); + } + if(StringUtils.isNotBlank(qcStaticTable.getMaterialCode())){ + qcStaticTable.setMaterialCode("'"+qcStaticTable.getMaterialCode().replace(",","','")+"'"); + } + //xAxis; + if(qcStaticTable.getYmArrayStart().equals(qcStaticTable.getYmArrayEnd())){ + /**月内每日**/ + List days = this.getXNames(qcStaticTable.getYmArrayStart()+"-01", + qcStaticTable.getYmArrayEnd()+"-01","ymd"); + resultdto.setxAxis(days); + + qcStaticTable.setDataType("ymd"); + qcStaticTable.setYmArrayStart(days.get(0)); + qcStaticTable.setYmArrayEnd(days.get(days.size()-1)); + }else{ + /**年内各月**/ + List months = this.getXNames(qcStaticTable.getYmArrayStart(),qcStaticTable.getYmArrayEnd(),"ym"); + resultdto.setxAxis(months); + + qcStaticTable.setDataType("ym"); + qcStaticTable.setYmArrayStart(months.get(0)); + qcStaticTable.setYmArrayEnd(months.get(months.size()-1)); + } + + + List serieDTOs = qcStaticTableService.getProduceNames(qcStaticTable); + //legendData + List pnames = serieDTOs.stream().map(u -> u.getMaterialName()).collect(Collectors.toList()); + resultdto.setLegendData(pnames); + + Map seriesdtos= null; + if("ymd".equals(qcStaticTable.getDataType())){//ymd + //code->materialCode+yyyy-mm-dd + seriesdtos= qcStaticTableService.getProduceChartData(qcStaticTable); + }else{//ym + //code->materialCode+yyyy-mm-dd + seriesdtos= qcStaticTableService.getProduceChartDataYM(qcStaticTable); + } + + List seriesChart = new ArrayList<>(); + for(QcStaticTable serieDTO:serieDTOs){ + ChartDTO chartDTO = new ChartDTO(); + chartDTO.setName(serieDTO.getMaterialName()); + chartDTO.setType("line"); + String keyPre = serieDTO.getMaterialCode(); + List datas = new ArrayList<>(); + for(String ymd:resultdto.getxAxis()){ + String key = keyPre+ymd; + QcStaticTable mdata = seriesdtos.get(key); + if(mdata != null){ + BigDecimal defectRate = (mdata.getaNoOkquality().add(mdata.getbNoOkquality()).multiply(new BigDecimal("0.65")) + .add(mdata.getcNoOkquality()).multiply(new BigDecimal(0.35))) + .divide(new BigDecimal(mdata.getSampleQuality())) + .setScale(2, BigDecimal.ROUND_HALF_UP); + datas.add(defectRate.doubleValue()); + }else{ + datas.add(0.00); + } + } + chartDTO.setData(datas); + seriesChart.add(chartDTO); + } + resultdto.setSeries(seriesChart); + + return resultdto; } + + public List getXNames(String startMonth,String endMonth,String type){ + // 返回的日期集合 + List days = new ArrayList(); + DateFormat dateFormat = null; + try { + Calendar tempStart = null; + Calendar tempEnd = null; + if("ymd".equals(type)){ + dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date start = dateFormat.parse(startMonth);//开始 + Date end = dateFormat.parse(endMonth);//结束 + + tempStart = Calendar.getInstance(); + tempStart.setTime(start); + + tempEnd = Calendar.getInstance(); + tempEnd.setTime(end); + tempEnd.add(Calendar.MONTH, 1); + }else{ + dateFormat = new SimpleDateFormat("yyyy-MM"); + Date start = dateFormat.parse(startMonth);//开始 + Date end = dateFormat.parse(endMonth);//结束 + + tempStart = Calendar.getInstance(); + tempStart.setTime(start); + + tempEnd = Calendar.getInstance(); + tempEnd.setTime(end); + tempEnd.add(Calendar.MONTH, 1); + } + + while (tempStart.before(tempEnd)) { + days.add(dateFormat.format(tempStart.getTime())); + if("ymd".equals(type)) { + tempStart.add(Calendar.DAY_OF_MONTH, 1); + }else{ + tempStart.add(Calendar.MONTH, 1); + } + } + } catch (ParseException e) { + e.printStackTrace(); + } + return days; + } + @RequiresPermissions("quality:gcTableProduce:list") - @Log(title = "质量系统报", businessType = BusinessType.EXPORT) @PostMapping("/exportTableList") public void exportTableList(HttpServletResponse response, QcStaticTable qcStaticTable) { List list = qcStaticTableService.selectQcStaticTableList(qcStaticTable); ExcelUtil util = new ExcelUtil(QcStaticTable.class); util.exportExcel(response, list, "质量系统报数据"); } + + @GetMapping("/getWorkcenterList") + public List getWorkcenterList(FactoryDto factoryDto) { + return qcStaticTableService.getWorkcenterList(factoryDto); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index b1a4176c8..d242a381b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -6,11 +6,10 @@ import com.op.common.core.utils.StringUtils; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.web.page.TableDataInfo; -import com.op.quality.domain.QcCheckTaskProduce; -import com.op.quality.domain.QcCheckTaskWarehousing; -import com.op.quality.domain.QcProCheck; +import com.op.quality.domain.*; import com.op.quality.service.IQcCheckTaskProduceService; import com.op.quality.service.IQcCheckTaskWarehousingService; +import com.op.quality.service.IQcCheckTypeService; import com.op.quality.service.QcProCheckService; import com.op.system.api.RemoteMesService; import com.op.system.api.domain.dto.WCSDTO; @@ -34,12 +33,12 @@ public class QuaController extends BaseController { @Autowired private RemoteMesService remoteMesService; - @Autowired private IQcCheckTaskProduceService qcCheckTaskProduceService; - @Autowired private IQcCheckTaskWarehousingService qcCheckTaskWarehousingService; + @Autowired + private IQcCheckTypeService qcCheckTypeService; @PostMapping("/saveQcProCheck") public R saveQcProCheck(@RequestBody QcProCheck qcProCheck) { @@ -149,4 +148,39 @@ public class QuaController extends BaseController { //添加检测任务 return success(qcCheckTaskWarehousingService.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing)); } + + /** + * 任务数量管理 + */ + @GetMapping(value = "getTopTaskInfo") + public AjaxResult getTopTaskInfo(QcCheckType qcCheckType) { + if(StringUtils.isBlank(qcCheckType.getFactoryCode())){ + return error("[factoryCode]不能为空"); + } + return success(qcCheckTypeService.getTopTaskInfo(qcCheckType)); + } + + + /** + * 获取检验节点下拉列表 + */ + @GetMapping(value = "getCheckType") + public AjaxResult getCheckType(QcCheckType qcCheckType) { + if(StringUtils.isBlank(qcCheckType.getFactoryCode())){ + return error("[factoryCode]不能为空"); + } + return success(qcCheckTypeService.getCheckType(qcCheckType)); + } + + /** + * 获取待检验信息列表 + */ + @GetMapping(value = "getCheckTaskList") + public AjaxResult getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) { +// if(StringUtils.isBlank(qcCheckType.getFactoryCode())){ +// return error("[factoryCode]不能为空"); +// } +// return success(qcCheckTypeService.getCheckType(qcCheckType)); + return null; + } } 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 index 0eccb0208..72b8ac8d3 100644 --- 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 @@ -94,6 +94,15 @@ public class QcCheckTaskDetail extends BaseEntity { private Integer sampleNum; private List actualValues; private String typeProjectId; + private String defectCode; + + public String getDefectCode() { + return defectCode; + } + + public void setDefectCode(String defectCode) { + this.defectCode = defectCode; + } public String getTypeProjectId() { return typeProjectId; 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 index 5ff7a6ffd..6aef89b54 100644 --- 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 @@ -44,6 +44,9 @@ public class QcCheckTaskIncome extends BaseEntity { @Excel(name = "收货数量") private BigDecimal quality; + @Excel(name = "不合格数量") + private BigDecimal noOkQuality; + /** 单位 */ @Excel(name = "单位") private String unit; @@ -120,6 +123,14 @@ public class QcCheckTaskIncome extends BaseEntity { private String typeCode; private String checkType; + public BigDecimal getNoOkQuality() { + return noOkQuality; + } + + public void setNoOkQuality(BigDecimal noOkQuality) { + this.noOkQuality = noOkQuality; + } + public String getCheckType() { return checkType; } 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 index 21e447749..48cc8969b 100644 --- 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 @@ -128,6 +128,61 @@ public class QcCheckTaskProduce extends BaseEntity { private String typeCode; private String checkType; + @Excel(name = "抽样数量") + private BigDecimal sampleQuality; + + @Excel(name = "不合格数量") + private BigDecimal noOkQuality; + + @Excel(name = "A类不合格数量") + private BigDecimal aNoOkquality; + + @Excel(name = "B类不合格数量") + private BigDecimal bNoOkquality; + + @Excel(name = "C类不合格数量") + private BigDecimal cNoOkquality; + + public BigDecimal getaNoOkquality() { + return aNoOkquality; + } + + public void setaNoOkquality(BigDecimal aNoOkquality) { + this.aNoOkquality = aNoOkquality; + } + + public BigDecimal getbNoOkquality() { + return bNoOkquality; + } + + public void setbNoOkquality(BigDecimal bNoOkquality) { + this.bNoOkquality = bNoOkquality; + } + + public BigDecimal getcNoOkquality() { + return cNoOkquality; + } + + public void setcNoOkquality(BigDecimal cNoOkquality) { + this.cNoOkquality = cNoOkquality; + } + + public BigDecimal getSampleQuality() { + return sampleQuality; + } + + public void setSampleQuality(BigDecimal sampleQuality) { + this.sampleQuality = sampleQuality; + } + + public BigDecimal getNoOkQuality() { + return noOkQuality; + } + + public void setNoOkQuality(BigDecimal noOkQuality) { + this.noOkQuality = noOkQuality; + } + public String getTypeCode() { return typeCode; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckType.java index e6f76a14f..79249d12e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckType.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckType.java @@ -7,7 +7,7 @@ import com.op.common.core.web.domain.BaseEntity; /** * 检验节点维护对象 qc_check_type - * + * * @author Open Platform * @date 2023-10-12 */ @@ -24,7 +24,7 @@ public class QcCheckType extends BaseEntity { /** 名称 */ @Excel(name = "名称") private String checkName; - + private String checkType; /** 类型编码 */ @Excel(name = "类型编码") private String typeCode; @@ -44,6 +44,24 @@ public class QcCheckType extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; + private int taskNum; + + public int getTaskNum() { + return taskNum; + } + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } + + public void setTaskNum(int taskNum) { + this.taskNum = taskNum; + } + public void setId(String id) { this.id = id; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java new file mode 100644 index 000000000..e25463184 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java @@ -0,0 +1,215 @@ +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; + +import java.util.Date; +import java.util.List; + +/** + * 不良类型维护对象 qc_defect_type + * + * @author wws + * @date 2023-10-12 + */ +public class QcDefectType extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String defectId; + + /** 不良类型编码 */ + @Excel(name = "不良类型编码") + private String defectCode; + + /** 不良类型 */ + @Excel(name = "不良类型") + private String defectType; + + /** 不良子类 */ + @Excel(name = "不良子类") + private String defectSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String defectRemark; + + /** 工厂编码 */ + @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; + + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + public void setDefectId(String defectId) { + this.defectId = defectId; + } + + public String getDefectId() { + return defectId; + } + public void setDefectCode(String defectCode) { + this.defectCode = defectCode; + } + + public String getDefectCode() { + return defectCode; + } + public void setDefectType(String defectType) { + this.defectType = defectType; + } + + public String getDefectType() { + return defectType; + } + public void setDefectSubclass(String defectSubclass) { + this.defectSubclass = defectSubclass; + } + + public String getDefectSubclass() { + return defectSubclass; + } + public void setDefectRemark(String defectRemark) { + this.defectRemark = defectRemark; + } + + public String getDefectRemark() { + return defectRemark; + } + 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("defectId", getDefectId()) + .append("defectCode", getDefectCode()) + .append("defectType", getDefectType()) + .append("defectSubclass", getDefectSubclass()) + .append("defectRemark", getDefectRemark()) + .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-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java index 742f7b0b3..5a0fe17cd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java @@ -1,123 +1,296 @@ package com.op.quality.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; +import com.op.system.api.domain.quality.ChartDTO; + +import java.math.BigDecimal; +import java.util.List; /** * 质量系统报对象 qc_static_table - * + * * @author Open Platform * @date 2023-11-08 */ public class QcStaticTable extends BaseEntity { private static final long serialVersionUID = 1L; - /** ID */ - private String id; + private String supplierId; - /** 文件名称 */ - @Excel(name = "文件名称") - private String fileName; + @Excel(name = "供应商编号") + private String supplierCode; - /** 文件地址 */ - @Excel(name = "文件地址") - private String fileAddress; + @Excel(name = "供应商名称") + private String supplierName; - /** 版本号 */ - @Excel(name = "版本号") - private String version; + private List supplierCodes; - /** 备用1 */ - @Excel(name = "备用1") - private String attr1; + private String yearMonth; - /** 备用2 */ - @Excel(name = "备用2") - private String attr2; + private int batchs; + private int okBatchs; + private int noOkBatchs; + private int nums; + private int okNums; + private int noOkNums; + private String typeCode; + private String checkResult; + private String noOkBatchRate; + private String noOkNumRate; + private String ymArrayStart; + private String ymArrayEnd; + private List legendData; + private List xAxis; + private List series; + private String materialCode; + private String materialName; + private String sampleQuality; + private BigDecimal aNoOkquality; + private BigDecimal bNoOkquality; + private BigDecimal cNoOkquality; + private BigDecimal defectRate;//不良率 + private String materailDate; + private String dataType; + private String workCenter; - /** 备用3 */ - @Excel(name = "备用3") - private String attr3; - - /** 备用4 */ - @Excel(name = "备用4") - private String attr4; - - public void setId(String id) { - this.id = id; + public String getWorkCenter() { + return workCenter; } - public String getId() { - return id; - } - public void setFileName(String fileName) { - this.fileName = fileName; + public void setWorkCenter(String workCenter) { + this.workCenter = workCenter; } - public String getFileName() { - return fileName; - } - public void setFileAddress(String fileAddress) { - this.fileAddress = fileAddress; + public String getDataType() { + return dataType; } - public String getFileAddress() { - return fileAddress; - } - public void setVersion(String version) { - this.version = version; + public void setDataType(String dataType) { + this.dataType = dataType; } - public String getVersion() { - return version; - } - public void setAttr1(String attr1) { - this.attr1 = attr1; + public String getMaterailDate() { + return materailDate; } - public String getAttr1() { - return attr1; - } - public void setAttr2(String attr2) { - this.attr2 = attr2; + public void setMaterailDate(String materailDate) { + this.materailDate = materailDate; } - public String getAttr2() { - return attr2; - } - public void setAttr3(String attr3) { - this.attr3 = attr3; + public BigDecimal getDefectRate() { + return defectRate; } - public String getAttr3() { - return attr3; - } - public void setAttr4(String attr4) { - this.attr4 = attr4; + public void setDefectRate(BigDecimal defectRate) { + this.defectRate = defectRate; } - public String getAttr4() { - return attr4; + public String getMaterialCode() { + return materialCode; } - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("fileName", getFileName()) - .append("fileAddress", getFileAddress()) - .append("version", getVersion()) - .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("remark", getRemark()) - .toString(); + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getSampleQuality() { + return sampleQuality; + } + + public void setSampleQuality(String sampleQuality) { + this.sampleQuality = sampleQuality; + } + + public BigDecimal getaNoOkquality() { + return aNoOkquality; + } + + public void setaNoOkquality(BigDecimal aNoOkquality) { + this.aNoOkquality = aNoOkquality; + } + + public BigDecimal getbNoOkquality() { + return bNoOkquality; + } + + public void setbNoOkquality(BigDecimal bNoOkquality) { + this.bNoOkquality = bNoOkquality; + } + + public BigDecimal getcNoOkquality() { + return cNoOkquality; + } + + public void setcNoOkquality(BigDecimal cNoOkquality) { + this.cNoOkquality = cNoOkquality; + } + + public String getYmArrayStart() { + return ymArrayStart; + } + + public void setYmArrayStart(String ymArrayStart) { + this.ymArrayStart = ymArrayStart; + } + + public String getYmArrayEnd() { + return ymArrayEnd; + } + + public void setYmArrayEnd(String ymArrayEnd) { + this.ymArrayEnd = ymArrayEnd; + } + + public List getSeries() { + return series; + } + + public void setSeries(List series) { + this.series = series; + } + + public List getxAxis() { + return xAxis; + } + + public void setxAxis(List xAxis) { + this.xAxis = xAxis; + } + + public List getLegendData() { + return legendData; + } + + public void setLegendData(List legendData) { + this.legendData = legendData; + } + + public String getNoOkNumRate() { + return noOkNumRate; + } + + public void setNoOkNumRate(String noOkNumRate) { + this.noOkNumRate = noOkNumRate; + } + + public String getNoOkBatchRate() { + return noOkBatchRate; + } + + public void setNoOkBatchRate(String noOkBatchRate) { + this.noOkBatchRate = noOkBatchRate; + } + + public int getOkBatchs() { + return okBatchs; + } + + public void setOkBatchs(int okBatchs) { + this.okBatchs = okBatchs; + } + + public int getNoOkBatchs() { + return noOkBatchs; + } + + public void setNoOkBatchs(int noOkBatchs) { + this.noOkBatchs = noOkBatchs; + } + + public int getNums() { + return nums; + } + + public void setNums(int nums) { + this.nums = nums; + } + + public int getOkNums() { + return okNums; + } + + public void setOkNums(int okNums) { + this.okNums = okNums; + } + + public int getNoOkNums() { + return noOkNums; + } + + public void setNoOkNums(int noOkNums) { + this.noOkNums = noOkNums; + } + + public String getCheckResult() { + return checkResult; + } + + public void setCheckResult(String checkResult) { + this.checkResult = checkResult; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getBatchs() { + return batchs; + } + + public void setBatchs(int batchs) { + this.batchs = batchs; + } + + public String getYearMonth() { + return yearMonth; + } + + public void setYearMonth(String yearMonth) { + this.yearMonth = yearMonth; + } + + public List getSupplierCodes() { + return supplierCodes; + } + + public void setSupplierCodes(List supplierCodes) { + this.supplierCodes = supplierCodes; + } + + public String getSupplierId() { + return supplierId; + } + + public void setSupplierId(String supplierId) { + this.supplierId = supplierId; + } + + public String getSupplierCode() { + return supplierCode; + } + + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeMapper.java index a5a45573b..3069165d8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; /** * 检验节点维护Mapper接口 - * + * * @author Open Platform * @date 2023-10-12 */ @@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Mapper; public interface QcCheckTypeMapper { /** * 查询检验节点维护 - * + * * @param id 检验节点维护主键 * @return 检验节点维护 */ @@ -23,7 +23,7 @@ public interface QcCheckTypeMapper { /** * 查询检验节点维护列表 - * + * * @param qcCheckType 检验节点维护 * @return 检验节点维护集合 */ @@ -31,7 +31,7 @@ public interface QcCheckTypeMapper { /** * 新增检验节点维护 - * + * * @param qcCheckType 检验节点维护 * @return 结果 */ @@ -39,7 +39,7 @@ public interface QcCheckTypeMapper { /** * 修改检验节点维护 - * + * * @param qcCheckType 检验节点维护 * @return 结果 */ @@ -47,7 +47,7 @@ public interface QcCheckTypeMapper { /** * 删除检验节点维护 - * + * * @param id 检验节点维护主键 * @return 结果 */ @@ -55,9 +55,11 @@ public interface QcCheckTypeMapper { /** * 批量删除检验节点维护 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteQcCheckTypeByIds(String[] ids); + + List getTopTaskInfo(QcCheckType qcCheckType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java index 21de6735d..09a483496 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java @@ -3,6 +3,7 @@ package com.op.quality.mapper; import java.util.List; import com.op.quality.domain.QcCheckUnqualified; +import com.op.quality.domain.QcDefectType; import org.apache.ibatis.annotations.Mapper; /** @@ -60,4 +61,6 @@ public interface QcCheckUnqualifiedMapper { * @return 结果 */ public int deleteQcCheckUnqualifiedByIds(String[] ids); + + public List getDefectList(QcDefectType qcDefectType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java new file mode 100644 index 000000000..156516a03 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java @@ -0,0 +1,70 @@ +package com.op.quality.mapper; + +import com.op.quality.domain.QcDefectType; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 不良类型维护Mapper接口 + * + * @author wws + * @date 2023-10-12 + */ +@Mapper +public interface QcDefectTypeMapper { + /** + * 查询不良类型维护 + * + * @param faultId 不良类型维护主键 + * @return 不良类型维护 + */ + public QcDefectType selectQcDefectTypeByDefectId(String faultId); + + /** + * 查询不良类型维护列表 + * + * @param qcDefectType 不良类型维护 + * @return 不良类型维护集合 + */ + public List selectQcDefectTypeList(QcDefectType qcDefectType); + + /** + * 新增不良类型维护 + * + * @param qcDefectType 不良类型维护 + * @return 结果 + */ + public int insertQcDefectType(QcDefectType qcDefectType); + + /** + * 修改不良类型维护 + * + * @param qcDefectType 不良类型维护 + * @return 结果 + */ + public int updateQcDefectType(QcDefectType qcDefectType); + + /** + * 删除不良类型维护-逻辑 + * + * @param faultId 不良类型维护主键 + * @return 结果 + */ + public int deleteQcDefectTypeByDefectId(String faultId); + + /** + * 批量删除不良类型维护-逻辑 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcDefectTypeByDefectIds(String[] faultIds); + + /** + * 获取流水号 + * @return + */ + int selectSerialNumber(); + +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java index 29c1483d6..052af7fc6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java @@ -1,9 +1,13 @@ package com.op.quality.mapper; import java.util.List; +import java.util.Map; import com.op.quality.domain.QcStaticTable; +import com.op.system.api.domain.quality.FactoryDto; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 质量系统报Mapper接口 @@ -21,5 +25,18 @@ public interface QcStaticTableMapper { * @return 质量系统报集合 */ public List selectQcStaticTableList(QcStaticTable qcStaticTable); + @MapKey("supplierCode") + public Map selectPcMap(@Param("qc")QcStaticTable qcStaticTable, + @Param("codes")List tabledtos); + @MapKey("supplierCode") + public Map selectNumMap(@Param("qc")QcStaticTable qcStaticTable, + @Param("codes")List tabledtos); + @MapKey("materailDate") + Map getProduceChartData(QcStaticTable qcStaticTable); + List getProduceNames(QcStaticTable qcStaticTable); + @MapKey("materailDate") + Map getProduceChartDataYM(QcStaticTable qcStaticTable); + + List getWorkcenterList(FactoryDto factoryDto); } 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 index 56d51a20b..72cb2094f 100644 --- 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 @@ -2,10 +2,7 @@ package com.op.quality.service; import java.util.List; -import com.op.quality.domain.QcBomComponent; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcCheckTaskIncome; -import com.op.quality.domain.QcSupplier; +import com.op.quality.domain.*; import com.op.system.api.domain.SysUser; /** @@ -78,4 +75,6 @@ public interface IQcCheckTaskIncomeService { int commitActualValue(QcCheckTaskDetail qcCheckTaskDetail); int commitCheckResult(QcCheckTaskIncome qcCheckTaskIncome); + + List getDefectList(QcDefectType qcDefectType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeService.java index 7067bb367..a2588c9e3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeService.java @@ -5,14 +5,14 @@ import com.op.quality.domain.QcCheckType; /** * 检验节点维护Service接口 - * + * * @author Open Platform * @date 2023-10-12 */ public interface IQcCheckTypeService { /** * 查询检验节点维护 - * + * * @param id 检验节点维护主键 * @return 检验节点维护 */ @@ -20,7 +20,7 @@ public interface IQcCheckTypeService { /** * 查询检验节点维护列表 - * + * * @param qcCheckType 检验节点维护 * @return 检验节点维护集合 */ @@ -28,7 +28,7 @@ public interface IQcCheckTypeService { /** * 新增检验节点维护 - * + * * @param qcCheckType 检验节点维护 * @return 结果 */ @@ -36,7 +36,7 @@ public interface IQcCheckTypeService { /** * 修改检验节点维护 - * + * * @param qcCheckType 检验节点维护 * @return 结果 */ @@ -44,7 +44,7 @@ public interface IQcCheckTypeService { /** * 批量删除检验节点维护 - * + * * @param ids 需要删除的检验节点维护主键集合 * @return 结果 */ @@ -52,9 +52,13 @@ public interface IQcCheckTypeService { /** * 删除检验节点维护信息 - * + * * @param id 检验节点维护主键 * @return 结果 */ public int deleteQcCheckTypeById(String id); + + List getCheckType(QcCheckType qcCheckType); + + List getTopTaskInfo(QcCheckType qcCheckType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java new file mode 100644 index 000000000..e1f4f2d28 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java @@ -0,0 +1,62 @@ +package com.op.quality.service; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.quality.domain.QcDefectType; + +import java.util.List; + +/** + * 不良类型维护Service接口 + * + * @author zxl + * @date 2023-10-12 + */ +public interface IQcDefectTypeService { + /** + * 查询不良类型维护 + * + * @param defectId 不良类型维护主键 + * @return 不良类型维护 + */ + public QcDefectType selectQcDefectTypeByDefectId(String defectId); + + /** + * 查询不良类型维护列表 + * + * @param equDefectType 不良类型维护 + * @return 不良类型维护集合 + */ + public List selectQcDefectTypeList(QcDefectType equDefectType); + + /** + * 新增不良类型维护 + * + * @param equDefectType 不良类型维护 + * @return 结果 + */ + public AjaxResult insertQcDefectType(QcDefectType equDefectType); + + /** + * 修改不良类型维护 + * + * @param equDefectType 不良类型维护 + * @return 结果 + */ + public AjaxResult updateQcDefectType(QcDefectType equDefectType); + + /** + * 批量删除不良类型维护 + * + * @param defectIds 需要删除的不良类型维护主键集合 + * @return 结果 + */ + public int deleteQcDefectTypeByDefectIds(String[] defectIds); + + /** + * 删除不良类型维护信息 + * + * @param defectId 不良类型维护主键 + * @return 结果 + */ + public int deleteQcDefectTypeByDefectId(String defectId); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java index 964656039..e722ca1e5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java @@ -1,7 +1,10 @@ package com.op.quality.service; import java.util.List; +import java.util.Map; + import com.op.quality.domain.QcStaticTable; +import com.op.system.api.domain.quality.FactoryDto; /** * 质量系统报Service接口 @@ -19,4 +22,11 @@ public interface IQcStaticTableService { */ public List selectQcStaticTableList(QcStaticTable qcStaticTable); + public Map getProduceChartData(QcStaticTable qcStaticTable); + + public List getProduceNames(QcStaticTable qcStaticTable); + + public Map getProduceChartDataYM(QcStaticTable qcStaticTable); + + List getWorkcenterList(FactoryDto factoryDto); } 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 index 4bff73859..e0cd35b58 100644 --- 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 @@ -279,4 +279,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return n ; } + @Override + @DS("#header.poolName") + public List getDefectList(QcDefectType qcDefectType) { + return qcCheckUnqualifiedMapper.getDefectList(qcDefectType); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java new file mode 100644 index 000000000..8f69798a4 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java @@ -0,0 +1,169 @@ +package com.op.quality.service.impl; + +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.quality.domain.QcDefectType; +import com.op.quality.mapper.QcDefectTypeMapper; +import com.op.quality.service.IQcDefectTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.List; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 不良类型维护Service业务层处理 + * + * @author wws + * @date 2023-10-12 + */ +@Service +public class QcDefectTypeServiceImpl implements IQcDefectTypeService { + @Autowired + private QcDefectTypeMapper qcDefectTypeMapper; + + /** + * 查询不良类型维护 + * + * @param defectId 不良类型维护主键 + * @return 不良类型维护 + */ + @Override + @DS("#header.poolName") + public QcDefectType selectQcDefectTypeByDefectId(String defectId) { + return qcDefectTypeMapper.selectQcDefectTypeByDefectId(defectId); + } + + /** + * 查询不良类型维护列表 + * + * @param qcDefectType 不良类型维护 + * @return 不良类型维护 + */ + @Override + @DS("#header.poolName") + public List selectQcDefectTypeList(QcDefectType qcDefectType) { + if (qcDefectType.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (qcDefectType.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + qcDefectType.setCreateTimeStart(formatter.format(qcDefectType.getCreateTimeArray().get(0))); + qcDefectType.setCreateTimeEnd(formatter.format(qcDefectType.getCreateTimeArray().get(1))); + } + } + if (qcDefectType.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (qcDefectType.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + qcDefectType.setUpdateTimeStart(formatter.format(qcDefectType.getUpdateTimeArray().get(0))); + qcDefectType.setUpdateTimeEnd(formatter.format(qcDefectType.getUpdateTimeArray().get(1))); + } + } + return qcDefectTypeMapper.selectQcDefectTypeList(qcDefectType); + } + + /** + * 新增不良类型维护 + * + * @param qcDefectType 不良类型维护 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertQcDefectType(QcDefectType qcDefectType) { + + // 检验 + QcDefectType checkQuery = new QcDefectType(); + checkQuery.setDefectType(qcDefectType.getDefectType()); + checkQuery.setDefectSubclass(qcDefectType.getDefectSubclass()); + List check = qcDefectTypeMapper.selectQcDefectTypeList(checkQuery); + if (check.size() > 0) { + return error(500,"不良子类已存在！不可添加！"); + } + + //获取当前所选工厂 + 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); + + // 获取检查项流水号 + String serialNum = String.format("%03d", qcDefectTypeMapper.selectSerialNumber()); + + // 处理不良信息 + qcDefectType.setDefectId(IdUtils.fastSimpleUUID()); + qcDefectType.setDefectCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum); + qcDefectType.setFactoryCode(factory); + qcDefectType.setCreateBy(SecurityContextHolder.getUserName()); + qcDefectType.setCreateTime(DateUtils.getNowDate()); + qcDefectType.setUpdateBy(SecurityContextHolder.getUserName()); + qcDefectType.setUpdateTime(DateUtils.getNowDate()); + + // 插入数据库 + qcDefectTypeMapper.insertQcDefectType(qcDefectType); + + return success(); + } + + /** + * 修改不良类型维护 + * + * @param qcDefectType 不良类型维护 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateQcDefectType(QcDefectType qcDefectType) { + + // 检验 + QcDefectType checkQuery = new QcDefectType(); + checkQuery.setDefectType(qcDefectType.getDefectType()); + checkQuery.setDefectSubclass(qcDefectType.getDefectSubclass()); + List check = qcDefectTypeMapper.selectQcDefectTypeList(checkQuery); + if (check.size() > 0) { + if (!check.get(0).equals(qcDefectType.getDefectCode())) { + return error(500,"不良子类已存在！修改失败！"); + } + } + qcDefectType.setUpdateBy(SecurityContextHolder.getUserName()); + qcDefectType.setUpdateTime(DateUtils.getNowDate()); + // 插入数据库 + qcDefectTypeMapper.updateQcDefectType(qcDefectType); + + return success("修改成功"); + } + + /** + * 批量删除不良类型维护 + * + * @param defectIds 需要删除的不良类型维护主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcDefectTypeByDefectIds(String[] defectIds) { + return qcDefectTypeMapper.deleteQcDefectTypeByDefectIds(defectIds); + } + + /** + * 删除不良类型维护信息 + * + * @param defectId 不良类型维护主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcDefectTypeByDefectId(String defectId) { + return qcDefectTypeMapper.deleteQcDefectTypeByDefectId(defectId); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index b9621b4d6..a1f9e4d86 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -1,14 +1,18 @@ package com.op.quality.service.impl; +import java.math.BigDecimal; import java.util.List; +import java.util.Map; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; +import com.op.system.api.domain.quality.FactoryDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.quality.mapper.QcStaticTableMapper; import com.op.quality.domain.QcStaticTable; import com.op.quality.service.IQcStaticTableService; +import org.springframework.util.CollectionUtils; /** * 质量系统报Service业务层处理 @@ -29,8 +33,108 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { */ @Override @DS("#header.poolName") - public List selectQcStaticTableList(QcStaticTable qcStaticTable) { - return qcStaticTableMapper.selectQcStaticTableList(qcStaticTable); + public List selectQcStaticTableList(QcStaticTable qcStaticTable) { + qcStaticTable.setTypeCode("material"); + /**base_supplier**供应商**/ + List tabledtos = qcStaticTableMapper.selectQcStaticTableList(qcStaticTable); + if(CollectionUtils.isEmpty(tabledtos)){ + return null; + } + /**qc_check_task**总批数**/ + Map pcMap = qcStaticTableMapper.selectPcMap(qcStaticTable,tabledtos); + if(pcMap==null){ + return null; + } + /**qc_check_task**不合格批次数**/ + qcStaticTable.setCheckResult("N"); + Map noOkPcMap = qcStaticTableMapper.selectPcMap(qcStaticTable,tabledtos); + /**qc_check_task**不合格数量**/ + qcStaticTable.setCheckResult("N"); + Map noOkNumMap = qcStaticTableMapper.selectNumMap(qcStaticTable,tabledtos); + + for(QcStaticTable tabledto:tabledtos){ + QcStaticTable pcdto = pcMap.get(tabledto.getSupplierCode()); + QcStaticTable numdto = noOkPcMap.get(tabledto.getSupplierCode()); + QcStaticTable noOkNumdto = noOkNumMap.get(tabledto.getSupplierCode()); + if(pcdto!=null){ + //总批次 + tabledto.setBatchs(pcdto.getBatchs()); + //总数量 + tabledto.setNums(pcdto.getNums()); + }else{ + tabledto.setBatchs(0); + tabledto.setNums(0); + } + if(numdto!=null){ + //不合格批次 + tabledto.setNoOkBatchs(numdto.getBatchs()); + }else{ + tabledto.setNoOkBatchs(0); + } + //合格批次 + int okBatchs = tabledto.getBatchs()-tabledto.getNoOkBatchs(); + tabledto.setOkBatchs(okBatchs); + //批次合格率 + if(tabledto.getBatchs() != 0){ + BigDecimal noOkBatchRate = new BigDecimal(tabledto.getNoOkBatchs()).multiply(new BigDecimal("100.00")) + .divide(new BigDecimal(tabledto.getBatchs()),BigDecimal.ROUND_CEILING) + .setScale(2,BigDecimal.ROUND_HALF_UP); + tabledto.setNoOkBatchRate(noOkBatchRate.toString()+"%"); + }else{ + tabledto.setNoOkBatchRate("0.00%"); + } + //不合格数量 + if(noOkNumdto!=null){ + tabledto.setNoOkNums(noOkNumdto.getNoOkNums()); + }else{ + tabledto.setNoOkNums(0); + } + //合格数量 + tabledto.setOkNums(tabledto.getNums()-tabledto.getNoOkNums()); + //数量不良率 + if(tabledto.getNums() != 0){ + BigDecimal noOkNumRate = new BigDecimal(tabledto.getNoOkNums()).multiply(new BigDecimal("100.00")) + .divide(new BigDecimal(tabledto.getNums()),BigDecimal.ROUND_CEILING) + .setScale(2,BigDecimal.ROUND_HALF_UP); + tabledto.setNoOkNumRate(noOkNumRate.toString()+"%"); + }else{ + tabledto.setNoOkNumRate("0.00%"); + } + } + + return tabledtos; } + /** + * 不良率 = (A类*1+B类*0.65+C类*0.35)/抽样总数 + * @param qcStaticTable + * @return + */ + @Override + @DS("#header.poolName") + public Map getProduceChartData(QcStaticTable qcStaticTable) { + Map dtos = qcStaticTableMapper.getProduceChartData(qcStaticTable); + return dtos; + } + + @Override + @DS("#header.poolName") + public List getProduceNames(QcStaticTable qcStaticTable) { + return qcStaticTableMapper.getProduceNames(qcStaticTable); + } + + @Override + @DS("#header.poolName") + public Map getProduceChartDataYM(QcStaticTable qcStaticTable) { + Map dtos = qcStaticTableMapper.getProduceChartDataYM(qcStaticTable); + return dtos; + } + + @Override + @DS("#header.poolName") + public List getWorkcenterList(FactoryDto factoryDto) { + return qcStaticTableMapper.getWorkcenterList(factoryDto); + } + + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeServiceImpl.java index e75c29b20..0c7ff187d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeServiceImpl.java @@ -3,6 +3,7 @@ package com.op.quality.service.serviceImpl; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; @@ -19,7 +20,7 @@ import javax.servlet.http.HttpServletRequest; /** * 检验节点维护Service业务层处理 - * + * * @author Open Platform * @date 2023-10-12 */ @@ -30,7 +31,7 @@ public class QcCheckTypeServiceImpl implements IQcCheckTypeService { /** * 查询检验节点维护 - * + * * @param id 检验节点维护主键 * @return 检验节点维护 */ @@ -42,7 +43,7 @@ public class QcCheckTypeServiceImpl implements IQcCheckTypeService { /** * 查询检验节点维护列表 - * + * * @param qcCheckType 检验节点维护 * @return 检验节点维护 */ @@ -54,7 +55,7 @@ public class QcCheckTypeServiceImpl implements IQcCheckTypeService { /** * 新增检验节点维护 - * + * * @param qcCheckType 检验节点维护 * @return 结果 */ @@ -77,7 +78,7 @@ public class QcCheckTypeServiceImpl implements IQcCheckTypeService { /** * 修改检验节点维护 - * + * * @param qcCheckType 检验节点维护 * @return 结果 */ @@ -91,7 +92,7 @@ public class QcCheckTypeServiceImpl implements IQcCheckTypeService { /** * 批量删除检验节点维护 - * + * * @param ids 需要删除的检验节点维护主键 * @return 结果 */ @@ -103,7 +104,7 @@ public class QcCheckTypeServiceImpl implements IQcCheckTypeService { /** * 删除检验节点维护信息 - * + * * @param id 检验节点维护主键 * @return 结果 */ @@ -112,4 +113,17 @@ public class QcCheckTypeServiceImpl implements IQcCheckTypeService { public int deleteQcCheckTypeById(String id) { return qcCheckTypeMapper.deleteQcCheckTypeById(id); } + + @Override + public List getCheckType(QcCheckType qcCheckType) { + DynamicDataSourceContextHolder.push(qcCheckType.getFactoryCode());// 这是数据源的key + return qcCheckTypeMapper.selectQcCheckTypeList(qcCheckType); + } + + @Override + public List getTopTaskInfo(QcCheckType qcCheckType) { + DynamicDataSourceContextHolder.push(qcCheckType.getFactoryCode());// 这是数据源的key + return qcCheckTypeMapper.getTopTaskInfo(qcCheckType); + } + } 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 index d218245c9..9b3b47838 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml @@ -166,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, factory_code = #{factoryCode}, del_flag = #{delFlag}, + defect_code = #{defectCode}, where record_id = #{recordId} 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 index bb18a8d59..2ec646ded 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 , check_type + create_time, update_by, update_time, factory_code, del_flag , check_type,noOk_quality from qc_check_task @@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status, - qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, + qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality, q.type_code from qc_check_task qct left join qc_check_type q on q.id = qct.check_type @@ -148,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_code, material_name, quality, + noOk_quality, unit, supplier_code, supplier_name, @@ -179,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialCode}, #{materialName}, #{quality}, + #{noOkQuality}, #{unit}, #{supplierCode}, #{supplierName}, @@ -213,6 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_code = #{materialCode}, material_name = #{materialName}, quality = #{quality}, + noOk_quality = #{noOkQuality}, unit = #{unit}, supplier_code = #{supplierCode}, supplier_name = #{supplierName}, 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 index 627e7d626..7ff9ec49a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -41,7 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 , check_type + factory_code, del_flag , check_type,sample_quality,noOk_quality, + aNoOkquality,bNoOkquality,cNoOkquality from qc_check_task @@ -50,7 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit, qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status, - qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, + qct.create_by,qct.create_time, qct.update_by, qct.update_time, + qct.check_type,qct.sample_quality,qct.noOk_quality, + qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality, q.type_code from qc_check_task qct left join qc_check_type q on q.id = qct.check_type @@ -113,6 +118,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_code, material_name, quality, + sample_quality, + noOk_quality, + aNoOkquality, + bNoOkquality, + cNoOkquality, unit, supplier_code, supplier_name, @@ -144,6 +154,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialCode}, #{materialName}, #{quality}, + #{sampleQuality}, + #{noOkQuality}, + #{aNoOkquality}, + #{bNoOkquality}, + #{cNoOkquality}, #{unit}, #{supplierCode}, #{supplierName}, @@ -178,6 +193,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_code = #{materialCode}, material_name = #{materialName}, quality = #{quality}, + sample_quality = #{sampleQuality}, + noOk_quality = #{noOkQuality}, + aNoOkquality = #{aNoOkquality}, + bNoOkquality = #{bNoOkquality}, + cNoOkquality = #{cNoOkquality}, unit = #{unit}, supplier_code = #{supplierCode}, supplier_name = #{supplierName}, diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml index fd1a4aa94..ef7216b69 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,27 +20,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, order_code, check_name, type_code, type_name, attr1, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_type + select id, order_code, check_name, type_code, type_name, attr1, create_by, + create_time, update_by, update_time, factory_code, del_flag from qc_check_type - + - + + + insert into qc_check_type @@ -101,4 +123,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index ff946001e..193c42aaa 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -67,8 +67,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join qc_check_type qtn on qtn.id = qct.check_type where qcu.id = #{id} + - + insert into qc_check_unqualified id, diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml new file mode 100644 index 000000000..9bc55f475 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + select defect_id, defect_code, defect_type, defect_subclass, defect_remark, + factory_code, attr1, attr2, attr3, + del_flag, create_by, create_time, update_by, update_time + from qc_defect_type + + + + + + + + + + insert into qc_defect_type + + defect_id, + defect_code, + defect_type, + defect_subclass, + defect_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{defectId}, + #{defectCode}, + #{defectType}, + #{defectSubclass}, + #{defectRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update qc_defect_type + + defect_code = #{defectCode}, + defect_type = #{defectType}, + defect_subclass = #{defectSubclass}, + defect_remark = #{defectRemark}, + 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 defect_id = #{defectId} and del_flag = '0' + + + + delete qc_defect_type set del_flag = '1' where defect_id = #{defectId} + + + + update qc_defect_type set del_flag = '1' where defect_id in + + #{defectId} + + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 7d51383b8..861aa428b 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -5,8 +5,109 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + SELECT + bs.supplier_id supplierId, + bs.supplier_code supplierCode, + bs.zh_desc supplierName + from base_supplier bs + where bs.del_flag = '0' and bs.active_flag = '1' + + and bs.supplier_code in + + #{supplierCode} + + + + + + + + + - diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index 336a15d77..cb9f6ceae 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -78,23 +78,25 @@ public class SapController extends BaseController { R>> dateSources0 = remoteUserService.getPoolNameList(sysUser); List> dateSources = dateSources0.getData(); dateSources.forEach(dateSource -> { - logger.info("++++++++++++" + dateSource.get("poolName") + "++++product同步开始++++++++++"); - DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key + if(!"ds_999".equals(dateSource.get("poolName"))){ + logger.info("++++++++++++" + dateSource.get("poolName") + "++++product同步开始++++++++++"); + DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - Date maxTime0 = sapBomMapper.getProductMaxTime(); - if(maxTime0 != null){ - Calendar calendar = Calendar.getInstance(); - calendar.setTime(maxTime0); - calendar.add(Calendar.DAY_OF_YEAR, 1); - Date maxTime = calendar.getTime(); - qo.setLaeda(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 - } + Date maxTime0 = sapBomMapper.getProductMaxTime(); + if(maxTime0 != null){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); + qo.setLaeda(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 + } - R r = sapItemSyncService.itemSync(qo); - if(r.getCode()!=200){ - logger.error("++++++++++++" + dateSource.get("poolName")+"同步product失败，错误信息："+ r.getMsg()); + R r = sapItemSyncService.itemSync(qo); + if(r.getCode()!=200){ + logger.error("++++++++++++" + dateSource.get("poolName")+"同步product失败，错误信息："+ r.getMsg()); + } + logger.error("++++++++++++" + dateSource.get("poolName") + "++++product同步结束++++++++++"); } - logger.error("++++++++++++" + dateSource.get("poolName") + "++++product同步结束++++++++++"); }); return R.ok(); } @@ -114,23 +116,25 @@ public class SapController extends BaseController { R>> dateSources0 = remoteUserService.getPoolNameList(sysUser); List> dateSources = dateSources0.getData(); dateSources.forEach(dateSource -> { - logger.info("++++++++++++" + dateSource.get("poolName") + "++++bom同步开始++++++++++"); - DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key + if(!"ds_999".equals(dateSource.get("poolName"))) { + logger.info("++++++++++++" + dateSource.get("poolName") + "++++bom同步开始++++++++++"); + DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - Date maxTime0 = sapBomMapper.getProductMaxTime(); - if(maxTime0 != null){ - Calendar calendar = Calendar.getInstance(); - calendar.setTime(maxTime0); - calendar.add(Calendar.DAY_OF_YEAR, 1); - Date maxTime = calendar.getTime(); - qo.setAedat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 - } + Date maxTime0 = sapBomMapper.getProductMaxTime(); + if (maxTime0 != null) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); + qo.setAedat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 + } - R r = sapBomService.bomSync(qo); - if(r.getCode()!=200){ - logger.error("++++++++++++" + dateSource.get("poolName")+"同步bom失败，错误信息："+ r.getMsg()); + R r = sapBomService.bomSync(qo); + if (r.getCode() != 200) { + logger.error("++++++++++++" + dateSource.get("poolName") + "同步bom失败，错误信息：" + r.getMsg()); + } + logger.error("++++++++++++" + dateSource.get("poolName") + "++++bom同步结束++++++++++"); } - logger.error("++++++++++++" + dateSource.get("poolName") + "++++bom同步结束++++++++++"); }); return R.ok(); @@ -151,27 +155,28 @@ public class SapController extends BaseController { R>> dateSources0 = remoteUserService.getPoolNameList(sysUser); List> dateSources = dateSources0.getData(); dateSources.forEach(dateSource -> { - logger.info("++++++++++++" + dateSource.get("poolName") + "++++工艺同步开始++++++++++"); - DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key + if(!"ds_999".equals(dateSource.get("poolName"))) { + logger.info("++++++++++++" + dateSource.get("poolName") + "++++工艺同步开始++++++++++"); + DynamicDataSourceContextHolder.push(dateSource.get("poolName"));// 这是数据源的key - Date maxTime0 = sapBomMapper.getRouteMaxTime(); - if(maxTime0 != null){ - Calendar calendar = Calendar.getInstance(); - calendar.setTime(maxTime0); - calendar.add(Calendar.DAY_OF_YEAR, 1); - Date maxTime = calendar.getTime(); - qo.setAedat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 - } - qo.setWerks(dateSource.get("poolName").replace("ds_",""));//工厂 + Date maxTime0 = sapBomMapper.getRouteMaxTime(); + if (maxTime0 != null) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(maxTime0); + calendar.add(Calendar.DAY_OF_YEAR, 1); + Date maxTime = calendar.getTime(); + qo.setAedat(DateFormatUtils.format(maxTime, "yyyyMMdd"));//修改日期20230923 + } + qo.setWerks(dateSource.get("poolName").replace("ds_", ""));//工厂 - R r = sapRouterService.sapRouterSync(qo); - if(r.getCode()!=200){ - logger.error("++++++++++++" + dateSource.get("poolName")+"同步工艺失败，错误信息："+ r.getMsg()); + R r = sapRouterService.sapRouterSync(qo); + if (r.getCode() != 200) { + logger.error("++++++++++++" + dateSource.get("poolName") + "同步工艺失败，错误信息：" + r.getMsg()); + } + logger.error("++++++++++++" + dateSource.get("poolName") + "++++工艺同步结束++++++++++"); } - logger.error("++++++++++++" + dateSource.get("poolName") + "++++工艺同步结束++++++++++"); }); return R.ok(); - } /**