단위-> 직접선택 추가에 따른 필드 추가 대응
This commit is contained in:
@@ -34,6 +34,7 @@ class CreateBankDao implements CreateBankPortOut {
|
|||||||
cmd.getSourcePurpose(),
|
cmd.getSourcePurpose(),
|
||||||
cmd.getCount(),
|
cmd.getCount(),
|
||||||
cmd.getUnitCode(),
|
cmd.getUnitCode(),
|
||||||
|
cmd.getUnit(),
|
||||||
cmd.getPrice(),
|
cmd.getPrice(),
|
||||||
cmd.getMonth(),
|
cmd.getMonth(),
|
||||||
cmd.getMonthlyInputStatusId(),
|
cmd.getMonthlyInputStatusId(),
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ public class CreateForestProductDto {
|
|||||||
|
|
||||||
private Integer count;
|
private Integer count;
|
||||||
private String unitCode;
|
private String unitCode;
|
||||||
|
private String unit;
|
||||||
private Integer price;
|
private Integer price;
|
||||||
private String month;
|
private String month;
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public class CreateBankCmd extends AuditCommand {
|
|||||||
|
|
||||||
private Integer count;
|
private Integer count;
|
||||||
private String unitCode;
|
private String unitCode;
|
||||||
|
private String unit;
|
||||||
private Integer price;
|
private Integer price;
|
||||||
private String month;
|
private String month;
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ class GetBanksDao implements GetBanksPortOut {
|
|||||||
article.getSourcePurpose(),
|
article.getSourcePurpose(),
|
||||||
article.getCount(),
|
article.getCount(),
|
||||||
article.getUnitCode(),
|
article.getUnitCode(),
|
||||||
|
article.getUnit(),
|
||||||
article.getPrice(),
|
article.getPrice(),
|
||||||
article.getMonth(),
|
article.getMonth(),
|
||||||
article.getMonthlyInputStatusId(),
|
article.getMonthlyInputStatusId(),
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ public class GetBanksDto {
|
|||||||
|
|
||||||
private Integer count;
|
private Integer count;
|
||||||
private String unitCode;
|
private String unitCode;
|
||||||
|
private String unit;
|
||||||
private Integer price;
|
private Integer price;
|
||||||
private String month;
|
private String month;
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ public class GetBanks {
|
|||||||
|
|
||||||
private Integer count;
|
private Integer count;
|
||||||
private String unitCode;
|
private String unitCode;
|
||||||
|
private String unite;
|
||||||
private Integer price;
|
private Integer price;
|
||||||
private String month;
|
private String month;
|
||||||
|
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ class CreateBankInputController {
|
|||||||
item.getSourcePurpose(),
|
item.getSourcePurpose(),
|
||||||
item.getCount(),
|
item.getCount(),
|
||||||
item.getUnitCode(),
|
item.getUnitCode(),
|
||||||
|
item.getUnit(),
|
||||||
item.getPrice(),
|
item.getPrice(),
|
||||||
currentMonthlyInfo.getMonth(),
|
currentMonthlyInfo.getMonth(),
|
||||||
currentMonthlyInfo.getId()
|
currentMonthlyInfo.getId()
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ public class CreateBankInputProductReqVO {
|
|||||||
|
|
||||||
private Integer count;
|
private Integer count;
|
||||||
private String unitCode;
|
private String unitCode;
|
||||||
|
private String unit;
|
||||||
private Integer price;
|
private Integer price;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,12 +35,16 @@ class CreateForestProductDao implements CreateForestProductPortOut {
|
|||||||
cmd.getMonth(),
|
cmd.getMonth(),
|
||||||
cmd.getMainYield(),
|
cmd.getMainYield(),
|
||||||
cmd.getMainYieldUnitCode(),
|
cmd.getMainYieldUnitCode(),
|
||||||
|
cmd.getMainYieldUnit(),
|
||||||
cmd.getMainSaleAmount(),
|
cmd.getMainSaleAmount(),
|
||||||
cmd.getMainSaleUnitCode(),
|
cmd.getMainSaleUnitCode(),
|
||||||
|
cmd.getMainSaleUnit(),
|
||||||
cmd.getSubYield(),
|
cmd.getSubYield(),
|
||||||
cmd.getSubYieldUnitCode(),
|
cmd.getSubYieldUnitCode(),
|
||||||
|
cmd.getSubYieldUnit(),
|
||||||
cmd.getSubSaleAmount(),
|
cmd.getSubSaleAmount(),
|
||||||
cmd.getSubSaleUnitCode(),
|
cmd.getSubSaleUnitCode(),
|
||||||
|
cmd.getSubSaleUnit(),
|
||||||
cmd.getMonthlyInputStatusId(),
|
cmd.getMonthlyInputStatusId(),
|
||||||
cmd.getCreatedAt(),
|
cmd.getCreatedAt(),
|
||||||
cmd.getCreatedBy(),
|
cmd.getCreatedBy(),
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public class CreateForestProductDto {
|
|||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
|
|
||||||
private String streetNum;
|
private String streetNum;
|
||||||
private String landType;
|
private String landType; // code -> 직접
|
||||||
private String town;
|
private String town;
|
||||||
|
|
||||||
private Integer availableArea;
|
private Integer availableArea;
|
||||||
@@ -30,13 +30,17 @@ public class CreateForestProductDto {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -28,13 +28,17 @@ public class CreateForestProductCmd extends AuditCommand {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
|
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|||||||
@@ -29,13 +29,17 @@ public class GetForestProduct {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
|
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|||||||
@@ -43,12 +43,16 @@ class GetForestProductsDao implements GetForestProductsPortOut {
|
|||||||
article.getMonth(),
|
article.getMonth(),
|
||||||
article.getMainYield(),
|
article.getMainYield(),
|
||||||
article.getMainYieldUnitCode(),
|
article.getMainYieldUnitCode(),
|
||||||
|
article.getMainYieldUnit(),
|
||||||
article.getMainSaleAmount(),
|
article.getMainSaleAmount(),
|
||||||
article.getMainSaleUnitCode(),
|
article.getMainSaleUnitCode(),
|
||||||
|
article.getMainSaleUnit(),
|
||||||
article.getSubYield(),
|
article.getSubYield(),
|
||||||
article.getSubYieldUnitCode(),
|
article.getSubYieldUnitCode(),
|
||||||
|
article.getSubYieldUnit(),
|
||||||
article.getSubSaleAmount(),
|
article.getSubSaleAmount(),
|
||||||
article.getSubSaleUnitCode(),
|
article.getSubSaleUnitCode(),
|
||||||
|
article.getSubSaleUnit(),
|
||||||
article.getMonthlyInputStatusId(),
|
article.getMonthlyInputStatusId(),
|
||||||
article.getCreatedAt(),
|
article.getCreatedAt(),
|
||||||
article.getCreatedBy(),
|
article.getCreatedBy(),
|
||||||
|
|||||||
@@ -28,13 +28,17 @@ public class GetForestProductsDto {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
|
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|||||||
@@ -30,13 +30,17 @@ public class GetForestProducts {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
|
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|||||||
@@ -43,12 +43,16 @@ class GetMonthlyForestProductsDao implements GetMonthlyForestProductsPortOut {
|
|||||||
article.getMonth(),
|
article.getMonth(),
|
||||||
article.getMainYield(),
|
article.getMainYield(),
|
||||||
article.getMainYieldUnitCode(),
|
article.getMainYieldUnitCode(),
|
||||||
|
article.getMainYieldUnit(),
|
||||||
article.getMainSaleAmount(),
|
article.getMainSaleAmount(),
|
||||||
article.getMainSaleUnitCode(),
|
article.getMainSaleUnitCode(),
|
||||||
|
article.getMainSaleUnit(),
|
||||||
article.getSubYield(),
|
article.getSubYield(),
|
||||||
article.getSubYieldUnitCode(),
|
article.getSubYieldUnitCode(),
|
||||||
|
article.getSubYieldUnit(),
|
||||||
article.getSubSaleAmount(),
|
article.getSubSaleAmount(),
|
||||||
article.getSubSaleUnitCode(),
|
article.getSubSaleUnitCode(),
|
||||||
|
article.getSubSaleUnit(),
|
||||||
article.getMonthlyInputStatusId(),
|
article.getMonthlyInputStatusId(),
|
||||||
article.getCreatedAt(),
|
article.getCreatedAt(),
|
||||||
article.getCreatedBy(),
|
article.getCreatedBy(),
|
||||||
|
|||||||
@@ -28,13 +28,17 @@ public class GetMonthlyForestProductsDto {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
|
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|||||||
@@ -30,13 +30,17 @@ public class GetMonthlyForestProducts {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
|
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|||||||
@@ -31,12 +31,16 @@ class UpdateForestProductDao implements UpdateForestProductPortOut {
|
|||||||
command.getMonth(),
|
command.getMonth(),
|
||||||
command.getMainYield(),
|
command.getMainYield(),
|
||||||
command.getMainYieldUnitCode(),
|
command.getMainYieldUnitCode(),
|
||||||
|
command.getMainYieldUnit(),
|
||||||
command.getMainSaleAmount(),
|
command.getMainSaleAmount(),
|
||||||
command.getMainSaleUnitCode(),
|
command.getMainSaleUnitCode(),
|
||||||
|
command.getMainSaleUnit(),
|
||||||
command.getSubYield(),
|
command.getSubYield(),
|
||||||
command.getSubYieldUnitCode(),
|
command.getSubYieldUnitCode(),
|
||||||
|
command.getSubYieldUnit(),
|
||||||
command.getSubSaleAmount(),
|
command.getSubSaleAmount(),
|
||||||
command.getSubSaleUnitCode(),
|
command.getSubSaleUnitCode(),
|
||||||
|
command.getSubSaleUnit(),
|
||||||
command.getMonthlyInputStatusId(),
|
command.getMonthlyInputStatusId(),
|
||||||
LocalDateTime.now(),
|
LocalDateTime.now(),
|
||||||
CommonUtil.getLoginUsername()
|
CommonUtil.getLoginUsername()
|
||||||
|
|||||||
@@ -30,13 +30,17 @@ public class UpdateForestProductDto {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
|
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|||||||
@@ -29,13 +29,17 @@ public class UpdateForestProductCmd {
|
|||||||
|
|
||||||
private BigDecimal mainYield;
|
private BigDecimal mainYield;
|
||||||
private String mainYieldUnitCode;
|
private String mainYieldUnitCode;
|
||||||
|
private String mainYieldUnit;
|
||||||
private BigDecimal mainSaleAmount;
|
private BigDecimal mainSaleAmount;
|
||||||
private String mainSaleUnitCode;
|
private String mainSaleUnitCode;
|
||||||
|
private String mainSaleUnit;
|
||||||
|
|
||||||
private BigDecimal subYield;
|
private BigDecimal subYield;
|
||||||
private String subYieldUnitCode;
|
private String subYieldUnitCode;
|
||||||
|
private String subYieldUnit;
|
||||||
private BigDecimal subSaleAmount;
|
private BigDecimal subSaleAmount;
|
||||||
private String subSaleUnitCode;
|
private String subSaleUnitCode;
|
||||||
|
private String subSaleUnit;
|
||||||
|
|
||||||
private Long monthlyInputStatusId;
|
private Long monthlyInputStatusId;
|
||||||
|
|
||||||
|
|||||||
@@ -64,12 +64,16 @@ class CreateMonthlyController {
|
|||||||
currentMonthlyInfo.getMonth(),
|
currentMonthlyInfo.getMonth(),
|
||||||
item.getMainYield(),
|
item.getMainYield(),
|
||||||
item.getMainYieldUnitCode(),
|
item.getMainYieldUnitCode(),
|
||||||
|
item.getMainYieldUnit(),
|
||||||
item.getMainSaleAmount(),
|
item.getMainSaleAmount(),
|
||||||
item.getMainSaleUnitCode(),
|
item.getMainSaleUnitCode(),
|
||||||
|
item.getMainSaleUnit(),
|
||||||
item.getSubYield(),
|
item.getSubYield(),
|
||||||
item.getSubYieldUnitCode(),
|
item.getSubYieldUnitCode(),
|
||||||
|
item.getSubYieldUnit(),
|
||||||
item.getSubSaleAmount(),
|
item.getSubSaleAmount(),
|
||||||
item.getSubSaleUnitCode(),
|
item.getSubSaleUnitCode(),
|
||||||
|
item.getSubSaleUnit(),
|
||||||
currentMonthlyInfo.getId()
|
currentMonthlyInfo.getId()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,13 +22,17 @@ public class CreateMonthlyProductReqVO {
|
|||||||
|
|
||||||
private BigDecimal mainYield;//
|
private BigDecimal mainYield;//
|
||||||
private String mainYieldUnitCode;//
|
private String mainYieldUnitCode;//
|
||||||
|
private String mainYieldUnit;//
|
||||||
private BigDecimal mainSaleAmount;//
|
private BigDecimal mainSaleAmount;//
|
||||||
private String mainSaleUnitCode;//
|
private String mainSaleUnitCode;//
|
||||||
|
private String mainSaleUnit;//
|
||||||
|
|
||||||
private BigDecimal subYield;//
|
private BigDecimal subYield;//
|
||||||
private String subYieldUnitCode;//
|
private String subYieldUnitCode;//
|
||||||
|
private String subYieldUnit;//
|
||||||
private BigDecimal subSaleAmount;//
|
private BigDecimal subSaleAmount;//
|
||||||
private String subSaleUnitCode;//
|
private String subSaleUnitCode;//
|
||||||
|
private String subSaleUnit;//
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
source_purpose,
|
source_purpose,
|
||||||
count,
|
count,
|
||||||
unit_code,
|
unit_code,
|
||||||
|
unit,
|
||||||
price,
|
price,
|
||||||
month,
|
month,
|
||||||
monthly_input_status_id,
|
monthly_input_status_id,
|
||||||
@@ -42,6 +43,7 @@
|
|||||||
#{sourcePurpose},
|
#{sourcePurpose},
|
||||||
#{count},
|
#{count},
|
||||||
#{unitCode},
|
#{unitCode},
|
||||||
|
#{unit},
|
||||||
#{price},
|
#{price},
|
||||||
#{month},
|
#{month},
|
||||||
#{monthlyInputStatusId},
|
#{monthlyInputStatusId},
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
a.source_purpose AS sourcePurpose,
|
a.source_purpose AS sourcePurpose,
|
||||||
a.count AS count,
|
a.count AS count,
|
||||||
a.unit_code AS unitCode,
|
a.unit_code AS unitCode,
|
||||||
|
a.unit AS unit,
|
||||||
a.price AS price,
|
a.price AS price,
|
||||||
a.month AS month,
|
a.month AS month,
|
||||||
a.monthly_input_status_id AS monthlyInputStatusId,
|
a.monthly_input_status_id AS monthlyInputStatusId,
|
||||||
|
|||||||
@@ -23,12 +23,16 @@
|
|||||||
month,
|
month,
|
||||||
main_yield,
|
main_yield,
|
||||||
main_yield_unit_code,
|
main_yield_unit_code,
|
||||||
|
main_yield_unit,
|
||||||
main_sale_amount,
|
main_sale_amount,
|
||||||
main_sale_unit_code,
|
main_sale_unit_code,
|
||||||
|
main_sale_unit,
|
||||||
sub_yield,
|
sub_yield,
|
||||||
sub_yield_unit_code,
|
sub_yield_unit_code,
|
||||||
|
sub_yield_unit,
|
||||||
sub_sale_amount,
|
sub_sale_amount,
|
||||||
sub_sale_unit_code,
|
sub_sale_unit_code,
|
||||||
|
sub_sale_unit,
|
||||||
monthly_input_status_id,
|
monthly_input_status_id,
|
||||||
created_at,
|
created_at,
|
||||||
created_by,
|
created_by,
|
||||||
@@ -48,12 +52,16 @@
|
|||||||
#{month},
|
#{month},
|
||||||
#{mainYield},
|
#{mainYield},
|
||||||
#{mainYieldUnitCode},
|
#{mainYieldUnitCode},
|
||||||
|
#{mainYieldUnit},
|
||||||
#{mainSaleAmount},
|
#{mainSaleAmount},
|
||||||
#{mainSaleUnitCode},
|
#{mainSaleUnitCode},
|
||||||
|
#{mainSaleUnit},
|
||||||
#{subYield},
|
#{subYield},
|
||||||
#{subYieldUnitCode},
|
#{subYieldUnitCode},
|
||||||
|
#{subYieldUnit},
|
||||||
#{subSaleAmount},
|
#{subSaleAmount},
|
||||||
#{subSaleUnitCode},
|
#{subSaleUnitCode},
|
||||||
|
#{subSaleUnit},
|
||||||
#{monthlyInputStatusId},
|
#{monthlyInputStatusId},
|
||||||
#{createdAt},
|
#{createdAt},
|
||||||
#{createdBy},
|
#{createdBy},
|
||||||
|
|||||||
@@ -20,12 +20,16 @@
|
|||||||
a.month AS month,
|
a.month AS month,
|
||||||
a.main_yield AS mainYield,
|
a.main_yield AS mainYield,
|
||||||
a.main_yield_unit_code AS mainYieldUnitCode,
|
a.main_yield_unit_code AS mainYieldUnitCode,
|
||||||
|
a.main_yield_unit AS mainYieldUnit,
|
||||||
a.main_sale_amount AS mainSaleAmount,
|
a.main_sale_amount AS mainSaleAmount,
|
||||||
a.main_sale_unit_code AS mainSaleUnitCode,
|
a.main_sale_unit_code AS mainSaleUnitCode,
|
||||||
|
a.main_sale_unit AS mainSaleUnit,
|
||||||
a.sub_yield AS subYield,
|
a.sub_yield AS subYield,
|
||||||
a.sub_yield_unit_code AS subYieldUnitCode,
|
a.sub_yield_unit_code AS subYieldUnitCode,
|
||||||
|
a.sub_yield_unit AS subYieldUnit,
|
||||||
a.sub_sale_amount AS subSaleAmount,
|
a.sub_sale_amount AS subSaleAmount,
|
||||||
a.sub_sale_unit_code AS subSaleUnitCode,
|
a.sub_sale_unit_code AS subSaleUnitCode,
|
||||||
|
a.sub_sale_unit AS subSaleUnit,
|
||||||
a.monthly_input_status_id AS monthlyInputStatusId,
|
a.monthly_input_status_id AS monthlyInputStatusId,
|
||||||
a.created_at AS createdAt,
|
a.created_at AS createdAt,
|
||||||
a.created_by AS createdBy,
|
a.created_by AS createdBy,
|
||||||
|
|||||||
@@ -21,12 +21,16 @@
|
|||||||
a.month AS month,
|
a.month AS month,
|
||||||
a.main_yield AS mainYield,
|
a.main_yield AS mainYield,
|
||||||
a.main_yield_unit_code AS mainYieldUnitCode,
|
a.main_yield_unit_code AS mainYieldUnitCode,
|
||||||
|
a.main_yield_unit AS mainYieldUnit,
|
||||||
a.main_sale_amount AS mainSaleAmount,
|
a.main_sale_amount AS mainSaleAmount,
|
||||||
a.main_sale_unit_code AS mainSaleUnitCode,
|
a.main_sale_unit_code AS mainSaleUnitCode,
|
||||||
|
a.main_sale_unit AS mainSaleUnit,
|
||||||
a.sub_yield AS subYield,
|
a.sub_yield AS subYield,
|
||||||
a.sub_yield_unit_code AS subYieldUnitCode,
|
a.sub_yield_unit_code AS subYieldUnitCode,
|
||||||
|
a.sub_yield_unit AS subYieldUnit,
|
||||||
a.sub_sale_amount AS subSaleAmount,
|
a.sub_sale_amount AS subSaleAmount,
|
||||||
a.sub_sale_unit_code AS subSaleUnitCode,
|
a.sub_sale_unit_code AS subSaleUnitCode,
|
||||||
|
a.sub_sale_unit AS subSaleUnit,
|
||||||
a.monthly_input_status_id AS monthlyInputStatusId,
|
a.monthly_input_status_id AS monthlyInputStatusId,
|
||||||
a.created_at AS createdAt,
|
a.created_at AS createdAt,
|
||||||
a.created_by AS createdBy,
|
a.created_by AS createdBy,
|
||||||
|
|||||||
@@ -21,12 +21,16 @@
|
|||||||
a.month AS month,
|
a.month AS month,
|
||||||
a.main_yield AS mainYield,
|
a.main_yield AS mainYield,
|
||||||
a.main_yield_unit_code AS mainYieldUnitCode,
|
a.main_yield_unit_code AS mainYieldUnitCode,
|
||||||
|
a.main_yield_unit AS mainYieldUnit,
|
||||||
a.main_sale_amount AS mainSaleAmount,
|
a.main_sale_amount AS mainSaleAmount,
|
||||||
a.main_sale_unit_code AS mainSaleUnitCode,
|
a.main_sale_unit_code AS mainSaleUnitCode,
|
||||||
|
a.main_sale_unit AS mainSaleUnit,
|
||||||
a.sub_yield AS subYield,
|
a.sub_yield AS subYield,
|
||||||
a.sub_yield_unit_code AS subYieldUnitCode,
|
a.sub_yield_unit_code AS subYieldUnitCode,
|
||||||
|
a.sub_yield_unit AS subYieldUnit,
|
||||||
a.sub_sale_amount AS subSaleAmount,
|
a.sub_sale_amount AS subSaleAmount,
|
||||||
a.sub_sale_unit_code AS subSaleUnitCode,
|
a.sub_sale_unit_code AS subSaleUnitCode,
|
||||||
|
a.sub_sale_unit AS subSaleUnit,
|
||||||
a.monthly_input_status_id AS monthlyInputStatusId,
|
a.monthly_input_status_id AS monthlyInputStatusId,
|
||||||
a.created_at AS createdAt,
|
a.created_at AS createdAt,
|
||||||
a.created_by AS createdBy,
|
a.created_by AS createdBy,
|
||||||
|
|||||||
@@ -21,12 +21,16 @@
|
|||||||
month = #{month},
|
month = #{month},
|
||||||
main_yield = #{mainYield},
|
main_yield = #{mainYield},
|
||||||
main_yield_unit_code = #{mainYieldUnitCode},
|
main_yield_unit_code = #{mainYieldUnitCode},
|
||||||
|
main_yield_unit = #{mainYieldUnit},
|
||||||
main_sale_amount = #{mainSaleAmount},
|
main_sale_amount = #{mainSaleAmount},
|
||||||
main_sale_unit_code = #{mainSaleUnitCode},
|
main_sale_unit_code = #{mainSaleUnitCode},
|
||||||
|
main_sale_unit = #{mainSaleUnit},
|
||||||
sub_yield = #{subYield},
|
sub_yield = #{subYield},
|
||||||
sub_yield_unit_code = #{subYieldUnitCode},
|
sub_yield_unit_code = #{subYieldUnitCode},
|
||||||
|
sub_yield_unit = #{subYieldUnit},
|
||||||
sub_sale_amount = #{subSaleAmount},
|
sub_sale_amount = #{subSaleAmount},
|
||||||
sub_sale_unit_code = #{subSaleUnitCode},
|
sub_sale_unit_code = #{subSaleUnitCode},
|
||||||
|
sub_sale_unit = #{subSaleUnit},
|
||||||
monthly_input_status_id = #{monthlyInputStatusId},
|
monthly_input_status_id = #{monthlyInputStatusId},
|
||||||
<include refid="common.fields.UpdateBaseSet"/>
|
<include refid="common.fields.UpdateBaseSet"/>
|
||||||
WHERE id = #{id}
|
WHERE id = #{id}
|
||||||
|
|||||||
Reference in New Issue
Block a user