From bce6390db616766fa7ddb2e49778b4837c0ab870 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 17 Oct 2023 14:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E5=85=A5?= =?UTF-8?q?=E5=BA=93+=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SparePartsInOutStorageController.java | 97 +++++ ...r.java => SparePartsLedgerController.java} | 30 +- .../op/device/domain/SparePartsInStorage.java | 352 ++++++++++++++++++ .../mapper/SparePartsInOutStorageMapper.java | 61 +++ .../device/mapper/SparePartsLedgerMapper.java | 61 +++ .../mapper/WmsOdsMateStorageNewsMapper.java | 61 --- .../ISparePartsInOutStorageService.java | 60 +++ ...ice.java => ISparePartsLedgerService.java} | 23 +- .../SparePartsInOutStorageServiceImpl.java | 94 +++++ .../impl/SparePartsLedgerServiceImpl.java | 95 +++++ .../WmsOdsMateStorageNewsServiceImpl.java | 95 ----- .../device/SparePartsInOutStorageMapper.xml | 187 ++++++++++ ...sMapper.xml => SparePartsLedgerMapper.xml} | 22 +- 13 files changed, 1045 insertions(+), 193 deletions(-) create mode 100644 op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java rename op-modules/op-device/src/main/java/com/op/device/controller/{WmsOdsMateStorageNewsController.java => SparePartsLedgerController.java} (65%) create 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/SparePartsInOutStorageMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java rename op-modules/op-device/src/main/java/com/op/device/service/{IWmsOdsMateStorageNewsService.java => ISparePartsLedgerService.java} (50%) create 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/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml rename op-modules/op-device/src/main/resources/mapper/device/{WmsOdsMateStorageNewsMapper.xml => SparePartsLedgerMapper.xml} (94%) 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/SparePartsInOutStorageController.java new file mode 100644 index 00000000..f9f5f329 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.SparePartsInStorage; +import com.op.device.service.ISparePartsInOutStorageService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 备品备件出入库Controller + * + * @author Open Platform + * @date 2023-10-17 + */ +@RestController +@RequestMapping("/sparepartsInOutStorage") +public class SparePartsInOutStorageController extends BaseController { + @Autowired + private ISparePartsInOutStorageService sparePartsInOutStorageService; + + /** + * 查询备品备件出入库列表 + */ + @RequiresPermissions("device:sparepartsInOutStorage:list") + @GetMapping("/list") + public TableDataInfo list(SparePartsInStorage sparePartsInStorage) { + startPage(); + List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); + return getDataTable(list); + } + + /** + * 导出备品备件出入库列表 + */ + @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); + util.exportExcel(response, list, "备品备件出入库数据"); + } + + /** + * 获取备品备件出入库详细信息 + */ + @RequiresPermissions("device:sparepartsInOutStorage:query") + @GetMapping(value = "/{rawOrderInSnId}") + public AjaxResult getInfo(@PathVariable("rawOrderInSnId") String rawOrderInSnId) { + return success(sparePartsInOutStorageService.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId)); + } + + /** + * 新增备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:add") + @Log(title = "备品备件出入库", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SparePartsInStorage sparePartsInStorage) { + return toAjax(sparePartsInOutStorageService.insertSparePartsInStorage(sparePartsInStorage)); + } + + /** + * 修改备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:edit") + @Log(title = "备品备件出入库", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SparePartsInStorage sparePartsInStorage) { + return toAjax(sparePartsInOutStorageService.updateSparePartsInStorage(sparePartsInStorage)); + } + + /** + * 删除备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:remove") + @Log(title = "备品备件出入库", businessType = BusinessType.DELETE) + @DeleteMapping("/{rawOrderInSnIds}") + public AjaxResult remove(@PathVariable String[] rawOrderInSnIds) { + return toAjax(sparePartsInOutStorageService.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java similarity index 65% rename from op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java rename to op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java index 16841303..74e3aaeb 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/WmsOdsMateStorageNewsController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsLedgerController.java @@ -14,8 +14,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.WmsOdsMateStorageNews; -import com.op.device.service.IWmsOdsMateStorageNewsService; +import com.op.device.domain.SparePartsLedger; +import com.op.device.service.ISparePartsLedgerService; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.utils.poi.ExcelUtil; @@ -29,18 +29,18 @@ import com.op.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/sparePartsLedger") -public class WmsOdsMateStorageNewsController extends BaseController { +public class SparePartsLedgerController extends BaseController { @Autowired - private IWmsOdsMateStorageNewsService wmsOdsMateStorageNewsService; + private ISparePartsLedgerService sparePartsLedgerService; /** * 查询备品备件台账管理列表 */ @RequiresPermissions("device:sparePartsLedger:list") @GetMapping("/list") - public TableDataInfo list(WmsOdsMateStorageNews wmsOdsMateStorageNews) { + public TableDataInfo list(SparePartsLedger sparePartsLedger) { startPage(); - List list = wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); + List list = sparePartsLedgerService.selectSparePartsLedgerList(sparePartsLedger); return getDataTable(list); } @@ -50,9 +50,9 @@ public class WmsOdsMateStorageNewsController extends BaseController { @RequiresPermissions("device:sparePartsLedger:export") @Log(title = "备品备件台账管理", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, WmsOdsMateStorageNews wmsOdsMateStorageNews) { - List list = wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); - ExcelUtil util = new ExcelUtil(WmsOdsMateStorageNews.class); + public void export(HttpServletResponse response, SparePartsLedger sparePartsLedger) { + List list = sparePartsLedgerService.selectSparePartsLedgerList(sparePartsLedger); + ExcelUtil util = new ExcelUtil(SparePartsLedger.class); util.exportExcel(response, list, "备品备件台账管理数据"); } @@ -62,7 +62,7 @@ public class WmsOdsMateStorageNewsController extends BaseController { @RequiresPermissions("device:sparePartsLedger:query") @GetMapping(value = "/{storageId}") public AjaxResult getInfo(@PathVariable("storageId") String storageId) { - return success(wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewsByStorageId(storageId)); + return success(sparePartsLedgerService.selectSparePartsLedgerByStorageId(storageId)); } /** @@ -71,8 +71,8 @@ public class WmsOdsMateStorageNewsController extends BaseController { @RequiresPermissions("device:sparePartsLedger:add") @Log(title = "备品备件台账管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return toAjax(wmsOdsMateStorageNewsService.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews)); + public AjaxResult add(@RequestBody SparePartsLedger sparePartsLedger) { + return toAjax(sparePartsLedgerService.insertSparePartsLedger(sparePartsLedger)); } /** @@ -81,8 +81,8 @@ public class WmsOdsMateStorageNewsController extends BaseController { @RequiresPermissions("device:sparePartsLedger:edit") @Log(title = "备品备件台账管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return toAjax(wmsOdsMateStorageNewsService.updateWmsOdsMateStorageNews(wmsOdsMateStorageNews)); + public AjaxResult edit(@RequestBody SparePartsLedger sparePartsLedger) { + return toAjax(sparePartsLedgerService.updateSparePartsLedger(sparePartsLedger)); } /** @@ -92,6 +92,6 @@ public class WmsOdsMateStorageNewsController extends BaseController { @Log(title = "备品备件台账管理", businessType = BusinessType.DELETE) @DeleteMapping("/{storageIds}") public AjaxResult remove(@PathVariable String[] storageIds) { - return toAjax(wmsOdsMateStorageNewsService.deleteWmsOdsMateStorageNewsByStorageIds(storageIds)); + return toAjax(sparePartsLedgerService.deleteSparePartsLedgerByStorageIds(storageIds)); } } 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 new file mode 100644 index 00000000..83edcdcc --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java @@ -0,0 +1,352 @@ +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/SparePartsInOutStorageMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java new file mode 100644 index 00000000..3c04e369 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java @@ -0,0 +1,61 @@ +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 new file mode 100644 index 00000000..01568182 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsLedgerMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.SparePartsLedger; + +/** + * 备品备件台账管理Mapper接口 + * + * @author Open Platform + * @date 2023-10-13 + */ +public interface SparePartsLedgerMapper { + /** + * 查询备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 备品备件台账管理 + */ + public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId); + + /** + * 查询备品备件台账管理列表 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 备品备件台账管理集合 + */ + public List selectSparePartsLedgerList(SparePartsLedger sparePartsLedger); + + /** + * 新增备品备件台账管理 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 结果 + */ + public int insertSparePartsLedger(SparePartsLedger sparePartsLedger); + + /** + * 修改备品备件台账管理 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 结果 + */ + public int updateSparePartsLedger(SparePartsLedger sparePartsLedger); + + /** + * 删除备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 结果 + */ + public int deleteSparePartsLedgerByStorageId(String storageId); + + /** + * 批量删除备品备件台账管理 + * + * @param storageIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSparePartsLedgerByStorageIds(String[] storageIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java deleted file mode 100644 index cafa5899..00000000 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/WmsOdsMateStorageNewsMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.op.device.mapper; - -import java.util.List; - -import com.op.device.domain.WmsOdsMateStorageNews; - -/** - * 备品备件台账管理Mapper接口 - * - * @author Open Platform - * @date 2023-10-13 - */ -public interface WmsOdsMateStorageNewsMapper { - /** - * 查询备品备件台账管理 - * - * @param storageId 备品备件台账管理主键 - * @return 备品备件台账管理 - */ - public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId); - - /** - * 查询备品备件台账管理列表 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 备品备件台账管理集合 - */ - public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); - - /** - * 新增备品备件台账管理 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 结果 - */ - public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); - - /** - * 修改备品备件台账管理 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 结果 - */ - public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); - - /** - * 删除备品备件台账管理 - * - * @param storageId 备品备件台账管理主键 - * @return 结果 - */ - public int deleteWmsOdsMateStorageNewsByStorageId(String storageId); - - /** - * 批量删除备品备件台账管理 - * - * @param storageIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds); -} 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/ISparePartsInOutStorageService.java new file mode 100644 index 00000000..db005507 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.SparePartsInStorage; + +/** + * 备品备件出入库Service接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface ISparePartsInOutStorageService { + /** + * 查询备品备件出入库 + * + * @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 rawOrderInSnIds 需要删除的备品备件出入库主键集合 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); + + /** + * 删除备品备件出入库信息 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java similarity index 50% rename from op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java rename to op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java index 1330881f..29d80760 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IWmsOdsMateStorageNewsService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsLedgerService.java @@ -1,7 +1,8 @@ package com.op.device.service; import java.util.List; -import com.op.device.domain.WmsOdsMateStorageNews; + +import com.op.device.domain.SparePartsLedger; /** * 备品备件台账管理Service接口 @@ -9,38 +10,38 @@ import com.op.device.domain.WmsOdsMateStorageNews; * @author Open Platform * @date 2023-10-13 */ -public interface IWmsOdsMateStorageNewsService { +public interface ISparePartsLedgerService { /** * 查询备品备件台账管理 * * @param storageId 备品备件台账管理主键 * @return 备品备件台账管理 */ - public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId); + public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId); /** * 查询备品备件台账管理列表 * - * @param wmsOdsMateStorageNews 备品备件台账管理 + * @param sparePartsLedger 备品备件台账管理 * @return 备品备件台账管理集合 */ - public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public List selectSparePartsLedgerList(SparePartsLedger sparePartsLedger); /** * 新增备品备件台账管理 * - * @param wmsOdsMateStorageNews 备品备件台账管理 + * @param sparePartsLedger 备品备件台账管理 * @return 结果 */ - public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public int insertSparePartsLedger(SparePartsLedger sparePartsLedger); /** * 修改备品备件台账管理 * - * @param wmsOdsMateStorageNews 备品备件台账管理 + * @param sparePartsLedger 备品备件台账管理 * @return 结果 */ - public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public int updateSparePartsLedger(SparePartsLedger sparePartsLedger); /** * 批量删除备品备件台账管理 @@ -48,7 +49,7 @@ public interface IWmsOdsMateStorageNewsService { * @param storageIds 需要删除的备品备件台账管理主键集合 * @return 结果 */ - public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds); + public int deleteSparePartsLedgerByStorageIds(String[] storageIds); /** * 删除备品备件台账管理信息 @@ -56,5 +57,5 @@ public interface IWmsOdsMateStorageNewsService { * @param storageId 备品备件台账管理主键 * @return 结果 */ - public int deleteWmsOdsMateStorageNewsByStorageId(String storageId); + public int deleteSparePartsLedgerByStorageId(String storageId); } 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 new file mode 100644 index 00000000..69754cf1 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java @@ -0,0 +1,94 @@ +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 new file mode 100644 index 00000000..1921561a --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java @@ -0,0 +1,95 @@ +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.SparePartsLedgerMapper; +import com.op.device.domain.SparePartsLedger; +import com.op.device.service.ISparePartsLedgerService; + +/** + * 备品备件台账管理Service业务层处理 + * + * @author Open Platform + * @date 2023-10-13 + */ +@Service +public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService { + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; + + /** + * 查询备品备件台账管理 + * + * @param storageId 备品备件台账管理主键 + * @return 备品备件台账管理 + */ + @Override + @DS("#header.poolName") + public SparePartsLedger selectSparePartsLedgerByStorageId(String storageId) { + return sparePartsLedgerMapper.selectSparePartsLedgerByStorageId(storageId); + } + + /** + * 查询备品备件台账管理列表 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 备品备件台账管理 + */ + @Override + @DS("#header.poolName") + public List selectSparePartsLedgerList(SparePartsLedger sparePartsLedger) { + sparePartsLedger.setStorageType("SP"); + return sparePartsLedgerMapper.selectSparePartsLedgerList(sparePartsLedger); + } + + /** + * 新增备品备件台账管理 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertSparePartsLedger(SparePartsLedger sparePartsLedger) { + return sparePartsLedgerMapper.insertSparePartsLedger(sparePartsLedger); + } + + /** + * 修改备品备件台账管理 + * + * @param sparePartsLedger 备品备件台账管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateSparePartsLedger(SparePartsLedger sparePartsLedger) { + return sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); + } + + /** + * 批量删除备品备件台账管理 + * + * @param storageIds 需要删除的备品备件台账管理主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteSparePartsLedgerByStorageIds(String[] storageIds) { + return sparePartsLedgerMapper.deleteSparePartsLedgerByStorageIds(storageIds); + } + + /** + * 删除备品备件台账管理信息 + * + * @param storageId 备品备件台账管理主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteSparePartsLedgerByStorageId(String storageId) { + return sparePartsLedgerMapper.deleteSparePartsLedgerByStorageId(storageId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.java deleted file mode 100644 index af7c4c86..00000000 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/WmsOdsMateStorageNewsServiceImpl.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.WmsOdsMateStorageNewsMapper; -import com.op.device.domain.WmsOdsMateStorageNews; -import com.op.device.service.IWmsOdsMateStorageNewsService; - -/** - * 备品备件台账管理Service业务层处理 - * - * @author Open Platform - * @date 2023-10-13 - */ -@Service -public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsService { - @Autowired - private WmsOdsMateStorageNewsMapper wmsOdsMateStorageNewsMapper; - - /** - * 查询备品备件台账管理 - * - * @param storageId 备品备件台账管理主键 - * @return 备品备件台账管理 - */ - @Override - @DS("#header.poolName") - public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsByStorageId(String storageId) { - return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsByStorageId(storageId); - } - - /** - * 查询备品备件台账管理列表 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 备品备件台账管理 - */ - @Override - @DS("#header.poolName") - public List selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews) { - wmsOdsMateStorageNews.setStorageType("SP"); - return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews); - } - - /** - * 新增备品备件台账管理 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews); - } - - /** - * 修改备品备件台账管理 - * - * @param wmsOdsMateStorageNews 备品备件台账管理 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { - return wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNews(wmsOdsMateStorageNews); - } - - /** - * 批量删除备品备件台账管理 - * - * @param storageIds 需要删除的备品备件台账管理主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteWmsOdsMateStorageNewsByStorageIds(String[] storageIds) { - return wmsOdsMateStorageNewsMapper.deleteWmsOdsMateStorageNewsByStorageIds(storageIds); - } - - /** - * 删除备品备件台账管理信息 - * - * @param storageId 备品备件台账管理主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteWmsOdsMateStorageNewsByStorageId(String storageId) { - return wmsOdsMateStorageNewsMapper.deleteWmsOdsMateStorageNewsByStorageId(storageId); - } -} 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 new file mode 100644 index 00000000..2d7903ee --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml similarity index 94% rename from op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml rename to op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml index c402c2fb..dd5b1632 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/WmsOdsMateStorageNewsMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -31,12 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select storage_type, material_code, material_desc, amount,sap_factory_code, wl_name, del_flag, spare_use_life, spare_name, spare_mode, spare_manufacturer, spare_supplier, spare_replacement_cycle, spare_measurement_unit, spare_conversion_unit, spare_conversion_ratio, spare_inventory_floor, spare_inventory_upper,spare_type,create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code from wms_ods_mate_storage_news - + and storage_id = #{storageId} and wh_code = #{whCode} @@ -86,14 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + where storage_id = #{storageId} and del_flag = '0' and storage_tpye = 'SP' - + insert into wms_ods_mate_storage_news storage_id, @@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update wms_ods_mate_storage_news wh_code = #{whCode}, @@ -245,11 +245,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where storage_id = #{storageId} - + delete from wms_ods_mate_storage_news where storage_id = #{storageId} - + delete from wms_ods_mate_storage_news where storage_id in #{storageId}