diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index 92b4292e2..21018d99d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -8,6 +8,7 @@ import com.op.device.domain.*; import com.op.device.domain.dto.PDADTO; import com.op.device.service.IDevicePDAService; import com.op.device.service.IEquRepairOrderService; +import com.op.device.service.IEquSparepartsInOutService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,6 +30,10 @@ public class DevicePDAController extends BaseController { @Autowired private IEquRepairOrderService equRepairOrderService; + @Autowired + private IEquSparepartsInOutService equSparepartsInOutService; + + /** * 获取今日任务工单list * @@ -198,4 +203,16 @@ public class DevicePDAController extends BaseController { public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) { return devicePDAService.selectEquFaultReasonList(equFaultReason); } + + //备品备件查询接口 + @GetMapping(value = "/querySpareDetailBySpareCode/{spareCode}") + public AjaxResult querySpareDetailBySpareCode(@PathVariable("spareCode") String spareCode) { + return devicePDAService.selectSpareDetailBySpareCode(spareCode); + } + + //备品备件出入库 + @PostMapping("/sparePartsInOutStorage") + public AjaxResult sparePartsInOutStorage(@RequestBody EquSparepartsInOut equSparepartsInOut) { + return equSparepartsInOutService.insertEquSparepartsInOut(equSparepartsInOut); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquSparepartsInOutController.java similarity index 60% rename from op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java rename to op-modules/op-device/src/main/java/com/op/device/controller/EquSparepartsInOutController.java index 6344632ea..67d08d097 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquSparepartsInOutController.java @@ -15,8 +15,8 @@ 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.device.domain.SparePartsInStorage; -import com.op.device.service.ISparePartsInOutStorageService; +import com.op.device.domain.EquSparepartsInOut; +import com.op.device.service.IEquSparepartsInOutService; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.utils.poi.ExcelUtil; @@ -30,18 +30,18 @@ import com.op.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/sparepartsInOutStorage") -public class SparePartsInOutStorageController extends BaseController { +public class EquSparepartsInOutController extends BaseController { @Autowired - private ISparePartsInOutStorageService sparePartsInOutStorageService; + private IEquSparepartsInOutService equSparepartsInOutService; /** * 查询备品备件出入库列表 */ @RequiresPermissions("device:sparepartsInOutStorage:list") @GetMapping("/list") - public TableDataInfo list(SparePartsInStorage sparePartsInStorage) { + public TableDataInfo list(EquSparepartsInOut equSparepartsInOut) { startPage(); - List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); + List list = equSparepartsInOutService.selectEquSparepartsInOutList(equSparepartsInOut); return getDataTable(list); } @@ -51,9 +51,9 @@ public class SparePartsInOutStorageController extends BaseController { @RequiresPermissions("device:sparepartsInOutStorage:export") @Log(title = "备品备件出入库", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, SparePartsInStorage sparePartsInStorage) { - List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); - ExcelUtil util = new ExcelUtil(SparePartsInStorage.class); + public void export(HttpServletResponse response, EquSparepartsInOut equSparepartsInOut) { + List list = equSparepartsInOutService.selectEquSparepartsInOutList(equSparepartsInOut); + ExcelUtil util = new ExcelUtil(EquSparepartsInOut.class); util.exportExcel(response, list, "备品备件出入库数据"); } @@ -61,9 +61,9 @@ public class SparePartsInOutStorageController extends BaseController { * 获取备品备件出入库详细信息 */ @RequiresPermissions("device:sparepartsInOutStorage:query") - @GetMapping(value = "/{rawOrderInSnId}") - public AjaxResult getInfo(@PathVariable("rawOrderInSnId") String rawOrderInSnId) { - return success(sparePartsInOutStorageService.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId)); + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(equSparepartsInOutService.selectEquSparepartsInOutById(id)); } /** @@ -72,8 +72,8 @@ public class SparePartsInOutStorageController extends BaseController { @RequiresPermissions("device:sparepartsInOutStorage:add") @Log(title = "备品备件出入库", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody SparePartsInStorage sparePartsInStorage) { - return toAjax(sparePartsInOutStorageService.insertSparePartsInStorage(sparePartsInStorage)); + public AjaxResult add(@RequestBody EquSparepartsInOut equSparepartsInOut) { + return equSparepartsInOutService.insertEquSparepartsInOut(equSparepartsInOut); } /** @@ -82,8 +82,8 @@ public class SparePartsInOutStorageController extends BaseController { @RequiresPermissions("device:sparepartsInOutStorage:edit") @Log(title = "备品备件出入库", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody SparePartsInStorage sparePartsInStorage) { - return toAjax(sparePartsInOutStorageService.updateSparePartsInStorage(sparePartsInStorage)); + public AjaxResult edit(@RequestBody EquSparepartsInOut equSparepartsInOut) { + return equSparepartsInOutService.updateEquSparepartsInOut(equSparepartsInOut); } /** @@ -91,8 +91,8 @@ public class SparePartsInOutStorageController extends BaseController { */ @RequiresPermissions("device:sparepartsInOutStorage:remove") @Log(title = "备品备件出入库", businessType = BusinessType.DELETE) - @DeleteMapping("/{rawOrderInSnIds}") - public AjaxResult remove(@PathVariable String[] rawOrderInSnIds) { - return toAjax(sparePartsInOutStorageService.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds)); + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return equSparepartsInOutService.deleteEquSparepartsInOutByIds(ids); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java index f183ea581..d2f316b75 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java @@ -80,7 +80,11 @@ public class SparePartsLedgerController extends BaseController { @Log(title = "备品备件台账管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SparePartsLedger sparePartsLedger) { - return toAjax(sparePartsLedgerService.insertSparePartsLedger(sparePartsLedger)); + if (sparePartsLedgerService.checkSpareCodeUnique(sparePartsLedger)) { + return AjaxResult.error("备品备件编码已存在！"); + } else { + return toAjax(sparePartsLedgerService.insertSparePartsLedger(sparePartsLedger)); + } } /** 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 f25eba5a7..eaa4faa17 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 @@ -126,6 +126,12 @@ public class EquOrder extends BaseEntity { @Excel(name = "责任人") private String planPerson; + /** + * 责任人姓名 + */ + @Excel(name = "责任人姓名") + private String planPersonName; + /** * 工单用时 */ @@ -678,6 +684,14 @@ public class EquOrder extends BaseEntity { return planPerson; } + public void setPlanPersonName(String planPersonName) { + this.planPersonName = planPersonName; + } + + public String getPlanPersonName() { + return planPersonName; + } + public void setOrderCostTime(String orderCostTime) { this.orderCostTime = orderCostTime; } @@ -796,6 +810,7 @@ public class EquOrder extends BaseEntity { .append("orderStatus", getOrderStatus()) .append("orderCost", getOrderCost()) .append("planPerson", getPlanPerson()) + .append("planPersonName", getPlanPersonName()) .append("orderCostTime", getOrderCostTime()) .append("orderSignPerson", getOrderSignPerson()) .append("factoryCode", getFactoryCode()) 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 79add390a..0bddf9777 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 @@ -46,9 +46,12 @@ public class EquRepairWorkOrder extends BaseEntity { @Excel(name = "关联计划") private String orderRelevance; - @Excel(name = "维修人员") + @Excel(name = "维修人员工号") private String workPerson; + @Excel(name = "维修人员姓名") + private String workPersonName; + @Excel(name = "维修组") private String workTeam; @@ -392,6 +395,13 @@ public class EquRepairWorkOrder extends BaseEntity { return workPerson; } + public void setWorkPersonName(String workPersonName) { + this.workPersonName = workPersonName; + } + public String getWorkPersonName() { + return workPersonName; + } + public void setWorkTeam(String workTeam) { this.workTeam = workTeam; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java new file mode 100644 index 000000000..8675329a7 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java @@ -0,0 +1,168 @@ +package com.op.device.domain; + +import java.math.BigDecimal; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 备品备件出入库对象 + * + * @author Open Platform + * @date 2023-10-17 + */ +public class EquSparepartsInOut extends BaseEntity { + private static final long serialVersionUID = 1L; + + private String id; + + @Excel(name = "出入库类型") + private String inOutType; + + @Excel(name = "出入库单号") + private String orderNo; + + @Excel(name = "备品备件号") + private String spareCode; + + @Excel(name = "备品备件名称") + private String spareName; + + @Excel(name = "数量") + private BigDecimal amount; + + @Excel(name = "备用1") + private String attr1; + + @Excel(name = "备用2") + private String attr2; + + @Excel(name = "备用3") + private String attr3; + + @Excel(name = "删除标记") + private String delFlag; + + @Excel(name = "工厂号") + private String factoryCode; + + /////////////////////////// + private String storageId; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setInOutType(String inOutType) { + this.inOutType = inOutType; + } + + public String getInOutType() { + return inOutType; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getOrderNo() { + return orderNo; + } + + public void setSpareCode(String spareCode) { + this.spareCode = spareCode; + } + + public String getSpareCode() { + return spareCode; + } + + public void setSpareName(String spareName) { + this.spareName = spareName; + } + + public String getSpareName() { + return spareName; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getAmount() { + return amount; + } + + 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 setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + ///// + public void setStorageId(String storageId) { + this.storageId = storageId; + } + public String getStorageId() { + return storageId; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("inOutType", getInOutType()) + .append("orderNo", getOrderNo()) + .append("spareCode", getSpareCode()) + .append("spareName", getSpareName()) + .append("amount", getAmount()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("factoryCode", getFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java deleted file mode 100644 index b19e4874a..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java +++ /dev/null @@ -1,433 +0,0 @@ -package com.op.device.domain; - -import java.math.BigDecimal; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; - -/** - * 备品备件出入库对象 wms_raw_order_in_sn - * - * @author Open Platform - * @date 2023-10-17 - */ -public class SparePartsInStorage extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 唯一序列号 - */ - private String rawOrderInSnId; - - /** - * 仓库编码 - */ - @Excel(name = "仓库编码") - private String whCode; - - /** - * 库区编码 - */ - @Excel(name = "库区编码") - private String waCode; - - /** - * 库位编码 - */ - @Excel(name = "库位编码") - private String wlCode; - - /** - * 入库单号 - */ - @Excel(name = "入库单号") - private String orderNo; - - /** - * 采购订单号 - */ - @Excel(name = "采购订单号") - private String poNo; - - /** - * 采购订单行项目 - */ - @Excel(name = "采购订单行项目") - private String poLine; - - /** - * 物料号 - */ - @Excel(name = "物料号") - private String materialCode; - - /** - * 物料描述 - */ - @Excel(name = "物料描述") - private String materialDesc; - - /** - * sn/LPN - */ - @Excel(name = "sn/LPN") - private String sn; - - /** - * 数量 - */ - @Excel(name = "数量") - private BigDecimal amount; - - /** - * 备用1 - */ - @Excel(name = "备用1") - private String userDefined1; - - /** - * 备用2 - */ - @Excel(name = "备用2") - private String userDefined2; - - /** - * 备用3 - */ - @Excel(name = "备用3") - private String userDefined3; - - /** - * 备用4 - */ - @Excel(name = "备用4") - private String userDefined4; - - /** - * 备用5 - */ - @Excel(name = "备用5") - private String userDefined5; - - /** - * 备用6 - */ - @Excel(name = "备用6") - private String userDefined6; - - /** - * 备用7 - */ - @Excel(name = "备用7") - private String userDefined7; - - /** - * 备用8 - */ - @Excel(name = "备用8") - private String userDefined8; - - /** - * 备用9 - */ - @Excel(name = "备用9") - private String userDefined9; - - /** - * 备用10 - */ - @Excel(name = "备用10") - private String userDefined10; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date gmtCreate; - - /** - * 最后更新人 - */ - @Excel(name = "最后更新人") - private String lastModifiedBy; - - /** - * 最后更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date gmtModified; - - /** - * 有效标记 - */ - @Excel(name = "有效标记") - private String activeFlag; - - /** - * $column.columnComment - */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String factoryCode; - - /** - * $column.columnComment - */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String sapFactoryCode; - - public void setRawOrderInSnId(String rawOrderInSnId) { - this.rawOrderInSnId = rawOrderInSnId; - } - - public String getRawOrderInSnId() { - return rawOrderInSnId; - } - - public void setWhCode(String whCode) { - this.whCode = whCode; - } - - public String getWhCode() { - return whCode; - } - - public void setWaCode(String waCode) { - this.waCode = waCode; - } - - public String getWaCode() { - return waCode; - } - - public void setWlCode(String wlCode) { - this.wlCode = wlCode; - } - - public String getWlCode() { - return wlCode; - } - - public void setOrderNo(String orderNo) { - this.orderNo = orderNo; - } - - public String getOrderNo() { - return orderNo; - } - - public void setPoNo(String poNo) { - this.poNo = poNo; - } - - public String getPoNo() { - return poNo; - } - - public void setPoLine(String poLine) { - this.poLine = poLine; - } - - public String getPoLine() { - return poLine; - } - - 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 void setSn(String sn) { - this.sn = sn; - } - - public String getSn() { - return sn; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setUserDefined1(String userDefined1) { - this.userDefined1 = userDefined1; - } - - public String getUserDefined1() { - return userDefined1; - } - - public void setUserDefined2(String userDefined2) { - this.userDefined2 = userDefined2; - } - - public String getUserDefined2() { - return userDefined2; - } - - public void setUserDefined3(String userDefined3) { - this.userDefined3 = userDefined3; - } - - public String getUserDefined3() { - return userDefined3; - } - - public void setUserDefined4(String userDefined4) { - this.userDefined4 = userDefined4; - } - - public String getUserDefined4() { - return userDefined4; - } - - public void setUserDefined5(String userDefined5) { - this.userDefined5 = userDefined5; - } - - public String getUserDefined5() { - return userDefined5; - } - - public void setUserDefined6(String userDefined6) { - this.userDefined6 = userDefined6; - } - - public String getUserDefined6() { - return userDefined6; - } - - public void setUserDefined7(String userDefined7) { - this.userDefined7 = userDefined7; - } - - public String getUserDefined7() { - return userDefined7; - } - - public void setUserDefined8(String userDefined8) { - this.userDefined8 = userDefined8; - } - - public String getUserDefined8() { - return userDefined8; - } - - public void setUserDefined9(String userDefined9) { - this.userDefined9 = userDefined9; - } - - public String getUserDefined9() { - return userDefined9; - } - - public void setUserDefined10(String userDefined10) { - this.userDefined10 = userDefined10; - } - - public String getUserDefined10() { - return userDefined10; - } - - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public Date getGmtCreate() { - return gmtCreate; - } - - public void setLastModifiedBy(String lastModifiedBy) { - this.lastModifiedBy = lastModifiedBy; - } - - public String getLastModifiedBy() { - return lastModifiedBy; - } - - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - public Date getGmtModified() { - return gmtModified; - } - - public void setActiveFlag(String activeFlag) { - this.activeFlag = activeFlag; - } - - public String getActiveFlag() { - return activeFlag; - } - - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getFactoryCode() { - return factoryCode; - } - - public void setSapFactoryCode(String sapFactoryCode) { - this.sapFactoryCode = sapFactoryCode; - } - - public String getSapFactoryCode() { - return sapFactoryCode; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("rawOrderInSnId", getRawOrderInSnId()) - .append("whCode", getWhCode()) - .append("waCode", getWaCode()) - .append("wlCode", getWlCode()) - .append("orderNo", getOrderNo()) - .append("poNo", getPoNo()) - .append("poLine", getPoLine()) - .append("materialCode", getMaterialCode()) - .append("materialDesc", getMaterialDesc()) - .append("sn", getSn()) - .append("amount", getAmount()) - .append("userDefined1", getUserDefined1()) - .append("userDefined2", getUserDefined2()) - .append("userDefined3", getUserDefined3()) - .append("userDefined4", getUserDefined4()) - .append("userDefined5", getUserDefined5()) - .append("userDefined6", getUserDefined6()) - .append("userDefined7", getUserDefined7()) - .append("userDefined8", getUserDefined8()) - .append("userDefined9", getUserDefined9()) - .append("userDefined10", getUserDefined10()) - .append("createBy", getCreateBy()) - .append("gmtCreate", getGmtCreate()) - .append("lastModifiedBy", getLastModifiedBy()) - .append("gmtModified", getGmtModified()) - .append("activeFlag", getActiveFlag()) - .append("factoryCode", getFactoryCode()) - .append("sapFactoryCode", getSapFactoryCode()) - .toString(); - } -} 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 ee1d6463c..0d4f0a611 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 @@ -1,5 +1,9 @@ package com.op.device.domain.dto; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + // 手持传参dto public class PDADTO { // 用户名 @@ -10,6 +14,9 @@ public class PDADTO { private String shutDown; +// @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; + public String getOrderCode() { return orderCode; } @@ -41,4 +48,12 @@ public class PDADTO { public void setPlanType(String planType) { this.planType = planType; } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquSparepartsInOutMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquSparepartsInOutMapper.java new file mode 100644 index 000000000..429790ed8 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquSparepartsInOutMapper.java @@ -0,0 +1,63 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquSparepartsInOut; + +/** + * 备品备件出入库Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface EquSparepartsInOutMapper { + /** + * 查询备品备件出入库 + * + * @param id 备品备件出入库主键 + * @return 备品备件出入库 + */ + public EquSparepartsInOut selectEquSparepartsInOutById(String id); + + /** + * 查询备品备件出入库列表 + * + * @param equSparepartsInOut 备品备件出入库 + * @return 备品备件出入库集合 + */ + public List selectEquSparepartsInOutList(EquSparepartsInOut equSparepartsInOut); + + /** + * 新增备品备件出入库 + * + * @param equSparepartsInOut 备品备件出入库 + * @return 结果 + */ + public int insertEquSparepartsInOut(EquSparepartsInOut equSparepartsInOut); + + /** + * 修改备品备件出入库 + * + * @param equSparepartsInOut 备品备件出入库 + * @return 结果 + */ + public int updateEquSparepartsInOut(EquSparepartsInOut equSparepartsInOut); + + /** + * 删除备品备件出入库 + * + * @param id 备品备件出入库主键 + * @return 结果 + */ + public int deleteEquSparepartsInOutById(String id); + + /** + * 批量删除备品备件出入库 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquSparepartsInOutByIds(String[] ids); + + int selectSerialNumber(); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java deleted file mode 100644 index 153196d1b..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.op.device.mapper; - -import java.util.List; - -import com.op.device.domain.SparePartsInStorage; - -/** - * 备品备件出入库Mapper接口 - * - * @author Open Platform - * @date 2023-10-17 - */ -public interface SparePartsInOutStorageMapper { - /** - * 查询备品备件出入库 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 备品备件出入库 - */ - public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); - - /** - * 查询备品备件出入库列表 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 备品备件出入库集合 - */ - public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage); - - /** - * 新增备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage); - - /** - * 修改备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage); - - /** - * 删除备品备件出入库 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 结果 - */ - public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); - - /** - * 批量删除备品备件出入库 - * - * @param rawOrderInSnIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); -} 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 1a30e10b4..a2041f379 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 @@ -87,4 +87,9 @@ public interface SparePartsLedgerMapper { void updateAmount(SparePartsLedger sparePartsLedger); SparePartsLedger selectExistByMaterialCode(String materialCode); + + SparePartsLedger selectSpareDetailBySpareCode(String materialCode); + + //检查spareCode + String checkSpareCodeUnique(SparePartsLedger sparePartsLedger); } 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 70054be92..ab3c75599 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 @@ -138,4 +138,6 @@ public interface IDevicePDAService { * 故障维修措施 */ AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason); + + AjaxResult selectSpareDetailBySpareCode(String spareCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquSparepartsInOutService.java similarity index 50% rename from op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java rename to op-modules/op-device/src/main/java/com/op/device/service/IEquSparepartsInOutService.java index 8f9cc78f7..08fcaa81c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquSparepartsInOutService.java @@ -2,7 +2,8 @@ package com.op.device.service; import java.util.List; -import com.op.device.domain.SparePartsInStorage; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquSparepartsInOut; /** * 备品备件出入库Service接口 @@ -10,14 +11,14 @@ import com.op.device.domain.SparePartsInStorage; * @author Open Platform * @date 2023-10-17 */ -public interface ISparePartsInOutStorageService { +public interface IEquSparepartsInOutService { /** * 查询备品备件出入库 * - * @param rawOrderInSnId 备品备件出入库主键 + * @param Id 备品备件出入库主键 * @return 备品备件出入库 */ - public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); + public EquSparepartsInOut selectEquSparepartsInOutById(String Id); /** * 查询备品备件出入库列表 @@ -25,7 +26,7 @@ public interface ISparePartsInOutStorageService { * @param sparePartsInStorage 备品备件出入库 * @return 备品备件出入库集合 */ - public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage); + public List selectEquSparepartsInOutList(EquSparepartsInOut sparePartsInStorage); /** * 新增备品备件出入库 @@ -33,7 +34,7 @@ public interface ISparePartsInOutStorageService { * @param sparePartsInStorage 备品备件出入库 * @return 结果 */ - public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + public AjaxResult insertEquSparepartsInOut(EquSparepartsInOut sparePartsInStorage); /** * 修改备品备件出入库 @@ -41,21 +42,21 @@ public interface ISparePartsInOutStorageService { * @param sparePartsInStorage 备品备件出入库 * @return 结果 */ - public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + public AjaxResult updateEquSparepartsInOut(EquSparepartsInOut sparePartsInStorage); /** * 批量删除备品备件出入库 * - * @param rawOrderInSnIds 需要删除的备品备件出入库主键集合 + * @param ids 需要删除的备品备件出入库主键集合 * @return 结果 */ - public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); + public AjaxResult deleteEquSparepartsInOutByIds(String[] ids); /** * 删除备品备件出入库信息 * - * @param rawOrderInSnId 备品备件出入库主键 + * @param id 备品备件出入库主键 * @return 结果 */ - public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); + public AjaxResult deleteEquSparepartsInOutById(String id); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java index 5917fc55e..7186a9531 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java @@ -61,4 +61,7 @@ public interface ISparePartsLedgerService { public int deleteSparePartsLedgerByStorageId(String storageId); AjaxResult importFile(List orderList); + + //判断备品备件编码唯一性 + boolean checkSpareCodeUnique(SparePartsLedger sparePartsLedger); } 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 308138089..5ca46a7ce 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 @@ -111,48 +111,48 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult getTodayTask(PDADTO pdadto) { List orderList = equOrderMapper.selectTodayTask(pdadto); - List handleList = new ArrayList<>(); - long nowTime = DateUtils.getNowDate().getTime(); - long dayMs = 86400000l; - long hourMs = 1000 * 60 * 60; - if (orderList != null) { - for (EquOrder order : orderList) { - long diff = nowTime - order.getCreateTime().getTime(); - switch (order.getPlanLoopType()) { - case "hour": - if (diff < 1000 * 60 * 60 * Long.valueOf(order.getPlanLoop())) { - handleList.add(order); - } - break; - case "day": - if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - case "week": - if (diff < (dayMs * 7 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - case "month": - if (diff < (dayMs * 30 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - case "season": - if (diff < (dayMs * 30 * 3 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - case "year": - if (diff < (dayMs * 365 * Long.valueOf(order.getPlanLoop()))) { - handleList.add(order); - } - break; - } - } - } - return success(handleList); +// List handleList = new ArrayList<>(); +// long nowTime = DateUtils.getNowDate().getTime(); +// long dayMs = 86400000l; +// long hourMs = 1000 * 60 * 60; +// if (orderList != null) { +// for (EquOrder order : orderList) { +// long diff = nowTime - order.getCreateTime().getTime(); +// switch (order.getPlanLoopType()) { +// case "hour": +// if (diff < 1000 * 60 * 60 * Long.valueOf(order.getPlanLoop())) { +// handleList.add(order); +// } +// break; +// case "day": +// if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// case "week": +// if (diff < (dayMs * 7 * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// case "month": +// if (diff < (dayMs * 30 * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// case "season": +// if (diff < (dayMs * 30 * 3 * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// case "year": +// if (diff < (dayMs * 365 * Long.valueOf(order.getPlanLoop()))) { +// handleList.add(order); +// } +// break; +// } +// } +// } + return success(orderList); } /** @@ -1211,4 +1211,17 @@ public class DevicePDAServiceImpl implements IDevicePDAService { List list = equFaultReasonMapper.selectEquFaultReasonList(equFaultReason); return success(list); } + + /** + * 查询备品备件 + * + * @param + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult selectSpareDetailBySpareCode(String spareCode) { + SparePartsLedger list = sparePartsLedgerMapper.selectSpareDetailBySpareCode(spareCode); + return success(list); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSparepartsInOutImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSparepartsInOutImpl.java new file mode 100644 index 000000000..f711095d8 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSparepartsInOutImpl.java @@ -0,0 +1,212 @@ +package com.op.device.service.impl; + +import java.math.BigDecimal; +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.SparePartsLedger; +import com.op.device.mapper.SparePartsLedgerMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquSparepartsInOutMapper; +import com.op.device.domain.EquSparepartsInOut; +import com.op.device.service.IEquSparepartsInOutService; + +/** + * 备品备件出入库Service业务层处理 + * + * @author Open Platform + * @date 2023-10-17 + */ +@Service +public class EquSparepartsInOutImpl implements IEquSparepartsInOutService { + @Autowired + private EquSparepartsInOutMapper equSparepartsInOutMapper; + + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; + + + /** + * 查询备品备件出入库 + * + * @param id 备品备件出入库主键 + * @return 备品备件出入库 + */ + @Override + @DS("#header.poolName") + public EquSparepartsInOut selectEquSparepartsInOutById(String id) { + return equSparepartsInOutMapper.selectEquSparepartsInOutById(id); + } + + /** + * 查询备品备件出入库列表 + * + * @param equSparepartsInOut 备品备件出入库 + * @return 备品备件出入库 + */ + @Override + @DS("#header.poolName") + public List selectEquSparepartsInOutList(EquSparepartsInOut equSparepartsInOut) { + return equSparepartsInOutMapper.selectEquSparepartsInOutList(equSparepartsInOut); + } + + /** + * 新增备品备件出入库 + * + * @param equSparepartsInOut 备品备件出入库 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquSparepartsInOut(EquSparepartsInOut equSparepartsInOut) { + equSparepartsInOut.setId(IdUtils.fastSimpleUUID()); + equSparepartsInOut.setCreateTime(DateUtils.getNowDate()); + equSparepartsInOut.setCreateBy(SecurityUtils.getUsername()); + + SparePartsLedger sparePartsLedger = sparePartsLedgerMapper.selectSparePartsLedgerByStorageId(equSparepartsInOut.getStorageId()); + if(sparePartsLedger != null){ + if(equSparepartsInOut.getInOutType().equals("type_in")){//入库 + if(sparePartsLedger.getAmount() != null){ + BigDecimal result = sparePartsLedger.getAmount().add(equSparepartsInOut.getAmount()); + //修改 + sparePartsLedger.setAmount(result); + sparePartsLedger.setLastModifiedBy(SecurityUtils.getUsername());//最后更新人 + sparePartsLedger.setGmtModified(DateUtils.getNowDate());//最后更新时间 + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + }else{//出库 + if(sparePartsLedger.getAmount() != null){ + if(sparePartsLedger.getAmount().compareTo(equSparepartsInOut.getAmount()) <= 0){ + return AjaxResult.error("出库数量大于库存数量！"); + }else{ + BigDecimal result = sparePartsLedger.getAmount().subtract(equSparepartsInOut.getAmount()); + //修改 + sparePartsLedger.setAmount(result); + sparePartsLedger.setLastModifiedBy(SecurityUtils.getUsername());//最后更新人 + sparePartsLedger.setGmtModified(DateUtils.getNowDate());//最后更新时间 + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + } + } + }else{ + return AjaxResult.error("不存在此备品备件"); + } + + // 获取流水号 + String date = DateUtils.dateTimeNow(DateUtils.YYYYMMDD); + String serialNum = String.format("%04d", equSparepartsInOutMapper.selectSerialNumber()); + equSparepartsInOut.setOrderNo(date + serialNum); + equSparepartsInOutMapper.insertEquSparepartsInOut(equSparepartsInOut); + return AjaxResult.success("新增成功！"); + } + + /** + * 修改备品备件出入库 + * + * @param equSparepartsInOut 备品备件出入库 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateEquSparepartsInOut(EquSparepartsInOut equSparepartsInOut) { + equSparepartsInOut.setUpdateTime(DateUtils.getNowDate()); + equSparepartsInOut.setUpdateBy(SecurityUtils.getUsername()); + equSparepartsInOutMapper.updateEquSparepartsInOut(equSparepartsInOut); + return AjaxResult.success("修改成功"); + } + + /** + * 批量删除备品备件出入库 + * + * @param ids 需要删除的备品备件出入库主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult deleteEquSparepartsInOutByIds(String[] ids) { + //查询原本的类型和数量 加回去 + for(String id:ids){ + EquSparepartsInOut equSparepartsInOut = equSparepartsInOutMapper.selectEquSparepartsInOutById(id); + + SparePartsLedger sparePartsLedger = sparePartsLedgerMapper.selectSparePartsLedgerByStorageId(equSparepartsInOut.getStorageId()); + if(sparePartsLedger != null){ + if(equSparepartsInOut.getInOutType().equals("type_in")){//入库 + if(sparePartsLedger.getAmount() != null){ + if(sparePartsLedger.getAmount().compareTo(equSparepartsInOut.getAmount()) <= 0){ + return AjaxResult.error("备品备件台账的备品备件数量小于当时的入库数量！"); + }else{ + BigDecimal result = sparePartsLedger.getAmount().subtract(equSparepartsInOut.getAmount()); + //修改 + sparePartsLedger.setAmount(result); + sparePartsLedger.setLastModifiedBy(SecurityUtils.getUsername());//最后更新人 + sparePartsLedger.setGmtModified(DateUtils.getNowDate());//最后更新时间 + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + } + }else{//出库 + if(sparePartsLedger.getAmount() != null){ + BigDecimal result = sparePartsLedger.getAmount().add(equSparepartsInOut.getAmount()); + //修改 + sparePartsLedger.setAmount(result); + sparePartsLedger.setLastModifiedBy(SecurityUtils.getUsername());//最后更新人 + sparePartsLedger.setGmtModified(DateUtils.getNowDate());//最后更新时间 + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + } + }else{ + return AjaxResult.error("不存在此备品备件"); + } + } + equSparepartsInOutMapper.deleteEquSparepartsInOutByIds(ids); + return AjaxResult.success("删除成功"); + } + + /** + * 删除备品备件出入库信息 + * + * @param id 备品备件出入库主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult deleteEquSparepartsInOutById(String id) { + EquSparepartsInOut equSparepartsInOut = equSparepartsInOutMapper.selectEquSparepartsInOutById(id); + + SparePartsLedger sparePartsLedger = sparePartsLedgerMapper.selectSparePartsLedgerByStorageId(equSparepartsInOut.getStorageId()); + if(sparePartsLedger != null){ + if(equSparepartsInOut.getInOutType().equals("type_in")){//入库 + if(sparePartsLedger.getAmount() != null){ + if(sparePartsLedger.getAmount().compareTo(equSparepartsInOut.getAmount()) <= 0){ + return AjaxResult.error("备品备件台账的备品备件数量小于当时的入库数量！"); + }else{ + BigDecimal result = sparePartsLedger.getAmount().subtract(equSparepartsInOut.getAmount()); + //修改 + sparePartsLedger.setAmount(result); + sparePartsLedger.setLastModifiedBy(SecurityUtils.getUsername());//最后更新人 + sparePartsLedger.setGmtModified(DateUtils.getNowDate());//最后更新时间 + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + } + }else{//出库 + if(sparePartsLedger.getAmount() != null){ + BigDecimal result = sparePartsLedger.getAmount().add(equSparepartsInOut.getAmount()); + //修改 + sparePartsLedger.setAmount(result); + sparePartsLedger.setLastModifiedBy(SecurityUtils.getUsername());//最后更新人 + sparePartsLedger.setGmtModified(DateUtils.getNowDate());//最后更新时间 + sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + } + }else{ + return AjaxResult.error("不存在此备品备件"); + } + + equSparepartsInOutMapper.deleteEquSparepartsInOutById(id); + return AjaxResult.success("删除成功"); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java deleted file mode 100644 index 08ceb2a03..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.op.device.service.impl; - -import java.util.List; - -import com.baomidou.dynamic.datasource.annotation.DS; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.op.device.mapper.SparePartsInOutStorageMapper; -import com.op.device.domain.SparePartsInStorage; -import com.op.device.service.ISparePartsInOutStorageService; - -/** - * 备品备件出入库Service业务层处理 - * - * @author Open Platform - * @date 2023-10-17 - */ -@Service -public class SparePartsInOutStorageServiceImpl implements ISparePartsInOutStorageService { - @Autowired - private SparePartsInOutStorageMapper sparePartsInOutStorageMapper; - - /** - * 查询备品备件出入库 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 备品备件出入库 - */ - @Override - @DS("#header.poolName") - public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) { - return sparePartsInOutStorageMapper.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId); - } - - /** - * 查询备品备件出入库列表 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 备品备件出入库 - */ - @Override - @DS("#header.poolName") - public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage) { - return sparePartsInOutStorageMapper.selectSparePartsInStorageList(sparePartsInStorage); - } - - /** - * 新增备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage) { - - return sparePartsInOutStorageMapper.insertSparePartsInStorage(sparePartsInStorage); - } - - /** - * 修改备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage) { - return sparePartsInOutStorageMapper.updateSparePartsInStorage(sparePartsInStorage); - } - - /** - * 批量删除备品备件出入库 - * - * @param rawOrderInSnIds 需要删除的备品备件出入库主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds) { - return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds); - } - - /** - * 删除备品备件出入库信息 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) { - return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnId(rawOrderInSnId); - } -} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java index 5f6a91156..403fab220 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java @@ -167,6 +167,9 @@ public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService { if (table.getMaterialCode().isEmpty() || table.getMaterialCode() == null) { return error(500, "备品备件编码不能为空！信息导入失败！"); } + if (this.checkSpareCodeUnique(table)) { + return AjaxResult.error("存在重复的备品备件编码"+table.getMaterialCode()+"!信息导入失败！"); + } // 备品备件名称 if (table.getMaterialDesc().isEmpty() || table.getMaterialDesc() == null) { return error(500, "备品备件名称不能为空！信息导入失败！"); @@ -245,4 +248,20 @@ public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService { } return failSpareParts; } + + /** + * 判断备品备件信息 + * + * @return 结果 + */ + @Override + @DS("#header.poolName") + public boolean checkSpareCodeUnique(SparePartsLedger sparePartsLedger) { + String spareCode = sparePartsLedgerMapper.checkSpareCodeUnique(sparePartsLedger); + if (spareCode == null) { + return false; + } else { + return true; + } + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index eeb2c007e..c0b2de830 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -22,6 +22,7 @@ + @@ -54,7 +55,7 @@ select order_id, plan_id, plan_code, plan_type, order_code, plan_workshop, plan_prod_line, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status, - order_cost, plan_person, order_cost_time, order_sign_person, + order_cost, plan_person, plan_person_name, order_cost_time, order_sign_person, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect,repair_code,work_code,outsource_code from equ_order @@ -79,6 +80,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -120,6 +122,7 @@ and eo.order_status = #{orderStatus} and eo.order_cost = #{orderCost} and eo.plan_person like concat('%', #{planPerson}, '%') + and eo.plan_person_name like concat('%', #{planPersonName}, '%') and eo.order_cost_time = #{orderCostTime} and eo.order_sign_person = #{orderSignPerson} and eo.factory_code = #{factoryCode} @@ -198,6 +201,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -219,14 +223,18 @@ be.equipment_name from equ_order eo left join base_equipment be on eo.equipment_code = be.equipment_code - where eo.plan_type = #{planType} - and eo.del_flag = '0' - and eo.order_status != '1' - and eo.order_code in (select order_code + + CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) + CONVERT(date,eo.create_time) = #{createTime} + and eo.plan_type = #{planType} + and eo.del_flag = '0' + and eo.order_status != '1' + and eo.order_code in (select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code) + order by eo.plan_loop_type, eo.plan_loop, eo.create_time desc, eo.equipment_code @@ -248,6 +256,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -269,14 +278,18 @@ be.equipment_name from equ_order eo left join base_equipment be on eo.equipment_code = be.equipment_code - where eo.del_flag = '0' - and eo.order_status = '1' - and eo.plan_type = #{planType} - and eo.plan_person = #{userId} - and eo.order_code in (select order_code + + CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) + and CONVERT(date,eo.create_time) = #{createTime} + and eo.del_flag = '0' + and eo.order_status = '1' + and eo.plan_type = #{planType} + and eo.plan_person = #{userId} + and eo.order_code in (select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code) + order by eo.update_time desc @@ -304,6 +317,7 @@ order_status, order_cost, plan_person, + plan_person_name, order_cost_time, order_sign_person, factory_code, @@ -343,6 +357,7 @@ #{orderStatus}, #{orderCost}, #{planPerson}, + #{planPersonName}, #{orderCostTime}, #{orderSignPerson}, #{factoryCode}, @@ -384,6 +399,7 @@ order_status = #{orderStatus}, order_cost = #{orderCost}, plan_person = #{planPerson}, + plan_person_name = #{planPersonName}, order_cost_time = #{orderCostTime}, order_sign_person = #{orderSignPerson}, factory_code = #{factoryCode}, 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 c36427d8e..961bc09ea 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 @@ -16,6 +16,7 @@ + @@ -91,7 +92,7 @@ - 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 , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect from equ_repair_work_order + 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 , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect,work_person_name from equ_repair_work_order + + + and in_out_type = #{inOutType} + and order_no = #{orderNo} + and spare_code = #{spareCode} + and spare_name = #{spareName} + and amount = #{amount} + and attr1 = #{attr1} + and attr2 = #{attr2} + and attr3 = #{attr3} + and create_time = #{createTime} + and update_by = #{updateBy} + and update_time = #{updateTime} + and del_flag = #{delFlag} + and factory_code = #{factoryCode} + + + + + + + insert into equ_spareparts_in_out + + id, + in_out_type, + order_no, + spare_code, + spare_name, + amount, + attr11, + attr12, + attr13, + create_by, + create_time, + update_by, + update_time, + del_flag, + factory_code, + storage_id, + + + #{id}, + #{inOutType}, + #{orderNo}, + #{spareCode}, + #{spareName}, + #{amount}, + #{attr1}, + #{attr2}, + #{attr3}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + #{factoryCode}, + #{storageId}, + + + + + update equ_spareparts_in_out + + in_out_type = #{inOutType}, + order_no = #{orderNo}, + spare_code = #{spareCode}, + spare_name = #{spareName}, + amount = #{amount}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + factory_code = #{factoryCode}, + + where id = #{id} + + + + update equ_spareparts_in_out + set del_flag = '1' + where id = #{id} + + + + update equ_spareparts_in_out + set del_flag = '1' + where id in + + #{id} + + + + + diff --git a/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml deleted file mode 100644 index b445f5bc6..000000000 --- a/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select raw_order_in_sn_id, wh_code, wa_code, wl_code, order_no, po_no, po_line, material_code, material_desc, sn, amount, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_raw_order_in_sn - - - - - - - - insert into wms_raw_order_in_sn - - raw_order_in_sn_id, - wh_code, - wa_code, - wl_code, - order_no, - po_no, - po_line, - material_code, - material_desc, - sn, - amount, - user_defined1, - user_defined2, - user_defined3, - user_defined4, - user_defined5, - user_defined6, - user_defined7, - user_defined8, - user_defined9, - user_defined10, - create_by, - gmt_create, - last_modified_by, - gmt_modified, - active_flag, - factory_code, - sap_factory_code, - - - #{rawOrderInSnId}, - #{whCode}, - #{waCode}, - #{wlCode}, - #{orderNo}, - #{poNo}, - #{poLine}, - #{materialCode}, - #{materialDesc}, - #{sn}, - #{amount}, - #{userDefined1}, - #{userDefined2}, - #{userDefined3}, - #{userDefined4}, - #{userDefined5}, - #{userDefined6}, - #{userDefined7}, - #{userDefined8}, - #{userDefined9}, - #{userDefined10}, - #{createBy}, - #{gmtCreate}, - #{lastModifiedBy}, - #{gmtModified}, - #{activeFlag}, - #{factoryCode}, - #{sapFactoryCode}, - - - - - update wms_raw_order_in_sn - - wh_code = #{whCode}, - wa_code = #{waCode}, - wl_code = #{wlCode}, - order_no = #{orderNo}, - po_no = #{poNo}, - po_line = #{poLine}, - material_code = #{materialCode}, - material_desc = #{materialDesc}, - sn = #{sn}, - amount = #{amount}, - user_defined1 = #{userDefined1}, - user_defined2 = #{userDefined2}, - user_defined3 = #{userDefined3}, - user_defined4 = #{userDefined4}, - user_defined5 = #{userDefined5}, - user_defined6 = #{userDefined6}, - user_defined7 = #{userDefined7}, - user_defined8 = #{userDefined8}, - user_defined9 = #{userDefined9}, - user_defined10 = #{userDefined10}, - create_by = #{createBy}, - gmt_create = #{gmtCreate}, - last_modified_by = #{lastModifiedBy}, - gmt_modified = #{gmtModified}, - active_flag = #{activeFlag}, - factory_code = #{factoryCode}, - sap_factory_code = #{sapFactoryCode}, - - where raw_order_in_sn_id = #{rawOrderInSnId} - - - - delete from wms_raw_order_in_sn where raw_order_in_sn_id = #{rawOrderInSnId} - - - - delete from wms_raw_order_in_sn where raw_order_in_sn_id in - - #{rawOrderInSnId} - - - diff --git a/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml index 1bdcbbdb1..ec2c5f322 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml @@ -381,4 +381,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where material_code = #{materialCode} and del_flag ='0' + + + + \ No newline at end of file diff --git a/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java index ad994faf5..d1ed9758a 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/base/service/impl/BaseMonitorInfo1ServiceImpl.java @@ -107,11 +107,44 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service { @Override @DS("#header.poolName") public int updateBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo) { + // 异常处理：若设备停用则更新所有父级 + if (StringUtils.isNotNull(baseMonitorInfo.getMonitorStatus()) && baseMonitorInfo.getMonitorStatus().equals(1L)){ + this.updateAllBaseMonitorInfo(); + } List baseMonitorInfos = baseMonitorInfoMapper.checkMonitorIdLegal(baseMonitorInfo); - if (baseMonitorInfos.size() > 1) { - throw new ServiceException("计量设备编号重复:" + baseMonitorInfo.getMonitorId()); + if (baseMonitorInfos.size() > 1){ + throw new ServiceException("计量设备编号重复:" + baseMonitorInfo.getMonitorId()); } try { + BaseMonitorInfo newParenMonitorInfo = baseMonitorInfoMapper.selectBaseMonitorInfoByObjid(baseMonitorInfo.getParentId()); + BaseMonitorInfo oldDeptMonitorInfo = selectBaseMonitorInfoByObjid(baseMonitorInfo.getObjid()); + if (StringUtils.isNotNull(newParenMonitorInfo) && StringUtils.isNotNull(oldDeptMonitorInfo)) + { + String newAncestors = newParenMonitorInfo.getAncestors() + "," + oldDeptMonitorInfo.getMonitorId(); + String oldAncestors = oldDeptMonitorInfo.getAncestors(); + baseMonitorInfo.setAncestors(newAncestors); + String[] split = baseMonitorInfo.getAncestors().split(","); + baseMonitorInfo.setGrade(split.length); + + updateMonitorChildren(baseMonitorInfo.getMonitorId(), newAncestors, oldAncestors); + } + + this.insertOrUpdateBaseTypeRelation(baseMonitorInfo.getMonitorId(),baseMonitorInfo.getBuildId(), + baseMonitorInfo.getBusinessId(),baseMonitorInfo.getSubentryId()); + } catch (Exception e) { + e.printStackTrace(); + } + baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); + baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); + return baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); + } + + /** + * 更新所有测控点 + */ + private void updateAllBaseMonitorInfo() { + List monitorInfoList = this.selectBaseMonitorInfoList(new BaseMonitorInfo()); + for (BaseMonitorInfo baseMonitorInfo : monitorInfoList) { BaseMonitorInfo newParenMonitorInfo = baseMonitorInfoMapper.selectBaseMonitorInfoByObjid(baseMonitorInfo.getParentId()); BaseMonitorInfo oldDeptMonitorInfo = selectBaseMonitorInfoByObjid(baseMonitorInfo.getObjid()); if (StringUtils.isNotNull(newParenMonitorInfo) && StringUtils.isNotNull(oldDeptMonitorInfo)) { @@ -126,14 +159,13 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service { this.insertOrUpdateBaseTypeRelation(baseMonitorInfo.getMonitorId(), baseMonitorInfo.getBuildId(), baseMonitorInfo.getBusinessId(), baseMonitorInfo.getSubentryId()); - } catch (Exception e) { - e.printStackTrace(); + baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); + baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); + baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); } - baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); - baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); - return baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); } + /** * 修改子元素关系 * diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml index 10575ea65..84af652da 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml @@ -121,7 +121,7 @@ select ert.monitor_id, ert.monitor_name, ert.pointTime, sum(isnull(ert.expend,0)) expend from ( - select rpd.monitor_id, m.monitor_name, left(rpd.begin_time, 10) pointTime, rpd.expend + select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) pointTime, rpd.expend from report_point_dnb rpd left join base_monitor_info m on m.monitor_id = rpd.monitor_id @@ -167,7 +167,7 @@ - and left(rpd.begin_time, 10) between #{startDay} and #{endDay} + and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay} ) ert @@ -178,21 +178,21 @@ select mlp.use_man standarMan, - ROUND(mlp.efficiency/bp.umrez,2) AS standarXl, - mr.use_man actMan, - mr.work_time, - mr2.quantity_feedback, - ROUND( mr2.quantity_feedback/mr.work_time,2) AS actXl - from ( - select top 1 use_man,work_time,machine_code,report_code,product_code - from mes_report_work where del_flag = '0' and machine_code = #{equCode} - and workorder_code = #{workorderCode} - and parent_order !='0' order by create_time desc - ) mr - left join mes_report_work mr2 on mr2.report_code = mr.report_code and mr2.parent_order ='0' - left join mes_line_product mlp on mlp.line_code = mr.machine_code and mr2.product_code = mlp.product_code + ROUND(mlp.efficiency/bp.umrez,2) AS standarXl + from mes_line_product mlp left join base_product bp on bp.product_code=mlp.product_code - where mlp.line_code = #{equCode} - and mlp.del_flag='0' and mlp.del_flag='0' + where mlp.line_code = #{equCode} and mlp.product_code = #{productCode} + and mlp.del_flag='0' and bp.del_flag='0' diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 85469479f..1fc178f4d 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -709,7 +709,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select sum(quantity_feedback) quantityFeedbackSum from mes_report_work where workorder_code = #{workorderCode} and del_flag = '0' and machine_code = #{machineCode} + and upload_status = '1' +