diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.java b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.java index a431f0e0..0605a953 100644 --- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.java +++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.java @@ -15,6 +15,9 @@ public class InventoryEntity extends BaseEntity { //存货自由项 private InventoryExtEntity invExtEntity; + //存货副表 + private InventorySubEntity invSubEntity; + /** 无备注 */ private String cInvCode; /** 无备注 */ @@ -2590,4 +2593,12 @@ public class InventoryEntity extends BaseEntity { public void setiOldpartMngRule(Integer iOldpartMngRule) { this.iOldpartMngRule = iOldpartMngRule; } + + public InventorySubEntity getInvSubEntity() { + return invSubEntity; + } + + public void setInvSubEntity(InventorySubEntity invSubEntity) { + this.invSubEntity = invSubEntity; + } } diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryExtEntity.xml b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryExtEntity.xml index dc2b505e..c1cf1bff 100644 --- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryExtEntity.xml +++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryExtEntity.xml @@ -1,7 +1,7 @@ - + @@ -35,7 +35,7 @@ - select from Inventory_extradefine @@ -54,7 +54,7 @@ - select count(1) from Inventory_extradefine cInvCode = #{cInvCode} @@ -70,7 +70,7 @@ - select from Inventory_extradefine @@ -88,7 +88,7 @@ - select from Inventory_extradefine @@ -105,7 +105,7 @@ - + insert into Inventory_extradefine( cInvCode, @@ -133,7 +133,7 @@ - + update Inventory_extradefine set cInvCode = #{cInvCode}, diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventorySubEntity.java b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventorySubEntity.java index 6ab2a4ab..039a1579 100644 --- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventorySubEntity.java +++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventorySubEntity.java @@ -1,6 +1,10 @@ package com.hzya.frame.u8.base.inventory.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.hzya.frame.web.entity.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * @Description 存货档案子表 @@ -9,12 +13,238 @@ import com.hzya.frame.web.entity.BaseEntity; **/ public class InventorySubEntity extends BaseEntity { - private String cInvSubCode;//存货编码 - private String bInvKeyPart;//是否关键物料 1是关键物料，0不是 + /** 无备注 */ + private String cInvSubCode; + /** 无备注 */ + private String fBuyExcess; + /** 无备注 */ + private String iSurenessType; + /** 无备注 */ + private String iDateType; + /** 无备注 */ + private String iDateSum; + /** 无备注 */ + private String iDynamicSurenessType; + /** 无备注 */ + private String iBestrowSum; + /** 无备注 */ + private String iPercentumSum; + /** 无备注 */ + private String bIsAttachFile; + /** 无备注 */ + private String bInByProCheck; + /** 无备注 */ + private String iRequireTrackStyle; + /** 无备注 */ + private String iExpiratDateCalcu; + /** 无备注 */ + private String iBOMExpandUnitType; + /** 无备注 */ + private String bPurPriceFree1; + /** 无备注 */ + private String bPurPriceFree2; + /** 无备注 */ + private String bPurPriceFree3; + /** 无备注 */ + private String bPurPriceFree4; + /** 无备注 */ + private String bPurPriceFree5; + /** 无备注 */ + private String bPurPriceFree6; + /** 无备注 */ + private String bPurPriceFree7; + /** 无备注 */ + private String bPurPriceFree8; + /** 无备注 */ + private String bPurPriceFree9; + /** 无备注 */ + private String bPurPriceFree10; + /** 无备注 */ + private String bOMPriceFree1; + /** 无备注 */ + private String bOMPriceFree2; + /** 无备注 */ + private String bOMPriceFree3; + /** 无备注 */ + private String bOMPriceFree4; + /** 无备注 */ + private String bOMPriceFree5; + /** 无备注 */ + private String bOMPriceFree6; + /** 无备注 */ + private String bOMPriceFree7; + /** 无备注 */ + private String bOMPriceFree8; + /** 无备注 */ + private String bOMPriceFree9; + /** 无备注 */ + private String bOMPriceFree10; + /** 无备注 */ + private String bSalePriceFree1; + /** 无备注 */ + private String bSalePriceFree2; + /** 无备注 */ + private String bSalePriceFree3; + /** 无备注 */ + private String bSalePriceFree4; + /** 无备注 */ + private String bSalePriceFree5; + /** 无备注 */ + private String bSalePriceFree6; + /** 无备注 */ + private String bSalePriceFree7; + /** 无备注 */ + private String bSalePriceFree8; + /** 无备注 */ + private String bSalePriceFree9; + /** 无备注 */ + private String bSalePriceFree10; + /** 无备注 */ + private String fInvOutUpLimit; + /** 无备注 */ + private String bBondedInv; + /** 无备注 */ + private String bBatchCreate; + /** 无备注 */ + private String bBatchProperty1; + /** 无备注 */ + private String bBatchProperty2; + /** 无备注 */ + private String bBatchProperty3; + /** 无备注 */ + private String bBatchProperty4; + /** 无备注 */ + private String bBatchProperty5; + /** 无备注 */ + private String bBatchProperty6; + /** 无备注 */ + private String bBatchProperty7; + /** 无备注 */ + private String bBatchProperty8; + /** 无备注 */ + private String bBatchProperty9; + /** 无备注 */ + private String bBatchProperty10; + /** 无备注 */ + private String bControlFreeRange1; + /** 无备注 */ + private String bControlFreeRange2; + /** 无备注 */ + private String bControlFreeRange3; + /** 无备注 */ + private String bControlFreeRange4; + /** 无备注 */ + private String bControlFreeRange5; + /** 无备注 */ + private String bControlFreeRange6; + /** 无备注 */ + private String bControlFreeRange7; + /** 无备注 */ + private String bControlFreeRange8; + /** 无备注 */ + private String bControlFreeRange9; + /** 无备注 */ + private String bControlFreeRange10; + /** 无备注 */ + private String fInvCIQExch; + /** 无备注 */ + private String iWarrantyPeriod; + /** 无备注 */ + private String iWarrantyUnit; + /** 无备注 */ + private String bInvKeyPart; + /** 无备注 */ + private String iAcceptEarlyDays; + /** 无备注 */ + private String fProcessCost; + /** 无备注 */ + private String fCurLLaborCost; + /** 无备注 */ + private String fCurLVarManuCost; + /** 无备注 */ + private String fCurLFixManuCost; + /** 无备注 */ + private String fCurLOMCost; + /** 无备注 */ + private String fNextLLaborCost; + /** 无备注 */ + private String fNextLVarManuCost; + /** 无备注 */ + private String fNextLFixManuCost; + /** 无备注 */ + private String fNextLOMCost; - private String planCheckDay;//计划检验天数 - private String dInvCreateDatetime;//建档日期 - private String iDrawType;//领料方式 + private String dInvCreateDatetime; + /** 无备注 */ + private String cInvAppDocNo; + /** 无备注 */ + private String bPUQuota; + /** 无备注 */ + private String bInvROHS; + /** 无备注 */ + private String bPrjMat; + /** 无备注 */ + private String fPrjMatLimit; + /** 无备注 */ + private String bInvAsset; + /** 无备注 */ + private String bSrvProduct; + /** 无备注 */ + private String iAcceptDelayDays; + /** 无备注 */ + private String iPlanCheckDay; + /** 无备注 */ + private String iMaterialsCycle; + /** 无备注 */ + private String iDrawType; + /** 无备注 */ + private String bSCkeyProjections; + /** 无备注 */ + private String iSupplyPeriodType; + /** 无备注 */ + private String iTimeBucketId; + /** 无备注 */ + private String iAvailabilityDate; + /** 无备注 */ + private String fMaterialCost; + /** 无备注 */ + private String bImport; + /** 无备注 */ + private String iNearRejectDays; + /** 无备注 */ + private String bCheckSubitemCost; + /** 无备注 */ + private String fRoundFactor; + /** 无备注 */ + private String bConsiderFreeStock; + /** 无备注 */ + private String bSuitRetail; + /** 无备注 */ + private String bFeatureMatch; + /** 无备注 */ + private String bProduceByFeatureAllocate; + /** 无备注 */ + private String bMaintenance; + /** 无备注 */ + private String iMaintenanceCycle; + /** 无备注 */ + private String iMaintenanceCycleUnit; + /** 无备注 */ + private String bCoupon; + /** 无备注 */ + private String bStoreCard; + /** 无备注 */ + private String bProcessProduct; + /** 无备注 */ + private String bProcessMaterial; + + public String getiPlanCheckDay() { + return iPlanCheckDay; + } + + public void setiPlanCheckDay(String iPlanCheckDay) { + this.iPlanCheckDay = iPlanCheckDay; + } public String getcInvSubCode() { return cInvSubCode; @@ -24,6 +254,550 @@ public class InventorySubEntity extends BaseEntity { this.cInvSubCode = cInvSubCode; } + public String getfBuyExcess() { + return fBuyExcess; + } + + public void setfBuyExcess(String fBuyExcess) { + this.fBuyExcess = fBuyExcess; + } + + public String getiSurenessType() { + return iSurenessType; + } + + public void setiSurenessType(String iSurenessType) { + this.iSurenessType = iSurenessType; + } + + public String getiDateType() { + return iDateType; + } + + public void setiDateType(String iDateType) { + this.iDateType = iDateType; + } + + public String getiDateSum() { + return iDateSum; + } + + public void setiDateSum(String iDateSum) { + this.iDateSum = iDateSum; + } + + public String getiDynamicSurenessType() { + return iDynamicSurenessType; + } + + public void setiDynamicSurenessType(String iDynamicSurenessType) { + this.iDynamicSurenessType = iDynamicSurenessType; + } + + public String getiBestrowSum() { + return iBestrowSum; + } + + public void setiBestrowSum(String iBestrowSum) { + this.iBestrowSum = iBestrowSum; + } + + public String getiPercentumSum() { + return iPercentumSum; + } + + public void setiPercentumSum(String iPercentumSum) { + this.iPercentumSum = iPercentumSum; + } + + public String getbIsAttachFile() { + return bIsAttachFile; + } + + public void setbIsAttachFile(String bIsAttachFile) { + this.bIsAttachFile = bIsAttachFile; + } + + public String getbInByProCheck() { + return bInByProCheck; + } + + public void setbInByProCheck(String bInByProCheck) { + this.bInByProCheck = bInByProCheck; + } + + public String getiRequireTrackStyle() { + return iRequireTrackStyle; + } + + public void setiRequireTrackStyle(String iRequireTrackStyle) { + this.iRequireTrackStyle = iRequireTrackStyle; + } + + public String getiExpiratDateCalcu() { + return iExpiratDateCalcu; + } + + public void setiExpiratDateCalcu(String iExpiratDateCalcu) { + this.iExpiratDateCalcu = iExpiratDateCalcu; + } + + public String getiBOMExpandUnitType() { + return iBOMExpandUnitType; + } + + public void setiBOMExpandUnitType(String iBOMExpandUnitType) { + this.iBOMExpandUnitType = iBOMExpandUnitType; + } + + public String getbPurPriceFree1() { + return bPurPriceFree1; + } + + public void setbPurPriceFree1(String bPurPriceFree1) { + this.bPurPriceFree1 = bPurPriceFree1; + } + + public String getbPurPriceFree2() { + return bPurPriceFree2; + } + + public void setbPurPriceFree2(String bPurPriceFree2) { + this.bPurPriceFree2 = bPurPriceFree2; + } + + public String getbPurPriceFree3() { + return bPurPriceFree3; + } + + public void setbPurPriceFree3(String bPurPriceFree3) { + this.bPurPriceFree3 = bPurPriceFree3; + } + + public String getbPurPriceFree4() { + return bPurPriceFree4; + } + + public void setbPurPriceFree4(String bPurPriceFree4) { + this.bPurPriceFree4 = bPurPriceFree4; + } + + public String getbPurPriceFree5() { + return bPurPriceFree5; + } + + public void setbPurPriceFree5(String bPurPriceFree5) { + this.bPurPriceFree5 = bPurPriceFree5; + } + + public String getbPurPriceFree6() { + return bPurPriceFree6; + } + + public void setbPurPriceFree6(String bPurPriceFree6) { + this.bPurPriceFree6 = bPurPriceFree6; + } + + public String getbPurPriceFree7() { + return bPurPriceFree7; + } + + public void setbPurPriceFree7(String bPurPriceFree7) { + this.bPurPriceFree7 = bPurPriceFree7; + } + + public String getbPurPriceFree8() { + return bPurPriceFree8; + } + + public void setbPurPriceFree8(String bPurPriceFree8) { + this.bPurPriceFree8 = bPurPriceFree8; + } + + public String getbPurPriceFree9() { + return bPurPriceFree9; + } + + public void setbPurPriceFree9(String bPurPriceFree9) { + this.bPurPriceFree9 = bPurPriceFree9; + } + + public String getbPurPriceFree10() { + return bPurPriceFree10; + } + + public void setbPurPriceFree10(String bPurPriceFree10) { + this.bPurPriceFree10 = bPurPriceFree10; + } + + public String getbOMPriceFree1() { + return bOMPriceFree1; + } + + public void setbOMPriceFree1(String bOMPriceFree1) { + this.bOMPriceFree1 = bOMPriceFree1; + } + + public String getbOMPriceFree2() { + return bOMPriceFree2; + } + + public void setbOMPriceFree2(String bOMPriceFree2) { + this.bOMPriceFree2 = bOMPriceFree2; + } + + public String getbOMPriceFree3() { + return bOMPriceFree3; + } + + public void setbOMPriceFree3(String bOMPriceFree3) { + this.bOMPriceFree3 = bOMPriceFree3; + } + + public String getbOMPriceFree4() { + return bOMPriceFree4; + } + + public void setbOMPriceFree4(String bOMPriceFree4) { + this.bOMPriceFree4 = bOMPriceFree4; + } + + public String getbOMPriceFree5() { + return bOMPriceFree5; + } + + public void setbOMPriceFree5(String bOMPriceFree5) { + this.bOMPriceFree5 = bOMPriceFree5; + } + + public String getbOMPriceFree6() { + return bOMPriceFree6; + } + + public void setbOMPriceFree6(String bOMPriceFree6) { + this.bOMPriceFree6 = bOMPriceFree6; + } + + public String getbOMPriceFree7() { + return bOMPriceFree7; + } + + public void setbOMPriceFree7(String bOMPriceFree7) { + this.bOMPriceFree7 = bOMPriceFree7; + } + + public String getbOMPriceFree8() { + return bOMPriceFree8; + } + + public void setbOMPriceFree8(String bOMPriceFree8) { + this.bOMPriceFree8 = bOMPriceFree8; + } + + public String getbOMPriceFree9() { + return bOMPriceFree9; + } + + public void setbOMPriceFree9(String bOMPriceFree9) { + this.bOMPriceFree9 = bOMPriceFree9; + } + + public String getbOMPriceFree10() { + return bOMPriceFree10; + } + + public void setbOMPriceFree10(String bOMPriceFree10) { + this.bOMPriceFree10 = bOMPriceFree10; + } + + public String getbSalePriceFree1() { + return bSalePriceFree1; + } + + public void setbSalePriceFree1(String bSalePriceFree1) { + this.bSalePriceFree1 = bSalePriceFree1; + } + + public String getbSalePriceFree2() { + return bSalePriceFree2; + } + + public void setbSalePriceFree2(String bSalePriceFree2) { + this.bSalePriceFree2 = bSalePriceFree2; + } + + public String getbSalePriceFree3() { + return bSalePriceFree3; + } + + public void setbSalePriceFree3(String bSalePriceFree3) { + this.bSalePriceFree3 = bSalePriceFree3; + } + + public String getbSalePriceFree4() { + return bSalePriceFree4; + } + + public void setbSalePriceFree4(String bSalePriceFree4) { + this.bSalePriceFree4 = bSalePriceFree4; + } + + public String getbSalePriceFree5() { + return bSalePriceFree5; + } + + public void setbSalePriceFree5(String bSalePriceFree5) { + this.bSalePriceFree5 = bSalePriceFree5; + } + + public String getbSalePriceFree6() { + return bSalePriceFree6; + } + + public void setbSalePriceFree6(String bSalePriceFree6) { + this.bSalePriceFree6 = bSalePriceFree6; + } + + public String getbSalePriceFree7() { + return bSalePriceFree7; + } + + public void setbSalePriceFree7(String bSalePriceFree7) { + this.bSalePriceFree7 = bSalePriceFree7; + } + + public String getbSalePriceFree8() { + return bSalePriceFree8; + } + + public void setbSalePriceFree8(String bSalePriceFree8) { + this.bSalePriceFree8 = bSalePriceFree8; + } + + public String getbSalePriceFree9() { + return bSalePriceFree9; + } + + public void setbSalePriceFree9(String bSalePriceFree9) { + this.bSalePriceFree9 = bSalePriceFree9; + } + + public String getbSalePriceFree10() { + return bSalePriceFree10; + } + + public void setbSalePriceFree10(String bSalePriceFree10) { + this.bSalePriceFree10 = bSalePriceFree10; + } + + public String getfInvOutUpLimit() { + return fInvOutUpLimit; + } + + public void setfInvOutUpLimit(String fInvOutUpLimit) { + this.fInvOutUpLimit = fInvOutUpLimit; + } + + public String getbBondedInv() { + return bBondedInv; + } + + public void setbBondedInv(String bBondedInv) { + this.bBondedInv = bBondedInv; + } + + public String getbBatchCreate() { + return bBatchCreate; + } + + public void setbBatchCreate(String bBatchCreate) { + this.bBatchCreate = bBatchCreate; + } + + public String getbBatchProperty1() { + return bBatchProperty1; + } + + public void setbBatchProperty1(String bBatchProperty1) { + this.bBatchProperty1 = bBatchProperty1; + } + + public String getbBatchProperty2() { + return bBatchProperty2; + } + + public void setbBatchProperty2(String bBatchProperty2) { + this.bBatchProperty2 = bBatchProperty2; + } + + public String getbBatchProperty3() { + return bBatchProperty3; + } + + public void setbBatchProperty3(String bBatchProperty3) { + this.bBatchProperty3 = bBatchProperty3; + } + + public String getbBatchProperty4() { + return bBatchProperty4; + } + + public void setbBatchProperty4(String bBatchProperty4) { + this.bBatchProperty4 = bBatchProperty4; + } + + public String getbBatchProperty5() { + return bBatchProperty5; + } + + public void setbBatchProperty5(String bBatchProperty5) { + this.bBatchProperty5 = bBatchProperty5; + } + + public String getbBatchProperty6() { + return bBatchProperty6; + } + + public void setbBatchProperty6(String bBatchProperty6) { + this.bBatchProperty6 = bBatchProperty6; + } + + public String getbBatchProperty7() { + return bBatchProperty7; + } + + public void setbBatchProperty7(String bBatchProperty7) { + this.bBatchProperty7 = bBatchProperty7; + } + + public String getbBatchProperty8() { + return bBatchProperty8; + } + + public void setbBatchProperty8(String bBatchProperty8) { + this.bBatchProperty8 = bBatchProperty8; + } + + public String getbBatchProperty9() { + return bBatchProperty9; + } + + public void setbBatchProperty9(String bBatchProperty9) { + this.bBatchProperty9 = bBatchProperty9; + } + + public String getbBatchProperty10() { + return bBatchProperty10; + } + + public void setbBatchProperty10(String bBatchProperty10) { + this.bBatchProperty10 = bBatchProperty10; + } + + public String getbControlFreeRange1() { + return bControlFreeRange1; + } + + public void setbControlFreeRange1(String bControlFreeRange1) { + this.bControlFreeRange1 = bControlFreeRange1; + } + + public String getbControlFreeRange2() { + return bControlFreeRange2; + } + + public void setbControlFreeRange2(String bControlFreeRange2) { + this.bControlFreeRange2 = bControlFreeRange2; + } + + public String getbControlFreeRange3() { + return bControlFreeRange3; + } + + public void setbControlFreeRange3(String bControlFreeRange3) { + this.bControlFreeRange3 = bControlFreeRange3; + } + + public String getbControlFreeRange4() { + return bControlFreeRange4; + } + + public void setbControlFreeRange4(String bControlFreeRange4) { + this.bControlFreeRange4 = bControlFreeRange4; + } + + public String getbControlFreeRange5() { + return bControlFreeRange5; + } + + public void setbControlFreeRange5(String bControlFreeRange5) { + this.bControlFreeRange5 = bControlFreeRange5; + } + + public String getbControlFreeRange6() { + return bControlFreeRange6; + } + + public void setbControlFreeRange6(String bControlFreeRange6) { + this.bControlFreeRange6 = bControlFreeRange6; + } + + public String getbControlFreeRange7() { + return bControlFreeRange7; + } + + public void setbControlFreeRange7(String bControlFreeRange7) { + this.bControlFreeRange7 = bControlFreeRange7; + } + + public String getbControlFreeRange8() { + return bControlFreeRange8; + } + + public void setbControlFreeRange8(String bControlFreeRange8) { + this.bControlFreeRange8 = bControlFreeRange8; + } + + public String getbControlFreeRange9() { + return bControlFreeRange9; + } + + public void setbControlFreeRange9(String bControlFreeRange9) { + this.bControlFreeRange9 = bControlFreeRange9; + } + + public String getbControlFreeRange10() { + return bControlFreeRange10; + } + + public void setbControlFreeRange10(String bControlFreeRange10) { + this.bControlFreeRange10 = bControlFreeRange10; + } + + public String getfInvCIQExch() { + return fInvCIQExch; + } + + public void setfInvCIQExch(String fInvCIQExch) { + this.fInvCIQExch = fInvCIQExch; + } + + public String getiWarrantyPeriod() { + return iWarrantyPeriod; + } + + public void setiWarrantyPeriod(String iWarrantyPeriod) { + this.iWarrantyPeriod = iWarrantyPeriod; + } + + public String getiWarrantyUnit() { + return iWarrantyUnit; + } + + public void setiWarrantyUnit(String iWarrantyUnit) { + this.iWarrantyUnit = iWarrantyUnit; + } + public String getbInvKeyPart() { return bInvKeyPart; } @@ -32,14 +806,84 @@ public class InventorySubEntity extends BaseEntity { this.bInvKeyPart = bInvKeyPart; } - - - public String getPlanCheckDay() { - return planCheckDay; + public String getiAcceptEarlyDays() { + return iAcceptEarlyDays; } - public void setPlanCheckDay(String planCheckDay) { - this.planCheckDay = planCheckDay; + public void setiAcceptEarlyDays(String iAcceptEarlyDays) { + this.iAcceptEarlyDays = iAcceptEarlyDays; + } + + public String getfProcessCost() { + return fProcessCost; + } + + public void setfProcessCost(String fProcessCost) { + this.fProcessCost = fProcessCost; + } + + public String getfCurLLaborCost() { + return fCurLLaborCost; + } + + public void setfCurLLaborCost(String fCurLLaborCost) { + this.fCurLLaborCost = fCurLLaborCost; + } + + public String getfCurLVarManuCost() { + return fCurLVarManuCost; + } + + public void setfCurLVarManuCost(String fCurLVarManuCost) { + this.fCurLVarManuCost = fCurLVarManuCost; + } + + public String getfCurLFixManuCost() { + return fCurLFixManuCost; + } + + public void setfCurLFixManuCost(String fCurLFixManuCost) { + this.fCurLFixManuCost = fCurLFixManuCost; + } + + public String getfCurLOMCost() { + return fCurLOMCost; + } + + public void setfCurLOMCost(String fCurLOMCost) { + this.fCurLOMCost = fCurLOMCost; + } + + public String getfNextLLaborCost() { + return fNextLLaborCost; + } + + public void setfNextLLaborCost(String fNextLLaborCost) { + this.fNextLLaborCost = fNextLLaborCost; + } + + public String getfNextLVarManuCost() { + return fNextLVarManuCost; + } + + public void setfNextLVarManuCost(String fNextLVarManuCost) { + this.fNextLVarManuCost = fNextLVarManuCost; + } + + public String getfNextLFixManuCost() { + return fNextLFixManuCost; + } + + public void setfNextLFixManuCost(String fNextLFixManuCost) { + this.fNextLFixManuCost = fNextLFixManuCost; + } + + public String getfNextLOMCost() { + return fNextLOMCost; + } + + public void setfNextLOMCost(String fNextLOMCost) { + this.fNextLOMCost = fNextLOMCost; } public String getdInvCreateDatetime() { @@ -50,6 +894,80 @@ public class InventorySubEntity extends BaseEntity { this.dInvCreateDatetime = dInvCreateDatetime; } + public String getcInvAppDocNo() { + return cInvAppDocNo; + } + + public void setcInvAppDocNo(String cInvAppDocNo) { + this.cInvAppDocNo = cInvAppDocNo; + } + + public String getbPUQuota() { + return bPUQuota; + } + + public void setbPUQuota(String bPUQuota) { + this.bPUQuota = bPUQuota; + } + + public String getbInvROHS() { + return bInvROHS; + } + + public void setbInvROHS(String bInvROHS) { + this.bInvROHS = bInvROHS; + } + + public String getbPrjMat() { + return bPrjMat; + } + + public void setbPrjMat(String bPrjMat) { + this.bPrjMat = bPrjMat; + } + + public String getfPrjMatLimit() { + return fPrjMatLimit; + } + + public void setfPrjMatLimit(String fPrjMatLimit) { + this.fPrjMatLimit = fPrjMatLimit; + } + + public String getbInvAsset() { + return bInvAsset; + } + + public void setbInvAsset(String bInvAsset) { + this.bInvAsset = bInvAsset; + } + + public String getbSrvProduct() { + return bSrvProduct; + } + + public void setbSrvProduct(String bSrvProduct) { + this.bSrvProduct = bSrvProduct; + } + + public String getiAcceptDelayDays() { + return iAcceptDelayDays; + } + + public void setiAcceptDelayDays(String iAcceptDelayDays) { + this.iAcceptDelayDays = iAcceptDelayDays; + } + + + + public String getiMaterialsCycle() { + return iMaterialsCycle; + } + + public void setiMaterialsCycle(String iMaterialsCycle) { + this.iMaterialsCycle = iMaterialsCycle; + } + public String getiDrawType() { return iDrawType; } @@ -57,4 +975,164 @@ public class InventorySubEntity extends BaseEntity { public void setiDrawType(String iDrawType) { this.iDrawType = iDrawType; } + + public String getbSCkeyProjections() { + return bSCkeyProjections; + } + + public void setbSCkeyProjections(String bSCkeyProjections) { + this.bSCkeyProjections = bSCkeyProjections; + } + + public String getiSupplyPeriodType() { + return iSupplyPeriodType; + } + + public void setiSupplyPeriodType(String iSupplyPeriodType) { + this.iSupplyPeriodType = iSupplyPeriodType; + } + + public String getiTimeBucketId() { + return iTimeBucketId; + } + + public void setiTimeBucketId(String iTimeBucketId) { + this.iTimeBucketId = iTimeBucketId; + } + + public String getiAvailabilityDate() { + return iAvailabilityDate; + } + + public void setiAvailabilityDate(String iAvailabilityDate) { + this.iAvailabilityDate = iAvailabilityDate; + } + + public String getfMaterialCost() { + return fMaterialCost; + } + + public void setfMaterialCost(String fMaterialCost) { + this.fMaterialCost = fMaterialCost; + } + + public String getbImport() { + return bImport; + } + + public void setbImport(String bImport) { + this.bImport = bImport; + } + + public String getiNearRejectDays() { + return iNearRejectDays; + } + + public void setiNearRejectDays(String iNearRejectDays) { + this.iNearRejectDays = iNearRejectDays; + } + + public String getbCheckSubitemCost() { + return bCheckSubitemCost; + } + + public void setbCheckSubitemCost(String bCheckSubitemCost) { + this.bCheckSubitemCost = bCheckSubitemCost; + } + + public String getfRoundFactor() { + return fRoundFactor; + } + + public void setfRoundFactor(String fRoundFactor) { + this.fRoundFactor = fRoundFactor; + } + + public String getbConsiderFreeStock() { + return bConsiderFreeStock; + } + + public void setbConsiderFreeStock(String bConsiderFreeStock) { + this.bConsiderFreeStock = bConsiderFreeStock; + } + + public String getbSuitRetail() { + return bSuitRetail; + } + + public void setbSuitRetail(String bSuitRetail) { + this.bSuitRetail = bSuitRetail; + } + + public String getbFeatureMatch() { + return bFeatureMatch; + } + + public void setbFeatureMatch(String bFeatureMatch) { + this.bFeatureMatch = bFeatureMatch; + } + + public String getbProduceByFeatureAllocate() { + return bProduceByFeatureAllocate; + } + + public void setbProduceByFeatureAllocate(String bProduceByFeatureAllocate) { + this.bProduceByFeatureAllocate = bProduceByFeatureAllocate; + } + + public String getbMaintenance() { + return bMaintenance; + } + + public void setbMaintenance(String bMaintenance) { + this.bMaintenance = bMaintenance; + } + + public String getiMaintenanceCycle() { + return iMaintenanceCycle; + } + + public void setiMaintenanceCycle(String iMaintenanceCycle) { + this.iMaintenanceCycle = iMaintenanceCycle; + } + + public String getiMaintenanceCycleUnit() { + return iMaintenanceCycleUnit; + } + + public void setiMaintenanceCycleUnit(String iMaintenanceCycleUnit) { + this.iMaintenanceCycleUnit = iMaintenanceCycleUnit; + } + + public String getbCoupon() { + return bCoupon; + } + + public void setbCoupon(String bCoupon) { + this.bCoupon = bCoupon; + } + + public String getbStoreCard() { + return bStoreCard; + } + + public void setbStoreCard(String bStoreCard) { + this.bStoreCard = bStoreCard; + } + + public String getbProcessProduct() { + return bProcessProduct; + } + + public void setbProcessProduct(String bProcessProduct) { + this.bProcessProduct = bProcessProduct; + } + + public String getbProcessMaterial() { + return bProcessMaterial; + } + + public void setbProcessMaterial(String bProcessMaterial) { + this.bProcessMaterial = bProcessMaterial; + } } diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventorySubEntity.xml b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventorySubEntity.xml index 0d4dba80..f0601fdd 100644 --- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventorySubEntity.xml +++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventorySubEntity.xml @@ -4,58 +4,1198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cInvSubCode, - bInvKeyPart + fBuyExcess, + iSurenessType, + iDateType, + iDateSum, + iDynamicSurenessType, + iBestrowSum, + iPercentumSum, + bIsAttachFile, + bInByProCheck, + iRequireTrackStyle, + iExpiratDateCalcu, + iBOMExpandUnitType, + bPurPriceFree1, + bPurPriceFree2, + bPurPriceFree3, + bPurPriceFree4, + bPurPriceFree5, + bPurPriceFree6, + bPurPriceFree7, + bPurPriceFree8, + bPurPriceFree9, + bPurPriceFree10, + bOMPriceFree1, + bOMPriceFree2, + bOMPriceFree3, + bOMPriceFree4, + bOMPriceFree5, + bOMPriceFree6, + bOMPriceFree7, + bOMPriceFree8, + bOMPriceFree9, + bOMPriceFree10, + bSalePriceFree1, + bSalePriceFree2, + bSalePriceFree3, + bSalePriceFree4, + bSalePriceFree5, + bSalePriceFree6, + bSalePriceFree7, + bSalePriceFree8, + bSalePriceFree9, + bSalePriceFree10, + fInvOutUpLimit, + bBondedInv, + bBatchCreate, + bBatchProperty1, + bBatchProperty2, + bBatchProperty3, + bBatchProperty4, + bBatchProperty5, + bBatchProperty6, + bBatchProperty7, + bBatchProperty8, + bBatchProperty9, + bBatchProperty10, + bControlFreeRange1, + bControlFreeRange2, + bControlFreeRange3, + bControlFreeRange4, + bControlFreeRange5, + bControlFreeRange6, + bControlFreeRange7, + bControlFreeRange8, + bControlFreeRange9, + bControlFreeRange10, + fInvCIQExch, + iWarrantyPeriod, + iWarrantyUnit, + bInvKeyPart, + iAcceptEarlyDays, + fProcessCost, + fCurLLaborCost, + fCurLVarManuCost, + fCurLFixManuCost, + fCurLOMCost, + fNextLLaborCost, + fNextLVarManuCost, + fNextLFixManuCost, + fNextLOMCost, + dInvCreateDatetime, + cInvAppDocNo, + bPUQuota, + bInvROHS, + bPrjMat, + fPrjMatLimit, + bInvAsset, + bSrvProduct, + iAcceptDelayDays, + iPlanCheckDay, + iMaterialsCycle, + iDrawType, + bSCkeyProjections, + iSupplyPeriodType, + iTimeBucketId, + iAvailabilityDate, + fMaterialCost, + bImport, + iNearRejectDays, + bCheckSubitemCost, + fRoundFactor, + bConsiderFreeStock, + bSuitRetail, + bFeatureMatch, + bProduceByFeatureAllocate, + bMaintenance, + iMaintenanceCycle, + iMaintenanceCycleUnit, + bCoupon, + bStoreCard, + bProcessProduct, + bProcessMaterial - + + - - insert into ${acc_name}Inventory_Sub( + + + + + + + + + + + insert into Inventory_Sub( cInvSubCode, - bInvKeyPart, - iPlanCheckDay, - dInvCreateDatetime, - iDrawType + fBuyExcess, + iSurenessType, + iDateType, + iDateSum, + iDynamicSurenessType, + iBestrowSum, + iPercentumSum, + bIsAttachFile, + bInByProCheck, + iRequireTrackStyle, + iExpiratDateCalcu, + iBOMExpandUnitType, + bPurPriceFree1, + bPurPriceFree2, + bPurPriceFree3, + bPurPriceFree4, + bPurPriceFree5, + bPurPriceFree6, + bPurPriceFree7, + bPurPriceFree8, + bPurPriceFree9, + bPurPriceFree10, + bOMPriceFree1, + bOMPriceFree2, + bOMPriceFree3, + bOMPriceFree4, + bOMPriceFree5, + bOMPriceFree6, + bOMPriceFree7, + bOMPriceFree8, + bOMPriceFree9, + bOMPriceFree10, + bSalePriceFree1, + bSalePriceFree2, + bSalePriceFree3, + bSalePriceFree4, + bSalePriceFree5, + bSalePriceFree6, + bSalePriceFree7, + bSalePriceFree8, + bSalePriceFree9, + bSalePriceFree10, + fInvOutUpLimit, + bBondedInv, + bBatchCreate, + bBatchProperty1, + bBatchProperty2, + bBatchProperty3, + bBatchProperty4, + bBatchProperty5, + bBatchProperty6, + bBatchProperty7, + bBatchProperty8, + bBatchProperty9, + bBatchProperty10, + bControlFreeRange1, + bControlFreeRange2, + bControlFreeRange3, + bControlFreeRange4, + bControlFreeRange5, + bControlFreeRange6, + bControlFreeRange7, + bControlFreeRange8, + bControlFreeRange9, + bControlFreeRange10, + fInvCIQExch, + iWarrantyPeriod, + iWarrantyUnit, + bInvKeyPart, + iAcceptEarlyDays, + fProcessCost, + fCurLLaborCost, + fCurLVarManuCost, + fCurLFixManuCost, + fCurLOMCost, + fNextLLaborCost, + fNextLVarManuCost, + fNextLFixManuCost, + fNextLOMCost, + dInvCreateDatetime, + cInvAppDocNo, + bPUQuota, + bInvROHS, + bPrjMat, + fPrjMatLimit, + bInvAsset, + bSrvProduct, + iAcceptDelayDays, + iPlanCheckDay, + iMaterialsCycle, + iDrawType, + bSCkeyProjections, + iSupplyPeriodType, + iTimeBucketId, + iAvailabilityDate, + fMaterialCost, + bImport, + iNearRejectDays, + bCheckSubitemCost, + fRoundFactor, + bConsiderFreeStock, + bSuitRetail, + bFeatureMatch, + bProduceByFeatureAllocate, + bMaintenance, + iMaintenanceCycle, + iMaintenanceCycleUnit, + bCoupon, + bStoreCard, + bProcessProduct, + bProcessMaterial + )values ( #{cInvSubCode}, + #{fBuyExcess}, + #{iSurenessType}, + #{iDateType}, + #{iDateSum}, + #{iDynamicSurenessType}, + #{iBestrowSum}, + #{iPercentumSum}, + #{bIsAttachFile}, + #{bInByProCheck}, + #{iRequireTrackStyle}, + #{iExpiratDateCalcu}, + #{iBOMExpandUnitType}, + #{bPurPriceFree1}, + #{bPurPriceFree2}, + #{bPurPriceFree3}, + #{bPurPriceFree4}, + #{bPurPriceFree5}, + #{bPurPriceFree6}, + #{bPurPriceFree7}, + #{bPurPriceFree8}, + #{bPurPriceFree9}, + #{bPurPriceFree10}, + #{bOMPriceFree1}, + #{bOMPriceFree2}, + #{bOMPriceFree3}, + #{bOMPriceFree4}, + #{bOMPriceFree5}, + #{bOMPriceFree6}, + #{bOMPriceFree7}, + #{bOMPriceFree8}, + #{bOMPriceFree9}, + #{bOMPriceFree10}, + #{bSalePriceFree1}, + #{bSalePriceFree2}, + #{bSalePriceFree3}, + #{bSalePriceFree4}, + #{bSalePriceFree5}, + #{bSalePriceFree6}, + #{bSalePriceFree7}, + #{bSalePriceFree8}, + #{bSalePriceFree9}, + #{bSalePriceFree10}, + #{fInvOutUpLimit}, + #{bBondedInv}, + #{bBatchCreate}, + #{bBatchProperty1}, + #{bBatchProperty2}, + #{bBatchProperty3}, + #{bBatchProperty4}, + #{bBatchProperty5}, + #{bBatchProperty6}, + #{bBatchProperty7}, + #{bBatchProperty8}, + #{bBatchProperty9}, + #{bBatchProperty10}, + #{bControlFreeRange1}, + #{bControlFreeRange2}, + #{bControlFreeRange3}, + #{bControlFreeRange4}, + #{bControlFreeRange5}, + #{bControlFreeRange6}, + #{bControlFreeRange7}, + #{bControlFreeRange8}, + #{bControlFreeRange9}, + #{bControlFreeRange10}, + #{fInvCIQExch}, + #{iWarrantyPeriod}, + #{iWarrantyUnit}, #{bInvKeyPart}, - #{planCheckDay}, - #{dInvCreateDatetime}, - #{iDrawType} + #{iAcceptEarlyDays}, + #{fProcessCost}, + #{fCurLLaborCost}, + #{fCurLVarManuCost}, + #{fCurLFixManuCost}, + #{fCurLOMCost}, + #{fNextLLaborCost}, + #{fNextLVarManuCost}, + #{fNextLFixManuCost}, + #{fNextLOMCost}, + #{dInvCreateDatetime}, + #{cInvAppDocNo}, + #{bPUQuota}, + #{bInvROHS}, + #{bPrjMat}, + #{fPrjMatLimit}, + #{bInvAsset}, + #{bSrvProduct}, + #{iAcceptDelayDays}, + #{iPlanCheckDay}, + #{iMaterialsCycle}, + #{iDrawType}, + #{bSCkeyProjections}, + #{iSupplyPeriodType}, + #{iTimeBucketId}, + #{iAvailabilityDate}, + #{fMaterialCost}, + #{bImport}, + #{iNearRejectDays}, + #{bCheckSubitemCost}, + #{fRoundFactor}, + #{bConsiderFreeStock}, + #{bSuitRetail}, + #{bFeatureMatch}, + #{bProduceByFeatureAllocate}, + #{bMaintenance}, + #{iMaintenanceCycle}, + #{iMaintenanceCycleUnit}, + #{bCoupon}, + #{bStoreCard}, + #{bProcessProduct}, + #{bProcessMaterial} + ) + - + - update ${acc_name}Inventory_Sub set + update Inventory_Sub set cInvSubCode = #{cInvSubCode}, + fBuyExcess = #{fBuyExcess}, + iSurenessType = #{iSurenessType}, + iDateType = #{iDateType}, + iDateSum = #{iDateSum}, + iDynamicSurenessType = #{iDynamicSurenessType}, + iBestrowSum = #{iBestrowSum}, + iPercentumSum = #{iPercentumSum}, + bIsAttachFile = #{bIsAttachFile}, + bInByProCheck = #{bInByProCheck}, + iRequireTrackStyle = #{iRequireTrackStyle}, + iExpiratDateCalcu = #{iExpiratDateCalcu}, + iBOMExpandUnitType = #{iBOMExpandUnitType}, + bPurPriceFree1 = #{bPurPriceFree1}, + bPurPriceFree2 = #{bPurPriceFree2}, + bPurPriceFree3 = #{bPurPriceFree3}, + bPurPriceFree4 = #{bPurPriceFree4}, + bPurPriceFree5 = #{bPurPriceFree5}, + bPurPriceFree6 = #{bPurPriceFree6}, + bPurPriceFree7 = #{bPurPriceFree7}, + bPurPriceFree8 = #{bPurPriceFree8}, + bPurPriceFree9 = #{bPurPriceFree9}, + bPurPriceFree10 = #{bPurPriceFree10}, + bOMPriceFree1 = #{bOMPriceFree1}, + bOMPriceFree2 = #{bOMPriceFree2}, + bOMPriceFree3 = #{bOMPriceFree3}, + bOMPriceFree4 = #{bOMPriceFree4}, + bOMPriceFree5 = #{bOMPriceFree5}, + bOMPriceFree6 = #{bOMPriceFree6}, + bOMPriceFree7 = #{bOMPriceFree7}, + bOMPriceFree8 = #{bOMPriceFree8}, + bOMPriceFree9 = #{bOMPriceFree9}, + bOMPriceFree10 = #{bOMPriceFree10}, + bSalePriceFree1 = #{bSalePriceFree1}, + bSalePriceFree2 = #{bSalePriceFree2}, + bSalePriceFree3 = #{bSalePriceFree3}, + bSalePriceFree4 = #{bSalePriceFree4}, + bSalePriceFree5 = #{bSalePriceFree5}, + bSalePriceFree6 = #{bSalePriceFree6}, + bSalePriceFree7 = #{bSalePriceFree7}, + bSalePriceFree8 = #{bSalePriceFree8}, + bSalePriceFree9 = #{bSalePriceFree9}, + bSalePriceFree10 = #{bSalePriceFree10}, + fInvOutUpLimit = #{fInvOutUpLimit}, + bBondedInv = #{bBondedInv}, + bBatchCreate = #{bBatchCreate}, + bBatchProperty1 = #{bBatchProperty1}, + bBatchProperty2 = #{bBatchProperty2}, + bBatchProperty3 = #{bBatchProperty3}, + bBatchProperty4 = #{bBatchProperty4}, + bBatchProperty5 = #{bBatchProperty5}, + bBatchProperty6 = #{bBatchProperty6}, + bBatchProperty7 = #{bBatchProperty7}, + bBatchProperty8 = #{bBatchProperty8}, + bBatchProperty9 = #{bBatchProperty9}, + bBatchProperty10 = #{bBatchProperty10}, + bControlFreeRange1 = #{bControlFreeRange1}, + bControlFreeRange2 = #{bControlFreeRange2}, + bControlFreeRange3 = #{bControlFreeRange3}, + bControlFreeRange4 = #{bControlFreeRange4}, + bControlFreeRange5 = #{bControlFreeRange5}, + bControlFreeRange6 = #{bControlFreeRange6}, + bControlFreeRange7 = #{bControlFreeRange7}, + bControlFreeRange8 = #{bControlFreeRange8}, + bControlFreeRange9 = #{bControlFreeRange9}, + bControlFreeRange10 = #{bControlFreeRange10}, + fInvCIQExch = #{fInvCIQExch}, + iWarrantyPeriod = #{iWarrantyPeriod}, + iWarrantyUnit = #{iWarrantyUnit}, bInvKeyPart = #{bInvKeyPart}, - iPlanCheckDay = #{planCheckDay}, - - iDrawType = #{iDrawType} + iAcceptEarlyDays = #{iAcceptEarlyDays}, + fProcessCost = #{fProcessCost}, + fCurLLaborCost = #{fCurLLaborCost}, + fCurLVarManuCost = #{fCurLVarManuCost}, + fCurLFixManuCost = #{fCurLFixManuCost}, + fCurLOMCost = #{fCurLOMCost}, + fNextLLaborCost = #{fNextLLaborCost}, + fNextLVarManuCost = #{fNextLVarManuCost}, + fNextLFixManuCost = #{fNextLFixManuCost}, + fNextLOMCost = #{fNextLOMCost}, + dInvCreateDatetime = #{dInvCreateDatetime}, + cInvAppDocNo = #{cInvAppDocNo}, + bPUQuota = #{bPUQuota}, + bInvROHS = #{bInvROHS}, + bPrjMat = #{bPrjMat}, + fPrjMatLimit = #{fPrjMatLimit}, + bInvAsset = #{bInvAsset}, + bSrvProduct = #{bSrvProduct}, + iAcceptDelayDays = #{iAcceptDelayDays}, + iPlanCheckDay = #{iPlanCheckDay}, + iMaterialsCycle = #{iMaterialsCycle}, + iDrawType = #{iDrawType}, + bSCkeyProjections = #{bSCkeyProjections}, + iSupplyPeriodType = #{iSupplyPeriodType}, + iTimeBucketId = #{iTimeBucketId}, + iAvailabilityDate = #{iAvailabilityDate}, + fMaterialCost = #{fMaterialCost}, + bImport = #{bImport}, + iNearRejectDays = #{iNearRejectDays}, + bCheckSubitemCost = #{bCheckSubitemCost}, + fRoundFactor = #{fRoundFactor}, + bConsiderFreeStock = #{bConsiderFreeStock}, + bSuitRetail = #{bSuitRetail}, + bFeatureMatch = #{bFeatureMatch}, + bProduceByFeatureAllocate = #{bProduceByFeatureAllocate}, + bMaintenance = #{bMaintenance}, + iMaintenanceCycle = #{iMaintenanceCycle}, + iMaintenanceCycleUnit = #{iMaintenanceCycleUnit}, + bCoupon = #{bCoupon}, + bStoreCard = #{bStoreCard}, + bProcessProduct = #{bProcessProduct}, + bProcessMaterial = #{bProcessMaterial}, where cInvSubCode = #{cInvSubCode} + diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/IInventorySubService.java b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/IInventorySubService.java index 319fc7b0..d61cb920 100644 --- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/IInventorySubService.java +++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/IInventorySubService.java @@ -9,4 +9,13 @@ import com.hzya.frame.u8.base.inventory.entity.InventorySubEntity; * @Date 2025/3/13 16:40 **/ public interface IInventorySubService extends IBaseService { + + /** + * 根据存货编码查存货子表 + * @param entity + * @return + */ + InventorySubEntity getInvSub(InventorySubEntity entity)throws Exception; + + void saveOrUpdateInvSub(InventorySubEntity entity)throws Exception; } diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryExtServiceImpl.java b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryExtServiceImpl.java index 6586871f..ecd98f4f 100644 --- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryExtServiceImpl.java +++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryExtServiceImpl.java @@ -40,7 +40,9 @@ public class InventoryExtServiceImpl extends BaseService query = inventoryextDao.query(entity); + InventoryExtEntity extEntity = new InventoryExtEntity(); + extEntity.setCInvCode(entity.getCInvCode()); + List query = inventoryextDao.query(extEntity); if (CollectionUtils.isNotEmpty(query)){ if (query.size() > 1){ throw new BaseSystemException("根据存货编码"+entity.getcInvCode()+"查询到多条扩展自定义项数据，请检查数据准确性"); diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryService.java b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryService.java index ff7e9b70..c920d655 100644 --- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryService.java +++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryService.java @@ -77,23 +77,8 @@ public class InventoryService extends BaseService implem checkInventory("save",entity); //保存存货信息 inventoryDao.save(entity); - //保存子表数据 - InventorySubEntity subEntity = new InventorySubEntity(); - subEntity.setDataSourceCode(entity.getDataSourceCode()); - subEntity.setcInvSubCode(entity.getcInvCode()); - subEntity.setAcc_name(entity.getAcc_name()); - //检查子表有没有保存过 - List subEntityList = subService.query(subEntity); - subEntity.setbInvKeyPart("0");//是否关键物料 1是0否 - subEntity.setAcc_name(entity.getAcc_name()); - subEntity.setPlanCheckDay("0");//计划检验天数 - subEntity.setdInvCreateDatetime(DateUtil.now());//建档日期 - subEntity.setiDrawType("0");//领料方式 0是直接领用，1是申请领用 - if (CollectionUtils.isEmpty(subEntityList)){ - subService.save(subEntity); - }else { - subService.update(subEntity); - } + //保存存货副表 + subService.saveOrUpdateInvSub(entity.getInvSubEntity()); //保存扩展自由项 inventoryExtService.saveOrUpdateInv(entity.getInvExtEntity()); //保存自定义表 @@ -151,6 +136,10 @@ public class InventoryService extends BaseService implem public void updateInventory(InventoryEntity entity) throws Exception { checkInventory("update",entity); inventoryDao.update(entity); + //更新存货自由项 + inventoryExtService.saveOrUpdateInv(entity.getInvExtEntity()); + //更新存货子表 + subService.saveOrUpdateInvSub(entity.getInvSubEntity()); } /** @@ -163,6 +152,8 @@ public class InventoryService extends BaseService implem Assert.notEmpty(entity.getcInvCode(),()-> new BaseSystemException("存货编码不能为空")); Assert.notEmpty(entity.getDataSourceCode(),()-> new BaseSystemException("数据源编码不能为空")); Assert.notEmpty(entity.getAcc_name(),()-> new BaseSystemException("账套号不能为空")); + Assert.notNull(entity.getInvExtEntity(),()-> new BaseSystemException("扩展自定义项不能为空")); + Assert.notNull(entity.getInvSubEntity(),()-> new BaseSystemException("存货子表不能为空")); switch (type) { case "save": break; diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventorySubServiceImpl.java b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventorySubServiceImpl.java index 8696ccf2..5553df53 100644 --- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventorySubServiceImpl.java +++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventorySubServiceImpl.java @@ -1,12 +1,18 @@ package com.hzya.frame.u8.base.inventory.service.impl; +import cn.hutool.core.util.StrUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.u8.base.inventory.dao.IInventorySubDao; import com.hzya.frame.u8.base.inventory.entity.InventorySubEntity; import com.hzya.frame.u8.base.inventory.service.IInventorySubService; +import com.hzya.frame.web.exception.BaseSystemException; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description * @Author xiangerlin @@ -22,4 +28,38 @@ public class InventorySubServiceImpl extends BaseService query = inventorySubDao.query(subEntity); + if (CollectionUtils.isNotEmpty(query)){ + if (query.size() > 1){ + throw new BaseSystemException("根据存货编码"+entity.getcInvSubCode()+"查询到多条副表数据，请检查数据准确性"); + } + return query.get(0); + } + } + return null; + } + + @DS("#entity.dataSourceCode") + @Override + public void saveOrUpdateInvSub(InventorySubEntity entity) throws Exception { + InventorySubEntity invSub = getInvSub(entity); + if (null != invSub){ + inventorySubDao.update(entity); + }else { + inventorySubDao.save(entity); + } + } }