From 952b654300c7da0e0052e2a0473db7ffa98c6d1b Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 4 Aug 2023 17:06:39 +0800 Subject: [PATCH] =?UTF-8?q?WMS=20=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseBomItemsTController.java | 95 ------ .../MesPrepareDetailController.java | 97 ------ .../java/com/op/wms/domain/BaseBomItemsT.java | 278 ------------------ .../com/op/wms/domain/MesPrepareDetail.java | 222 -------------- .../op/wms/mapper/BaseBomItemsTMapper.java | 61 ---- .../op/wms/mapper/MesPrepareDetailMapper.java | 61 ---- .../op/wms/service/IBaseBomItemsTService.java | 60 ---- .../wms/service/IMesPrepareDetailService.java | 60 ---- .../impl/BaseBomItemsTServiceImpl.java | 100 ------- .../impl/MesPrepareDetailServiceImpl.java | 89 ------ .../mapper/wms/BaseBomItemsTMapper.xml | 169 ----------- .../mapper/wms/MesPrepareDetailMapper.xml | 148 ---------- 12 files changed, 1440 deletions(-) delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomItemsTController.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/controller/MesPrepareDetailController.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomItemsT.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/MesPrepareDetail.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseBomItemsTMapper.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/mapper/MesPrepareDetailMapper.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/IBaseBomItemsTService.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/IMesPrepareDetailService.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomItemsTServiceImpl.java delete mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/impl/MesPrepareDetailServiceImpl.java delete mode 100644 op-modules/op-wms/src/main/resources/mapper/wms/BaseBomItemsTMapper.xml delete mode 100644 op-modules/op-wms/src/main/resources/mapper/wms/MesPrepareDetailMapper.xml diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomItemsTController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomItemsTController.java deleted file mode 100644 index 7943cb20..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomItemsTController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.op.wms.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.wms.domain.BaseBomItemsT; -import com.op.wms.service.IBaseBomItemsTService; -import com.op.common.core.web.controller.BaseController; -import com.op.common.core.web.domain.AjaxResult; -import com.op.common.core.utils.poi.ExcelUtil; - -/** - * 物料BOM管理Controller - * - * @author JGY - * @date 2023-07-18 - */ -@RestController -@RequestMapping("/bom") -public class BaseBomItemsTController extends BaseController { - @Autowired - private IBaseBomItemsTService baseBomItemsTService; - - /** - * 查询物料BOM管理列表 - */ - @RequiresPermissions("wms:bom:list") - @GetMapping("/list") - public AjaxResult list(BaseBomItemsT baseBomItemsT) { - List list = baseBomItemsTService.selectBaseBomItemsTList(baseBomItemsT); - return success(list); - } - - /** - * 导出物料BOM管理列表 - */ - @RequiresPermissions("wms:bom:export") - @Log(title = "物料BOM管理", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, BaseBomItemsT baseBomItemsT) { - List list = baseBomItemsTService.selectBaseBomItemsTList(baseBomItemsT); - ExcelUtil util = new ExcelUtil(BaseBomItemsT.class); - util.exportExcel(response, list, "物料BOM管理数据"); - } - - /** - * 获取物料BOM管理详细信息 - */ - @RequiresPermissions("wms:bom:query") - @GetMapping(value = "/{bomItemId}") - public AjaxResult getInfo(@PathVariable("bomItemId") String bomItemId) { - return success(baseBomItemsTService.selectBaseBomItemsTByBomItemId(bomItemId)); - } - - /** - * 新增物料BOM管理 - */ - @RequiresPermissions("wms:bom:add") - @Log(title = "物料BOM管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody BaseBomItemsT baseBomItemsT) { - return toAjax(baseBomItemsTService.insertBaseBomItemsT(baseBomItemsT)); - } - - /** - * 修改物料BOM管理 - */ - @RequiresPermissions("wms:bom:edit") - @Log(title = "物料BOM管理", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody BaseBomItemsT baseBomItemsT) { - return toAjax(baseBomItemsTService.updateBaseBomItemsT(baseBomItemsT)); - } - - /** - * 删除物料BOM管理 - */ - @RequiresPermissions("wms:bom:remove") - @Log(title = "物料BOM管理", businessType = BusinessType.DELETE) - @DeleteMapping("/{bomItemIds}") - public AjaxResult remove(@PathVariable String[] bomItemIds) { - return toAjax(baseBomItemsTService.deleteBaseBomItemsTByBomItemIds(bomItemIds)); - } -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/MesPrepareDetailController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/MesPrepareDetailController.java deleted file mode 100644 index 5d5c634e..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/MesPrepareDetailController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.op.mes.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.mes.domain.MesPrepareDetail; -import com.op.mes.service.IMesPrepareDetailService; -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; - -/** - * mes备料单明细Controller - * - * @author Open Platform - * @date 2023-08-04 - */ -@RestController -@RequestMapping("/prepareDetail") -public class MesPrepareDetailController extends BaseController { - @Autowired - private IMesPrepareDetailService mesPrepareDetailService; - - /** - * 查询mes备料单明细列表 - */ - @RequiresPermissions("mes:prepareDetail:list") - @GetMapping("/list") - public TableDataInfo list(MesPrepareDetail mesPrepareDetail) { - startPage(); - List list = mesPrepareDetailService.selectMesPrepareDetailList(mesPrepareDetail); - return getDataTable(list); - } - - /** - * 导出mes备料单明细列表 - */ - @RequiresPermissions("mes:prepareDetail:export") - @Log(title = "mes备料单明细", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, MesPrepareDetail mesPrepareDetail) { - List list = mesPrepareDetailService.selectMesPrepareDetailList(mesPrepareDetail); - ExcelUtil util = new ExcelUtil(MesPrepareDetail.class); - util.exportExcel(response, list, "mes备料单明细数据"); - } - - /** - * 获取mes备料单明细详细信息 - */ - @RequiresPermissions("mes:prepareDetail:query") - @GetMapping(value = "/{recordId}") - public AjaxResult getInfo(@PathVariable("recordId") String recordId) { - return success(mesPrepareDetailService.selectMesPrepareDetailByRecordId(recordId)); - } - - /** - * 新增mes备料单明细 - */ - @RequiresPermissions("mes:prepareDetail:add") - @Log(title = "mes备料单明细", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody MesPrepareDetail mesPrepareDetail) { - return toAjax(mesPrepareDetailService.insertMesPrepareDetail(mesPrepareDetail)); - } - - /** - * 修改mes备料单明细 - */ - @RequiresPermissions("mes:prepareDetail:edit") - @Log(title = "mes备料单明细", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody MesPrepareDetail mesPrepareDetail) { - return toAjax(mesPrepareDetailService.updateMesPrepareDetail(mesPrepareDetail)); - } - - /** - * 删除mes备料单明细 - */ - @RequiresPermissions("mes:prepareDetail:remove") - @Log(title = "mes备料单明细", businessType = BusinessType.DELETE) - @DeleteMapping("/{recordIds}") - public AjaxResult remove(@PathVariable String[] recordIds) { - return toAjax(mesPrepareDetailService.deleteMesPrepareDetailByRecordIds(recordIds)); - } -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomItemsT.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomItemsT.java deleted file mode 100644 index 5674ca93..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomItemsT.java +++ /dev/null @@ -1,278 +0,0 @@ -package com.op.wms.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.TreeEntity; - -/** - * 物料BOM管理对象 base_bom_items_t - * - * @author Open Platform - * @date 2023-07-18 - */ -public class BaseBomItemsT extends TreeEntity { - private static final long serialVersionUID = 1L; - - /** BOM配方组成主键 */ - private String bomItemId; - - /** BOM配方组成描述 */ - @Excel(name = "BOM配方组成描述") - private String bomItemDesc; - - /** BOM配方组成序号 */ - @Excel(name = "BOM配方组成序号") - private Long bomFormulationOrder; - - /** BOM配方主键 */ - @Excel(name = "BOM配方主键") - private String bomFormulationId; - - /** 产品主键 */ - @Excel(name = "产品主键") - private String prodId; - - /** 数量 */ - @Excel(name = "数量") - private Long Quantity; - - /** 精度 */ - @Excel(name = "精度") - private Long Precision; - - /** 计量单位主键 */ - @Excel(name = "计量单位主键") - private String euId; - - /** 最低偏差 */ - @Excel(name = "最低偏差") - private Long lowerTolerance; - - /** 最低偏差精度 */ - @Excel(name = "最低偏差精度") - private Long lowerTolerancePrecision; - - /** 最高偏差 */ - @Excel(name = "最高偏差") - private Long upperTolerance; - - /** 最高偏差精度 */ - @Excel(name = "最高偏差精度") - private Long upperTolerancePrecision; - - /** 可用标识 */ - @Excel(name = "可用标识") - private String Active; - - /** 工厂主键 */ - @Excel(name = "工厂主键") - private String siteId; - - /** 工厂编码 */ - @Excel(name = "工厂编码") - private String siteCode; - - /** 企业主键 */ - @Excel(name = "企业主键") - private String enterpriseId; - - /** 企业编码 */ - @Excel(name = "企业编码") - private String enterpriseCode; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String FactoryNo; - - /** 采购类型 */ - @Excel(name = "采购类型") - private String BESKZ; - - /** 特殊采购类型 */ - @Excel(name = "特殊采购类型") - private String SOBSL; - - /** 层级 */ - @Excel(name = "层级") - private String STUFE; - - public void setBomItemId(String bomItemId) { - this.bomItemId = bomItemId; - } - - public String getBomItemId() { - return bomItemId; - } - public void setBomItemDesc(String bomItemDesc) { - this.bomItemDesc = bomItemDesc; - } - - public String getBomItemDesc() { - return bomItemDesc; - } - public void setBomFormulationOrder(Long bomFormulationOrder) { - this.bomFormulationOrder = bomFormulationOrder; - } - - public Long getBomFormulationOrder() { - return bomFormulationOrder; - } - public void setBomFormulationId(String bomFormulationId) { - this.bomFormulationId = bomFormulationId; - } - - public String getBomFormulationId() { - return bomFormulationId; - } - public void setProdId(String prodId) { - this.prodId = prodId; - } - - public String getProdId() { - return prodId; - } - public void setQuantity(Long Quantity) { - this.Quantity = Quantity; - } - - public Long getQuantity() { - return Quantity; - } - public void setPrecision(Long Precision) { - this.Precision = Precision; - } - - public Long getPrecision() { - return Precision; - } - public void setEuId(String euId) { - this.euId = euId; - } - - public String getEuId() { - return euId; - } - public void setLowerTolerance(Long lowerTolerance) { - this.lowerTolerance = lowerTolerance; - } - - public Long getLowerTolerance() { - return lowerTolerance; - } - public void setLowerTolerancePrecision(Long lowerTolerancePrecision) { - this.lowerTolerancePrecision = lowerTolerancePrecision; - } - - public Long getLowerTolerancePrecision() { - return lowerTolerancePrecision; - } - public void setUpperTolerance(Long upperTolerance) { - this.upperTolerance = upperTolerance; - } - - public Long getUpperTolerance() { - return upperTolerance; - } - public void setUpperTolerancePrecision(Long upperTolerancePrecision) { - this.upperTolerancePrecision = upperTolerancePrecision; - } - - public Long getUpperTolerancePrecision() { - return upperTolerancePrecision; - } - public void setActive(String Active) { - this.Active = Active; - } - - public String getActive() { - return Active; - } - public void setSiteId(String siteId) { - this.siteId = siteId; - } - - public String getSiteId() { - return siteId; - } - public void setSiteCode(String siteCode) { - this.siteCode = siteCode; - } - - public String getSiteCode() { - return siteCode; - } - public void setEnterpriseId(String enterpriseId) { - this.enterpriseId = enterpriseId; - } - - public String getEnterpriseId() { - return enterpriseId; - } - public void setEnterpriseCode(String enterpriseCode) { - this.enterpriseCode = enterpriseCode; - } - - public String getEnterpriseCode() { - return enterpriseCode; - } - public void setFactoryNo(String FactoryNo) { - this.FactoryNo = FactoryNo; - } - - public String getFactoryNo() { - return FactoryNo; - } - public void setBESKZ(String BESKZ) { - this.BESKZ = BESKZ; - } - - public String getBESKZ() { - return BESKZ; - } - public void setSOBSL(String SOBSL) { - this.SOBSL = SOBSL; - } - - public String getSOBSL() { - return SOBSL; - } - public void setSTUFE(String STUFE) { - this.STUFE = STUFE; - } - - public String getSTUFE() { - return STUFE; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("bomItemId", getBomItemId()) - .append("bomItemDesc", getBomItemDesc()) - .append("bomFormulationOrder", getBomFormulationOrder()) - .append("bomFormulationId", getBomFormulationId()) - .append("prodId", getProdId()) - .append("Quantity", getQuantity()) - .append("Precision", getPrecision()) - .append("euId", getEuId()) - .append("lowerTolerance", getLowerTolerance()) - .append("lowerTolerancePrecision", getLowerTolerancePrecision()) - .append("upperTolerance", getUpperTolerance()) - .append("upperTolerancePrecision", getUpperTolerancePrecision()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("Active", getActive()) - .append("siteId", getSiteId()) - .append("siteCode", getSiteCode()) - .append("enterpriseId", getEnterpriseId()) - .append("enterpriseCode", getEnterpriseCode()) - .append("FactoryNo", getFactoryNo()) - .append("BESKZ", getBESKZ()) - .append("SOBSL", getSOBSL()) - .append("STUFE", getSTUFE()) - .toString(); - } -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/MesPrepareDetail.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/MesPrepareDetail.java deleted file mode 100644 index 6aa48196..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/MesPrepareDetail.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.op.mes.domain; - -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; - -/** - * mes备料单明细对象 mes_prepare_detail - * - * @author Open Platform - * @date 2023-08-04 - */ -public class MesPrepareDetail extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** ID */ - private String recordId; - - /** 备料主ID */ - @Excel(name = "备料主ID") - private String prepareId; - - /** 物料编号 */ - @Excel(name = "物料编号") - private String materialCode; - - /** 物料名称 */ - @Excel(name = "物料名称") - private String materailName; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String materailSpc; - - /** 单位 */ - @Excel(name = "单位") - private String unit; - - /** 生产数量 */ - @Excel(name = "生产数量") - private Long quantity; - - /** 工单生产日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "工单生产日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date productDate; - - /** 班次 */ - @Excel(name = "班次") - private String shiftId; - - /** 单据状态 */ - @Excel(name = "单据状态") - private String status; - - /** 预留字段1 */ - @Excel(name = "预留字段1") - private String attr1; - - /** 预留字段2 */ - @Excel(name = "预留字段2") - private String attr2; - - /** 预留字段3 */ - @Excel(name = "预留字段3") - private String attr3; - - /** 预留字段4 */ - @Excel(name = "预留字段4") - private String attr4; - - /** 产品类型 */ - @Excel(name = "产品类型") - private String prodType; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String factoryCode; - - public void setRecordId(String recordId) { - this.recordId = recordId; - } - - public String getRecordId() { - return recordId; - } - public void setPrepareId(String prepareId) { - this.prepareId = prepareId; - } - - public String getPrepareId() { - return prepareId; - } - public void setMaterialCode(String materialCode) { - this.materialCode = materialCode; - } - - public String getMaterialCode() { - return materialCode; - } - public void setMaterailName(String materailName) { - this.materailName = materailName; - } - - public String getMaterailName() { - return materailName; - } - public void setMaterailSpc(String materailSpc) { - this.materailSpc = materailSpc; - } - - public String getMaterailSpc() { - return materailSpc; - } - public void setUnit(String unit) { - this.unit = unit; - } - - public String getUnit() { - return unit; - } - public void setQuantity(Long quantity) { - this.quantity = quantity; - } - - public Long getQuantity() { - return quantity; - } - public void setProductDate(Date productDate) { - this.productDate = productDate; - } - - public Date getProductDate() { - return productDate; - } - public void setShiftId(String shiftId) { - this.shiftId = shiftId; - } - - public String getShiftId() { - return shiftId; - } - public void setStatus(String status) { - this.status = status; - } - - public String getStatus() { - return status; - } - public void setAttr1(String attr1) { - this.attr1 = attr1; - } - - public String getAttr1() { - return attr1; - } - public void setAttr2(String attr2) { - this.attr2 = attr2; - } - - public String getAttr2() { - return attr2; - } - public void setAttr3(String attr3) { - this.attr3 = attr3; - } - - public String getAttr3() { - return attr3; - } - public void setAttr4(String attr4) { - this.attr4 = attr4; - } - - public String getAttr4() { - return attr4; - } - public void setProdType(String prodType) { - this.prodType = prodType; - } - - public String getProdType() { - return prodType; - } - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getFactoryCode() { - return factoryCode; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("recordId", getRecordId()) - .append("prepareId", getPrepareId()) - .append("materialCode", getMaterialCode()) - .append("materailName", getMaterailName()) - .append("materailSpc", getMaterailSpc()) - .append("unit", getUnit()) - .append("quantity", getQuantity()) - .append("productDate", getProductDate()) - .append("shiftId", getShiftId()) - .append("status", getStatus()) - .append("remark", getRemark()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("prodType", getProdType()) - .append("factoryCode", getFactoryCode()) - .toString(); - } -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseBomItemsTMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseBomItemsTMapper.java deleted file mode 100644 index 24798e18..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseBomItemsTMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.op.wms.mapper; - -import java.util.List; - -import com.op.wms.domain.BaseBomItemsT; - -/** - * 物料BOM管理Mapper接口 - * - * @author Open Platform - * @date 2023-07-18 - */ -public interface BaseBomItemsTMapper { - /** - * 查询物料BOM管理 - * - * @param bomItemId 物料BOM管理主键 - * @return 物料BOM管理 - */ - public BaseBomItemsT selectBaseBomItemsTByBomItemId(String bomItemId); - - /** - * 查询物料BOM管理列表 - * - * @param baseBomItemsT 物料BOM管理 - * @return 物料BOM管理集合 - */ - public List selectBaseBomItemsTList(BaseBomItemsT baseBomItemsT); - - /** - * 新增物料BOM管理 - * - * @param baseBomItemsT 物料BOM管理 - * @return 结果 - */ - public int insertBaseBomItemsT(BaseBomItemsT baseBomItemsT); - - /** - * 修改物料BOM管理 - * - * @param baseBomItemsT 物料BOM管理 - * @return 结果 - */ - public int updateBaseBomItemsT(BaseBomItemsT baseBomItemsT); - - /** - * 删除物料BOM管理 - * - * @param bomItemId 物料BOM管理主键 - * @return 结果 - */ - public int deleteBaseBomItemsTByBomItemId(String bomItemId); - - /** - * 批量删除物料BOM管理 - * - * @param bomItemIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBaseBomItemsTByBomItemIds(String[] bomItemIds); -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/MesPrepareDetailMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/MesPrepareDetailMapper.java deleted file mode 100644 index 0c00dd2d..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/MesPrepareDetailMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.op.mes.mapper; - -import java.util.List; - -import com.op.mes.domain.MesPrepareDetail; - -/** - * mes备料单明细Mapper接口 - * - * @author Open Platform - * @date 2023-08-04 - */ -public interface MesPrepareDetailMapper { - /** - * 查询mes备料单明细 - * - * @param recordId mes备料单明细主键 - * @return mes备料单明细 - */ - public MesPrepareDetail selectMesPrepareDetailByRecordId(String recordId); - - /** - * 查询mes备料单明细列表 - * - * @param mesPrepareDetail mes备料单明细 - * @return mes备料单明细集合 - */ - public List selectMesPrepareDetailList(MesPrepareDetail mesPrepareDetail); - - /** - * 新增mes备料单明细 - * - * @param mesPrepareDetail mes备料单明细 - * @return 结果 - */ - public int insertMesPrepareDetail(MesPrepareDetail mesPrepareDetail); - - /** - * 修改mes备料单明细 - * - * @param mesPrepareDetail mes备料单明细 - * @return 结果 - */ - public int updateMesPrepareDetail(MesPrepareDetail mesPrepareDetail); - - /** - * 删除mes备料单明细 - * - * @param recordId mes备料单明细主键 - * @return 结果 - */ - public int deleteMesPrepareDetailByRecordId(String recordId); - - /** - * 批量删除mes备料单明细 - * - * @param recordIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteMesPrepareDetailByRecordIds(String[] recordIds); -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseBomItemsTService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseBomItemsTService.java deleted file mode 100644 index 6f1e8f43..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseBomItemsTService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.op.wms.service; - -import java.util.List; -import com.op.wms.domain.BaseBomItemsT; - -/** - * 物料BOM管理Service接口 - * - * @author Open Platform - * @date 2023-07-18 - */ -public interface IBaseBomItemsTService { - /** - * 查询物料BOM管理 - * - * @param bomItemId 物料BOM管理主键 - * @return 物料BOM管理 - */ - public BaseBomItemsT selectBaseBomItemsTByBomItemId(String bomItemId); - - /** - * 查询物料BOM管理列表 - * - * @param baseBomItemsT 物料BOM管理 - * @return 物料BOM管理集合 - */ - public List selectBaseBomItemsTList(BaseBomItemsT baseBomItemsT); - - /** - * 新增物料BOM管理 - * - * @param baseBomItemsT 物料BOM管理 - * @return 结果 - */ - public int insertBaseBomItemsT(BaseBomItemsT baseBomItemsT); - - /** - * 修改物料BOM管理 - * - * @param baseBomItemsT 物料BOM管理 - * @return 结果 - */ - public int updateBaseBomItemsT(BaseBomItemsT baseBomItemsT); - - /** - * 批量删除物料BOM管理 - * - * @param bomItemIds 需要删除的物料BOM管理主键集合 - * @return 结果 - */ - public int deleteBaseBomItemsTByBomItemIds(String[] bomItemIds); - - /** - * 删除物料BOM管理信息 - * - * @param bomItemId 物料BOM管理主键 - * @return 结果 - */ - public int deleteBaseBomItemsTByBomItemId(String bomItemId); -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IMesPrepareDetailService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IMesPrepareDetailService.java deleted file mode 100644 index 75b0c857..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IMesPrepareDetailService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.op.mes.service; - -import java.util.List; -import com.op.mes.domain.MesPrepareDetail; - -/** - * mes备料单明细Service接口 - * - * @author Open Platform - * @date 2023-08-04 - */ -public interface IMesPrepareDetailService { - /** - * 查询mes备料单明细 - * - * @param recordId mes备料单明细主键 - * @return mes备料单明细 - */ - public MesPrepareDetail selectMesPrepareDetailByRecordId(String recordId); - - /** - * 查询mes备料单明细列表 - * - * @param mesPrepareDetail mes备料单明细 - * @return mes备料单明细集合 - */ - public List selectMesPrepareDetailList(MesPrepareDetail mesPrepareDetail); - - /** - * 新增mes备料单明细 - * - * @param mesPrepareDetail mes备料单明细 - * @return 结果 - */ - public int insertMesPrepareDetail(MesPrepareDetail mesPrepareDetail); - - /** - * 修改mes备料单明细 - * - * @param mesPrepareDetail mes备料单明细 - * @return 结果 - */ - public int updateMesPrepareDetail(MesPrepareDetail mesPrepareDetail); - - /** - * 批量删除mes备料单明细 - * - * @param recordIds 需要删除的mes备料单明细主键集合 - * @return 结果 - */ - public int deleteMesPrepareDetailByRecordIds(String[] recordIds); - - /** - * 删除mes备料单明细信息 - * - * @param recordId mes备料单明细主键 - * @return 结果 - */ - public int deleteMesPrepareDetailByRecordId(String recordId); -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomItemsTServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomItemsTServiceImpl.java deleted file mode 100644 index 99e9088f..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseBomItemsTServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.op.wms.service.impl; - -import java.util.List; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.utils.DateUtils; -import com.op.common.security.utils.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.op.wms.mapper.BaseBomItemsTMapper; -import com.op.wms.domain.BaseBomItemsT; -import com.op.wms.service.IBaseBomItemsTService; - -/** - * 物料BOM管理Service业务层处理 - * - * @author Open Platform - * @date 2023-07-18 - */ -@Service -public class BaseBomItemsTServiceImpl implements IBaseBomItemsTService { - @Autowired - private BaseBomItemsTMapper baseBomItemsTMapper; - - /** - * 查询物料BOM管理 - * - * @param bomItemId 物料BOM管理主键 - * @return 物料BOM管理 - */ - @Override - @DS("#header.poolName") - public BaseBomItemsT selectBaseBomItemsTByBomItemId(String bomItemId) { - return baseBomItemsTMapper.selectBaseBomItemsTByBomItemId(bomItemId); - } - - /** - * 查询物料BOM管理列表 - * - * @param baseBomItemsT 物料BOM管理 - * @return 物料BOM管理 - */ - @Override - @DS("#header.poolName") - public List selectBaseBomItemsTList(BaseBomItemsT baseBomItemsT) { - return baseBomItemsTMapper.selectBaseBomItemsTList(baseBomItemsT); - } - - /** - * 新增物料BOM管理 - * - * @param baseBomItemsT 物料BOM管理 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertBaseBomItemsT(BaseBomItemsT baseBomItemsT) { - baseBomItemsT.setCreateTime(DateUtils.getNowDate()); - baseBomItemsT.setCreateBy(SecurityUtils.getUsername()); - return baseBomItemsTMapper.insertBaseBomItemsT(baseBomItemsT); - } - - /** - * 修改物料BOM管理 - * - * @param baseBomItemsT 物料BOM管理 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateBaseBomItemsT(BaseBomItemsT baseBomItemsT) { - baseBomItemsT.setUpdateTime(DateUtils.getNowDate()); - baseBomItemsT.setUpdateBy(SecurityUtils.getUsername()); - return baseBomItemsTMapper.updateBaseBomItemsT(baseBomItemsT); - } - - /** - * 批量删除物料BOM管理 - * - * @param bomItemIds 需要删除的物料BOM管理主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteBaseBomItemsTByBomItemIds(String[] bomItemIds) { - return baseBomItemsTMapper.deleteBaseBomItemsTByBomItemIds(bomItemIds); - } - - /** - * 删除物料BOM管理信息 - * - * @param bomItemId 物料BOM管理主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteBaseBomItemsTByBomItemId(String bomItemId) { - return baseBomItemsTMapper.deleteBaseBomItemsTByBomItemId(bomItemId); - } -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/MesPrepareDetailServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/MesPrepareDetailServiceImpl.java deleted file mode 100644 index bda7f3fc..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/MesPrepareDetailServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.op.mes.service.impl; - -import java.util.List; -import com.op.common.core.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.op.mes.mapper.MesPrepareDetailMapper; -import com.op.mes.domain.MesPrepareDetail; -import com.op.mes.service.IMesPrepareDetailService; - -/** - * mes备料单明细Service业务层处理 - * - * @author Open Platform - * @date 2023-08-04 - */ -@Service -public class MesPrepareDetailServiceImpl implements IMesPrepareDetailService { - @Autowired - private MesPrepareDetailMapper mesPrepareDetailMapper; - - /** - * 查询mes备料单明细 - * - * @param recordId mes备料单明细主键 - * @return mes备料单明细 - */ - @Override - public MesPrepareDetail selectMesPrepareDetailByRecordId(String recordId) { - return mesPrepareDetailMapper.selectMesPrepareDetailByRecordId(recordId); - } - - /** - * 查询mes备料单明细列表 - * - * @param mesPrepareDetail mes备料单明细 - * @return mes备料单明细 - */ - @Override - public List selectMesPrepareDetailList(MesPrepareDetail mesPrepareDetail) { - return mesPrepareDetailMapper.selectMesPrepareDetailList(mesPrepareDetail); - } - - /** - * 新增mes备料单明细 - * - * @param mesPrepareDetail mes备料单明细 - * @return 结果 - */ - @Override - public int insertMesPrepareDetail(MesPrepareDetail mesPrepareDetail) { - mesPrepareDetail.setCreateTime(DateUtils.getNowDate()); - return mesPrepareDetailMapper.insertMesPrepareDetail(mesPrepareDetail); - } - - /** - * 修改mes备料单明细 - * - * @param mesPrepareDetail mes备料单明细 - * @return 结果 - */ - @Override - public int updateMesPrepareDetail(MesPrepareDetail mesPrepareDetail) { - mesPrepareDetail.setUpdateTime(DateUtils.getNowDate()); - return mesPrepareDetailMapper.updateMesPrepareDetail(mesPrepareDetail); - } - - /** - * 批量删除mes备料单明细 - * - * @param recordIds 需要删除的mes备料单明细主键 - * @return 结果 - */ - @Override - public int deleteMesPrepareDetailByRecordIds(String[] recordIds) { - return mesPrepareDetailMapper.deleteMesPrepareDetailByRecordIds(recordIds); - } - - /** - * 删除mes备料单明细信息 - * - * @param recordId mes备料单明细主键 - * @return 结果 - */ - @Override - public int deleteMesPrepareDetailByRecordId(String recordId) { - return mesPrepareDetailMapper.deleteMesPrepareDetailByRecordId(recordId); - } -} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomItemsTMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomItemsTMapper.xml deleted file mode 100644 index 22aa10cb..00000000 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomItemsTMapper.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select BOM_Item_Id, BOM_Item_Desc, BOM_Formulation_Order, Bom_Formulation_Id, Prod_Id, Quantity, Precision, EU_Id, Lower_Tolerance, Lower_Tolerance_Precision, Upper_Tolerance, Upper_Tolerance_Precision, create_by, create_time, update_by, update_time, Active, Site_id, Site_code, Enterprise_Id, Enterprise_Code, FactoryNo, BESKZ, SOBSL, STUFE from base_bom_items_t - - - - - - - - insert into base_bom_items_t - - BOM_Item_Id, - BOM_Item_Desc, - BOM_Formulation_Order, - Bom_Formulation_Id, - Prod_Id, - Quantity, - Precision, - EU_Id, - Lower_Tolerance, - Lower_Tolerance_Precision, - Upper_Tolerance, - Upper_Tolerance_Precision, - create_by, - create_time, - update_by, - update_time, - Active, - Site_id, - Site_code, - Enterprise_Id, - Enterprise_Code, - FactoryNo, - BESKZ, - SOBSL, - STUFE, - - - #{bomItemId}, - #{bomItemDesc}, - #{bomFormulationOrder}, - #{bomFormulationId}, - #{prodId}, - #{Quantity}, - #{Precision}, - #{euId}, - #{lowerTolerance}, - #{lowerTolerancePrecision}, - #{upperTolerance}, - #{upperTolerancePrecision}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{Active}, - #{siteId}, - #{siteCode}, - #{enterpriseId}, - #{enterpriseCode}, - #{FactoryNo}, - #{BESKZ}, - #{SOBSL}, - #{STUFE}, - - - - - update base_bom_items_t - - BOM_Item_Desc = #{bomItemDesc}, - BOM_Formulation_Order = #{bomFormulationOrder}, - Bom_Formulation_Id = #{bomFormulationId}, - Prod_Id = #{prodId}, - Quantity = #{Quantity}, - Precision = #{Precision}, - EU_Id = #{euId}, - Lower_Tolerance = #{lowerTolerance}, - Lower_Tolerance_Precision = #{lowerTolerancePrecision}, - Upper_Tolerance = #{upperTolerance}, - Upper_Tolerance_Precision = #{upperTolerancePrecision}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - Active = #{Active}, - Site_id = #{siteId}, - Site_code = #{siteCode}, - Enterprise_Id = #{enterpriseId}, - Enterprise_Code = #{enterpriseCode}, - FactoryNo = #{FactoryNo}, - BESKZ = #{BESKZ}, - SOBSL = #{SOBSL}, - STUFE = #{STUFE}, - - where BOM_Item_Id = #{bomItemId} - - - - delete from base_bom_items_t where BOM_Item_Id = #{bomItemId} - - - - delete from base_bom_items_t where BOM_Item_Id in - - #{bomItemId} - - - \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/MesPrepareDetailMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/MesPrepareDetailMapper.xml deleted file mode 100644 index b9934f24..00000000 --- a/op-modules/op-wms/src/main/resources/mapper/wms/MesPrepareDetailMapper.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select record_id, prepare_id, material_code, materail_name, materail_spc, unit, quantity, product_date, shift_id, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, prod_type, factory_code from mes_prepare_detail - - - - - - - - insert into mes_prepare_detail - - record_id, - prepare_id, - material_code, - materail_name, - materail_spc, - unit, - quantity, - product_date, - shift_id, - status, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - prod_type, - factory_code, - - - #{recordId}, - #{prepareId}, - #{materialCode}, - #{materailName}, - #{materailSpc}, - #{unit}, - #{quantity}, - #{productDate}, - #{shiftId}, - #{status}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{prodType}, - #{factoryCode}, - - - - - update mes_prepare_detail - - prepare_id = #{prepareId}, - material_code = #{materialCode}, - materail_name = #{materailName}, - materail_spc = #{materailSpc}, - unit = #{unit}, - quantity = #{quantity}, - product_date = #{productDate}, - shift_id = #{shiftId}, - status = #{status}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - prod_type = #{prodType}, - factory_code = #{factoryCode}, - - where record_id = #{recordId} - - - - delete from mes_prepare_detail where record_id = #{recordId} - - - - delete from mes_prepare_detail where record_id in - - #{recordId} - - - \ No newline at end of file