From b5f14e9f37ac481411beff6cc2f3239454309118 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 18 Jun 2024 22:56:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9A=E9=87=8F=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/quality/QcStaticTableMapper.xml | 150 +++++++++--------- .../java/com/op/wms/domain/BaseProduct.java | 9 ++ .../mapper/wms/BaseProductMapper.xml | 8 +- 3 files changed, 92 insertions(+), 75 deletions(-) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 0e81d572..d1bcf9b8 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -310,86 +310,88 @@ GROUP by t.source_id diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index d6e9580b..3ce336b1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java @@ -351,6 +351,15 @@ public class BaseProduct extends BaseEntity { */ @Excel(name = "报工汇率") private BigDecimal reportRate; + private String mvgr5Nm; + + public String getMvgr5Nm() { + return mvgr5Nm; + } + + public void setMvgr5Nm(String mvgr5Nm) { + this.mvgr5Nm = mvgr5Nm; + } public void setCategory(String category) { this.category = category; diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 470477fd..901d8983 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -65,6 +65,8 @@ + + @@ -164,7 +166,7 @@ bp.append_flag, bp.append_percent, bp.mtart, - bp.report_rate, + bp.report_rate,bp.mvgr5_nm, bpa.id, bpa.category, bpa.pc, @@ -235,6 +237,7 @@ append_flag, append_percent, mtart, + mvgr5_nm, report_rate, @@ -281,6 +284,7 @@ #{appendFlag}, #{appendPercent}, #{mtart}, + #{mvgr5Nm}, #{reportRate}, @@ -329,6 +333,8 @@ append_flag = #{appendFlag}, append_percent = #{appendPercent}, mtart = #{mtart}, + mvgr5_nm = #{mvgr5Nm}, + report_rate = #{reportRate}, where product_id = #{productId} From abe3d2eefda6ef3d306c6fa9e8f35b342b09ef7b Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 21 Jun 2024 14:22:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2024-6-21=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F-=E8=AE=BE?= =?UTF-8?q?=E5=A4=87-=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/domain/WmsSparePartsLedger.java | 451 +++++++++--------- .../mapper/wms/BaseEquipmentMapper.xml | 38 +- 2 files changed, 224 insertions(+), 265 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSparePartsLedger.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSparePartsLedger.java index 79967e4b..8f5be604 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSparePartsLedger.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSparePartsLedger.java @@ -1,16 +1,16 @@ package com.op.wms.domain; +import java.math.BigDecimal; +import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; - -import java.math.BigDecimal; -import java.util.Date; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; /** - * 备品备件台账管理对象 wms_ods_mate_storage_news + * 备品备件台账管理对象 * * @author Open Platform * @date 2023-10-13 @@ -18,281 +18,298 @@ import java.util.Date; public class WmsSparePartsLedger extends BaseEntity { private static final long serialVersionUID = 1L; - /** - * 唯一序列 - */ @Excel(name = "唯一序列") private String storageId; - /** - * 仓库编码 - */ + @Excel(name = "备品备件编码") + //以前是物料编码 + private String materialCode; + + @Excel(name = "备品备件名称") + //以前是物料名称 + private String materialDesc; + + @Excel(name = "所属设备编码") + private String ownEquipmentCode; + + @Excel(name = "所属设备名称") + private String ownEquipmentName; + + @Excel(name = "设备厂家") + //以前是供应商 + private String spareSupplier; + + @Excel(name = "规格型号") + private String spareMode; + + @Excel(name = "单机装配数量") + private String unitQuantity; + + @Excel(name = "单价") + private BigDecimal unitPrice; + + @Excel(name = "单位") + private String userDefined1; + + @Excel(name = "代用件") + private String substituteParts; + + @Excel(name = "安全库存") + private String safeStock; + + @Excel(name = "现有库存") + //以前是总数量 + private BigDecimal amount; + + @Excel(name = "采购方式") + private String procurementMethod; + + @Excel(name = "更换周期（月）") + private String spareReplacementCycle; + + @Excel(name = "采购周期（天）") + private String procurementCycle; + + @Excel(name = "期初结存") + private String openingBalance; + + @Excel(name = "出库记录") + private String outputRecords; + + @Excel(name = "入库记录") + private String inputRecords; + + @Excel(name = "期末盘点") + private String endInventory; + + @Excel(name = "期末金额") + private BigDecimal endMoney; + + @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; + + @Excel(name = "工厂号") + private String factoryCode; + + private String delFlag; + + ///////////////////////////////////////暂时不用字段 + @Excel(name = "仓库编码") private String whCode; - /** - * 区域编号 - */ @Excel(name = "区域编号") private String regionCode; - /** - * 库区编码 - */ @Excel(name = "库区编码") private String waCode; - /** - * 库存类型：BC－包材 - */ @Excel(name = "库存类型：BC－包材") private String storageType; - /** - * 库位编码 - */ @Excel(name = "库位编码") private String wlCode; - /** - * 物料号 - */ - @Excel(name = "物料号") - private String materialCode; - - /** - * 物料描述 - */ - @Excel(name = "物料描述") - private String materialDesc; - - /** - * 总数量 - */ - @Excel(name = "总数量") - private BigDecimal amount; - - /** - * 冻结数量（预留） - */ @Excel(name = "冻结数量", readConverterExp = "预=留") private BigDecimal storageAmount; - /** - * 占用数量 - */ + //虚拟字段 + /** 库存可用数量 */ +// @Excel(name = "库存可用数量") +// private BigDecimal availableQuantity; + @Excel(name = "占用数量") private BigDecimal occupyAmount; - /** - * LPN（预留） - */ @Excel(name = "LPN", readConverterExp = "预=留") private String lpn; - /** - * 入库批次号（预留） - */ @Excel(name = "入库批次号", readConverterExp = "预=留") private String productBatch; - /** - * 入库时间x（预留） - */ @Excel(name = "入库时间x", readConverterExp = "预=留") private Date receiveDate; - /** - * 生产时间（预留） - */ @Excel(name = "生产时间", readConverterExp = "预=留") private Date productDate; - /** - * 单位 - */ - @Excel(name = "单位") - private String userDefined1; - - /** - * SAP库位 - */ @Excel(name = "SAP库位") 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; - - /** - * 工厂号 - */ - @Excel(name = "工厂号") - private String factoryCode; - - /** - * SAP工厂号 - */ @Excel(name = "SAP工厂号") private String sapFactoryCode; - /** - * 库位名称 - */ @Excel(name = "库位名称") private String wlName; - /** - * 0存在 - */ - private String delFlag; - - /** - * 使用寿命（备件用） - */ - @Excel(name = "使用寿命", readConverterExp = "备=件用") + @Excel(name = "使用寿命") private String spareUseLife; - /** - * 备件名称（备件用） - */ - @Excel(name = "备件名称", readConverterExp = "备=件用") + @Excel(name = "备件名称") private String spareName; - /** - * 规格型号（备件用） - */ - @Excel(name = "规格型号", readConverterExp = "备=件用") - private String spareMode; - - /** - * 生产厂商（备件用） - */ - @Excel(name = "生产厂商", readConverterExp = "备=件用") + @Excel(name = "生产厂商") private String spareManufacturer; - /** - * 供应商（备件用） - */ - @Excel(name = "供应商", readConverterExp = "备=件用") - private String spareSupplier; - - /** - * 循环周期（备件用） - */ - @Excel(name = "循环周期", readConverterExp = "备=件用") - private String spareReplacementCycle; - - /** - * 计量单位（备件用） - */ - @Excel(name = "计量单位", readConverterExp = "备=件用") + @Excel(name = "计量单位") private String spareMeasurementUnit; - /** - * 换算单位（备件用） - */ - @Excel(name = "换算单位", readConverterExp = "备=件用") + @Excel(name = "换算单位") private String spareConversionUnit; - /** - * 换算比例（备件用） - */ - @Excel(name = "换算比例", readConverterExp = "备=件用") + @Excel(name = "换算比例") private String spareConversionRatio; - /** - * 库存上限（备件用） - */ - @Excel(name = "库存上限", readConverterExp = "备=件用") + @Excel(name = "库存上限") private String spareInventoryFloor; - /** - * 库存下限（备件用） - */ - @Excel(name = "库存下限", readConverterExp = "备=件用") + @Excel(name = "库存下限") private String spareInventoryUpper; - /** - * 备件类型 - */ - @Excel(name = "备件类型", readConverterExp = "备=件用") + @Excel(name = "备件类型") private String spareType; +//////////////////////////////////////////////////////////附属表 + + public void setOwnEquipmentName(String ownEquipmentName) { + this.ownEquipmentName = ownEquipmentName; + } + public String getOwnEquipmentName() { + return ownEquipmentName; + } + + public void setUnitQuantity(String unitQuantity) { + this.unitQuantity = unitQuantity; + } + public String getUnitQuantity() { + return unitQuantity; + } + + public void setSafeStock(String safeStock) { + this.safeStock = safeStock; + } + public String getSafeStock() { + return safeStock; + } + + public void setUnitPrice(BigDecimal unitPrice) { + this.unitPrice = unitPrice; + } + public BigDecimal getUnitPrice() { + return unitPrice; + } + + public void setProcurementMethod(String procurementMethod) { + this.procurementMethod = procurementMethod; + } + public String getProcurementMethod() { + return procurementMethod; + } + + public void setProcurementCycle(String procurementCycle) { + this.procurementCycle = procurementCycle; + } + public String getProcurementCycle() { + return procurementCycle; + } + + public void setOpeningBalance(String openingBalance) { + this.openingBalance = openingBalance; + } + public String getOpeningBalance() { + return openingBalance; + } + + public void setOutputRecords(String outputRecords) { + this.outputRecords = outputRecords; + } + public String getOutputRecords() { + return outputRecords; + } + + public void setInputRecords(String inputRecords) { + this.inputRecords = inputRecords; + } + public String getInputRecords() { + return inputRecords; + } + + public void setEndInventory(String endInventory) { + this.endInventory = endInventory; + } + public String getEndInventory() { + return endInventory; + } + + public void setEndMoney(BigDecimal endMoney) { + this.endMoney = endMoney; + } + public BigDecimal getEndMoney() { + return endMoney; + } + + public void setSubstituteParts(String substituteParts) { + this.substituteParts = substituteParts; + } + public String getSubstituteParts() { + return substituteParts; + } + + public void setOwnEquipmentCode(String ownEquipmentCode) { + this.ownEquipmentCode = ownEquipmentCode; + } + public String getOwnEquipmentCode() { + return ownEquipmentCode; + } + + // 领用数量-保养备件领用使用 + private BigDecimal applyNum; + + public BigDecimal getApplyNum() { + return applyNum; + } + public void setApplyNum(BigDecimal applyNum) { + this.applyNum = applyNum; + } + public void setSpareType(String spareType) { this.spareType = spareType; } - public String getSpareType() { return spareType; } @@ -300,7 +317,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setStorageId(String storageId) { this.storageId = storageId; } - public String getStorageId() { return storageId; } @@ -308,7 +324,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setWhCode(String whCode) { this.whCode = whCode; } - public String getWhCode() { return whCode; } @@ -316,7 +331,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setRegionCode(String regionCode) { this.regionCode = regionCode; } - public String getRegionCode() { return regionCode; } @@ -324,7 +338,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setWaCode(String waCode) { this.waCode = waCode; } - public String getWaCode() { return waCode; } @@ -332,7 +345,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setStorageType(String storageType) { this.storageType = storageType; } - public String getStorageType() { return storageType; } @@ -340,7 +352,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setWlCode(String wlCode) { this.wlCode = wlCode; } - public String getWlCode() { return wlCode; } @@ -348,7 +359,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setMaterialCode(String materialCode) { this.materialCode = materialCode; } - public String getMaterialCode() { return materialCode; } @@ -356,7 +366,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setMaterialDesc(String materialDesc) { this.materialDesc = materialDesc; } - public String getMaterialDesc() { return materialDesc; } @@ -364,7 +373,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setAmount(BigDecimal amount) { this.amount = amount; } - public BigDecimal getAmount() { return amount; } @@ -372,15 +380,21 @@ public class WmsSparePartsLedger extends BaseEntity { public void setStorageAmount(BigDecimal storageAmount) { this.storageAmount = storageAmount; } - public BigDecimal getStorageAmount() { return storageAmount; } + //库存可用数量 虚拟字段 +// public void setAvailableQuantity(BigDecimal availableQuantity) { +// this.availableQuantity = availableQuantity; +// } +// public BigDecimal getAvailableQuantity() { +// return availableQuantity; +// } + public void setOccupyAmount(BigDecimal occupyAmount) { this.occupyAmount = occupyAmount; } - public BigDecimal getOccupyAmount() { return occupyAmount; } @@ -388,7 +402,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setLpn(String lpn) { this.lpn = lpn; } - public String getLpn() { return lpn; } @@ -396,7 +409,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setProductBatch(String productBatch) { this.productBatch = productBatch; } - public String getProductBatch() { return productBatch; } @@ -404,7 +416,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setReceiveDate(Date receiveDate) { this.receiveDate = receiveDate; } - public Date getReceiveDate() { return receiveDate; } @@ -412,7 +423,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setProductDate(Date productDate) { this.productDate = productDate; } - public Date getProductDate() { return productDate; } @@ -420,7 +430,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined1(String userDefined1) { this.userDefined1 = userDefined1; } - public String getUserDefined1() { return userDefined1; } @@ -428,7 +437,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined2(String userDefined2) { this.userDefined2 = userDefined2; } - public String getUserDefined2() { return userDefined2; } @@ -436,7 +444,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined3(String userDefined3) { this.userDefined3 = userDefined3; } - public String getUserDefined3() { return userDefined3; } @@ -444,7 +451,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined4(String userDefined4) { this.userDefined4 = userDefined4; } - public String getUserDefined4() { return userDefined4; } @@ -452,7 +458,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined5(String userDefined5) { this.userDefined5 = userDefined5; } - public String getUserDefined5() { return userDefined5; } @@ -460,7 +465,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined6(String userDefined6) { this.userDefined6 = userDefined6; } - public String getUserDefined6() { return userDefined6; } @@ -468,7 +472,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined7(String userDefined7) { this.userDefined7 = userDefined7; } - public String getUserDefined7() { return userDefined7; } @@ -476,7 +479,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined8(String userDefined8) { this.userDefined8 = userDefined8; } - public String getUserDefined8() { return userDefined8; } @@ -484,7 +486,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined9(String userDefined9) { this.userDefined9 = userDefined9; } - public String getUserDefined9() { return userDefined9; } @@ -492,7 +493,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setUserDefined10(String userDefined10) { this.userDefined10 = userDefined10; } - public String getUserDefined10() { return userDefined10; } @@ -500,7 +500,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; } - public Date getGmtCreate() { return gmtCreate; } @@ -508,7 +507,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setLastModifiedBy(String lastModifiedBy) { this.lastModifiedBy = lastModifiedBy; } - public String getLastModifiedBy() { return lastModifiedBy; } @@ -516,7 +514,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setGmtModified(Date gmtModified) { this.gmtModified = gmtModified; } - public Date getGmtModified() { return gmtModified; } @@ -524,7 +521,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setActiveFlag(String activeFlag) { this.activeFlag = activeFlag; } - public String getActiveFlag() { return activeFlag; } @@ -532,7 +528,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setFactoryCode(String factoryCode) { this.factoryCode = factoryCode; } - public String getFactoryCode() { return factoryCode; } @@ -540,7 +535,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSapFactoryCode(String sapFactoryCode) { this.sapFactoryCode = sapFactoryCode; } - public String getSapFactoryCode() { return sapFactoryCode; } @@ -548,7 +542,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setWlName(String wlName) { this.wlName = wlName; } - public String getWlName() { return wlName; } @@ -556,7 +549,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() { return delFlag; } @@ -564,7 +556,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareUseLife(String spareUseLife) { this.spareUseLife = spareUseLife; } - public String getSpareUseLife() { return spareUseLife; } @@ -572,7 +563,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareName(String spareName) { this.spareName = spareName; } - public String getSpareName() { return spareName; } @@ -580,7 +570,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareMode(String spareMode) { this.spareMode = spareMode; } - public String getSpareMode() { return spareMode; } @@ -588,7 +577,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareManufacturer(String spareManufacturer) { this.spareManufacturer = spareManufacturer; } - public String getSpareManufacturer() { return spareManufacturer; } @@ -596,7 +584,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareSupplier(String spareSupplier) { this.spareSupplier = spareSupplier; } - public String getSpareSupplier() { return spareSupplier; } @@ -604,7 +591,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareReplacementCycle(String spareReplacementCycle) { this.spareReplacementCycle = spareReplacementCycle; } - public String getSpareReplacementCycle() { return spareReplacementCycle; } @@ -612,7 +598,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareMeasurementUnit(String spareMeasurementUnit) { this.spareMeasurementUnit = spareMeasurementUnit; } - public String getSpareMeasurementUnit() { return spareMeasurementUnit; } @@ -620,7 +605,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareConversionUnit(String spareConversionUnit) { this.spareConversionUnit = spareConversionUnit; } - public String getSpareConversionUnit() { return spareConversionUnit; } @@ -628,7 +612,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareConversionRatio(String spareConversionRatio) { this.spareConversionRatio = spareConversionRatio; } - public String getSpareConversionRatio() { return spareConversionRatio; } @@ -636,7 +619,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareInventoryFloor(String spareInventoryFloor) { this.spareInventoryFloor = spareInventoryFloor; } - public String getSpareInventoryFloor() { return spareInventoryFloor; } @@ -644,7 +626,6 @@ public class WmsSparePartsLedger extends BaseEntity { public void setSpareInventoryUpper(String spareInventoryUpper) { this.spareInventoryUpper = spareInventoryUpper; } - public String getSpareInventoryUpper() { return spareInventoryUpper; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index f5bce14a..49d20be1 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -59,33 +59,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -471,9 +444,14 @@ group by equipment_type_code,equipment_type_name - + select + storage_id AS storageId, + storage_type AS storageType, + material_code AS materialCode, + material_desc AS materialDesc, + amount AS amount + from equ_spareparts_ledger where del_flag = '0' From 13f1fc2d225c4d75a68c47cb407ac997db33953c Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 21 Jun 2024 14:51:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?2024-6-21=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=AF=BC?= =?UTF-8?q?=E5=85=A5-=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E9=99=90?= =?UTF-8?q?=E5=88=B6=EF=BC=8C=E5=8F=AA=E7=95=99=E4=B8=8B=E5=9B=9B=E4=B8=AA?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SparePartsLedgerServiceImpl.java | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java index 9ecfd3d1..5f6a9115 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java @@ -1,5 +1,6 @@ package com.op.device.service.impl; +import java.math.BigDecimal; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; @@ -171,49 +172,49 @@ public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService { return error(500, "备品备件名称不能为空！信息导入失败！"); } // 所属设备编码 - if (table.getOwnEquipmentCode().isEmpty() || table.getOwnEquipmentCode() == null) { - return error(500, "所属设备编码不能为空！信息导入失败！"); - } +// if (table.getOwnEquipmentCode().isEmpty() || table.getOwnEquipmentCode() == null) { +// return error(500, "所属设备编码不能为空！信息导入失败！"); +// } // 所属设备名称 - if (table.getOwnEquipmentName().isEmpty() || table.getOwnEquipmentName() == null) { - return error(500, "所属设备名称不能为空！信息导入失败！"); - } +// if (table.getOwnEquipmentName().isEmpty() || table.getOwnEquipmentName() == null) { +// return error(500, "所属设备名称不能为空！信息导入失败！"); +// } // 设备厂家 - if (table.getSpareSupplier().isEmpty() || table.getSpareSupplier() == null) { - return error(500, "设备厂家不能为空！信息导入失败！"); - } +// if (table.getSpareSupplier().isEmpty() || table.getSpareSupplier() == null) { +// return error(500, "设备厂家不能为空！信息导入失败！"); +// } // 规格型号 - if (table.getSpareMode().isEmpty() || table.getSpareMode() == null) { - return error(500, "规格型号不能为空！信息导入失败！"); - } +// if (table.getSpareMode().isEmpty() || table.getSpareMode() == null) { +// return error(500, "规格型号不能为空！信息导入失败！"); +// } // 单机装配数量 - if (table.getUnitQuantity().isEmpty() || table.getUnitQuantity() == null) { - return error(500, "单机装配数量不能为空！信息导入失败！"); - } +// if (table.getUnitQuantity().isEmpty() || table.getUnitQuantity() == null) { +// return error(500, "单机装配数量不能为空！信息导入失败！"); +// } // 单价 - if (table.getUnitPrice().toString().isEmpty() || table.getUnitPrice() == null) { - return error(500, "单价不能为空！信息导入失败！"); - } +// if (table.getUnitPrice().toString().isEmpty() || table.getUnitPrice() == null) { +// return error(500, "单价不能为空！信息导入失败！"); +// } // 安全库存 - if (table.getSafeStock().isEmpty() || table.getSafeStock() == null) { - return error(500, "安全库存不能为空！信息导入失败！"); - } +// if (table.getSafeStock().isEmpty() || table.getSafeStock() == null) { +// return error(500, "安全库存不能为空！信息导入失败！"); +// } // 现有库存 - if (table.getAmount().toString().isEmpty() || table.getAmount() == null) { - return error(500, "现有库存不能为空！信息导入失败！"); + if (table.getAmount() == null || table.getAmount().compareTo(BigDecimal.ZERO) < 0) { + return error(500, "现有库存不能为空,或者小于0！信息导入失败！"); } // 采购方式 if (table.getProcurementMethod().isEmpty() || table.getProcurementMethod() == null) { return error(500, "采购方式不能为空！信息导入失败！"); } // 更换周期（月） - if (table.getSpareReplacementCycle().toString().isEmpty() || table.getSpareReplacementCycle() == null) { - return error(500, "更换周期不能为空！信息导入失败！"); - } +// if (table.getSpareReplacementCycle().toString().isEmpty() || table.getSpareReplacementCycle() == null) { +// return error(500, "更换周期不能为空！信息导入失败！"); +// } // 采购周期（天） - if (table.getProcurementCycle().toString().isEmpty() || table.getProcurementCycle() == null) { - return error(500, "采购周期不能为空！信息导入失败！"); - } +// if (table.getProcurementCycle().toString().isEmpty() || table.getProcurementCycle() == null) { +// return error(500, "采购周期不能为空！信息导入失败！"); +// } } return success(); }