From b13b68d10afd02b98e3d839d153bb95170334c36 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 4 Jul 2024 18:01:25 +0800 Subject: [PATCH] =?UTF-8?q?2024-07-04=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...java => EquSparepartsInOutController.java} | 38 +- .../op/device/domain/EquSparepartsInOut.java | 168 +++++++ .../op/device/domain/SparePartsInStorage.java | 433 ------------------ .../mapper/EquSparepartsInOutMapper.java | 63 +++ .../mapper/SparePartsInOutStorageMapper.java | 61 --- ...e.java => IEquSparepartsInOutService.java} | 23 +- .../service/impl/EquSparepartsInOutImpl.java | 212 +++++++++ .../SparePartsInOutStorageServiceImpl.java | 95 ---- .../device/EquSparepartsInOutMapper.xml | 135 ++++++ .../device/SparePartsInOutStorageMapper.xml | 188 -------- 10 files changed, 609 insertions(+), 807 deletions(-) rename op-modules/op-device/src/main/java/com/op/device/controller/{SparePartsInOutStorageController.java => EquSparepartsInOutController.java} (60%) create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquSparepartsInOutMapper.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java rename op-modules/op-device/src/main/java/com/op/device/service/{ISparePartsInOutStorageService.java => IEquSparepartsInOutService.java} (50%) create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/EquSparepartsInOutImpl.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml delete mode 100644 op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml 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/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/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/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/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/resources/mapper/device/EquSparepartsInOutMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml new file mode 100644 index 000000000..b3deba255 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, in_out_type, order_no,spare_code, spare_name ,amount, attr1, attr2, attr3, create_by, create_time, update_by, update_time, del_flag, factory_code,storage_id from equ_spareparts_in_out + + + + + + + + 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} - - -