yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7.3接口新增字段

Browse Source
jg-waiwang-pro
胡川虎 4 months ago
parent c24a555c69
commit 56d9a5f885
8 changed files with 141 additions and 21 deletions
Show Stats Download Patch File Download Diff File

80
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
Unescape View File

@ -112,10 +112,18 @@
a.not_tax_price settlementPriceNo,
a.not_tax_count settlementSubtotalNo,
a.tax_count settlementTotal,
a.not_tax_count settlementTotalNo
a.not_tax_count settlementTotalNo,
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
e.name warehouseName,
(SELECT SUM(storage_number) from jg_warehousing_storage_product where product_id = a.product_id and warehousing_storage_id = d.id) storageNumber
FROM
jg_business_order_product_relational a
LEFT JOIN jg_product b ON a.product_id = b.id
LEFT JOIN jg_business_order c on a.business_order_id = c.id
LEFT JOIN jg_warehousing_storage d on c.code = d.business_order_no
LEFT JOIN jg_business_line e on e.id = d.warehouse_id
WHERE
a.business_order_id IN (
SELECT
@ -145,10 +153,18 @@
a.not_tax_price settlementPriceNo,
a.not_tax_count settlementSubtotalNo,
a.tax_count settlementTotal,
a.not_tax_count settlementTotalNo
a.not_tax_count settlementTotalNo,
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
e.name warehouseName,
(SELECT SUM(storage_number) from jg_warehousing_storage_product where product_id = a.product_id and warehousing_storage_id = d.id) storageNumber
FROM
jg_business_order_product_relational a
LEFT JOIN jg_product b ON a.product_id = b.id
LEFT JOIN jg_business_order c on a.business_order_id = c.id
LEFT JOIN jg_warehousing_storage d on c.code = d.business_order_no
LEFT JOIN jg_business_line e on e.id = d.warehouse_id
WHERE
a.business_order_id IN (
SELECT
@ -178,10 +194,18 @@
a.not_tax_price settlementPriceNo,
a.not_tax_count settlementSubtotalNo,
a.tax_count settlementTotal,
a.not_tax_count settlementTotalNo
a.not_tax_count settlementTotalNo,
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
e.name warehouseName,
(SELECT SUM(storage_number) from jg_warehousing_storage_product where product_id = a.product_id and warehousing_storage_id = d.id) storageNumber
FROM
jg_business_order_product_relational a
LEFT JOIN jg_product b ON a.product_id = b.id
LEFT JOIN jg_business_order c on a.business_order_id = c.id
LEFT JOIN jg_warehousing_storage d on c.code = d.business_order_no
LEFT JOIN jg_business_line e on e.id = d.warehouse_id
WHERE
a.business_order_id IN (
SELECT
@ -211,10 +235,18 @@
a.not_tax_price settlementPriceNo,
a.not_tax_count settlementSubtotalNo,
a.tax_count settlementTotal,
a.not_tax_count settlementTotalNo
a.not_tax_count settlementTotalNo,
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
e.name warehouseName,
(SELECT SUM(storage_number) from jg_warehousing_storage_product where product_id = a.product_id and warehousing_storage_id = d.id) storageNumber
FROM
jg_business_order_product_relational a
LEFT JOIN jg_product b ON a.product_id = b.id
LEFT JOIN jg_business_order c on a.business_order_id = c.id
LEFT JOIN jg_warehousing_storage d on c.code = d.business_order_no
LEFT JOIN jg_business_line e on e.id = d.warehouse_id
WHERE
a.business_order_id IN (
SELECT
@ -244,10 +276,18 @@
a.not_tax_price settlementPriceNo,
a.not_tax_count settlementSubtotalNo,
a.tax_count settlementTotal,
a.not_tax_count settlementTotalNo
a.not_tax_count settlementTotalNo,
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
e.name warehouseName,
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id) storageNumber
FROM
jg_business_order_product_relational a
LEFT JOIN jg_product b ON a.product_id = b.id
LEFT JOIN jg_business_order c on a.business_order_id = c.id
LEFT JOIN jg_warehousing_outbound d on c.code = d.business_order_no
LEFT JOIN jg_business_line e on e.id = d.warehouse_id
WHERE
a.business_order_id IN (
SELECT
@ -277,10 +317,18 @@
a.not_tax_price settlementPriceNo,
a.not_tax_count settlementSubtotalNo,
a.tax_count settlementTotal,
a.not_tax_count settlementTotalNo
a.not_tax_count settlementTotalNo,
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
e.name warehouseName,
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id) storageNumber
FROM
jg_business_order_product_relational a
LEFT JOIN jg_product b ON a.product_id = b.id
LEFT JOIN jg_business_order c on a.business_order_id = c.id
LEFT JOIN jg_warehousing_outbound d on c.code = d.business_order_no
LEFT JOIN jg_business_line e on e.id = d.warehouse_id
WHERE
a.business_order_id IN (
SELECT
@ -310,10 +358,18 @@
a.not_tax_price settlementPriceNo,
a.not_tax_count settlementSubtotalNo,
a.tax_count settlementTotal,
a.not_tax_count settlementTotalNo
a.not_tax_count settlementTotalNo,
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
e.name warehouseName,
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id) storageNumber
FROM
jg_business_order_product_relational a
LEFT JOIN jg_product b ON a.product_id = b.id
LEFT JOIN jg_business_order c on a.business_order_id = c.id
LEFT JOIN jg_warehousing_outbound d on c.code = d.business_order_no
LEFT JOIN jg_business_line e on e.id = d.warehouse_id
WHERE
a.business_order_id IN (
SELECT
@ -343,10 +399,18 @@
a.not_tax_price settlementPriceNo,
a.not_tax_count settlementSubtotalNo,
a.tax_count settlementTotal,
a.not_tax_count settlementTotalNo
a.not_tax_count settlementTotalNo,
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
e.name warehouseName,
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id) storageNumber
FROM
jg_business_order_product_relational a
LEFT JOIN jg_product b ON a.product_id = b.id
LEFT JOIN jg_business_order c on a.business_order_id = c.id
LEFT JOIN jg_warehousing_outbound d on c.code = d.business_order_no
LEFT JOIN jg_business_line e on e.id = d.warehouse_id
WHERE
a.business_order_id IN (
SELECT

24
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
Unescape View File

@ -1030,11 +1030,11 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setACCOUNT_LINE_NO(i);
yunguanSaleSettlementProductModel.setLINE_TYPE("INV");
//采购订单号
yunguanSaleSettlementProductModel.setORD_NO("");
yunguanSaleSettlementProductModel.setORD_NO(cwsettlementsummaryModel.getBusinessCode());
//采购订单明细行
yunguanSaleSettlementProductModel.setORD_LN(i);
yunguanSaleSettlementProductModel.setORD_LN(Integer.parseInt(cwsettlementsummaryModel.getOrdLn()));
//采购入库单号
yunguanSaleSettlementProductModel.setRECEIPT_NO("");
yunguanSaleSettlementProductModel.setRECEIPT_NO(cwsettlementsummaryModel.getDocmentNo());
yunguanSaleSettlementProductModel.setCONTRACT_NO(contractLEntity.getContractNumber());
yunguanSaleSettlementProductModel.setATTRIBUTE1(contractLEntity.getContractNo());
yunguanSaleSettlementProductModel.setITEM_CD(productWarehouseEntity.getCode());
@ -1042,11 +1042,11 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setUNIT(cwsettlementsummaryModel.getSettlementUnit());
yunguanSaleSettlementProductModel.setQUANTITY_ACCOUNT(new BigDecimal(cwsettlementsummaryModel.getSettlementSum()));
//入库量
yunguanSaleSettlementProductModel.setQUANTITY_INVOICED(BigDecimal.ZERO);
yunguanSaleSettlementProductModel.setQUANTITY_INVOICED(cwsettlementsummaryModel.getStorageNumber());
yunguanSaleSettlementProductModel.setTAX_RATE_CODE("VAT_IN_"+cwsettlementsummaryModel.getRate());
yunguanSaleSettlementProductModel.setTAX_RATE(Integer.parseInt(cwsettlementsummaryModel.getRate()));
//仓库名称
yunguanSaleSettlementProductModel.setSUBINVENTORY("");
yunguanSaleSettlementProductModel.setSUBINVENTORY(cwsettlementsummaryModel.getWarehouseName());
yunguanSaleSettlementProductModel.setATTRIBUTE15(cwsettlementsummaryModel.getSettlementSubtotal());
yunguanSaleSettlementProductModel.setAMOUNT(new BigDecimal(cwsettlementsummaryModel.getSettlementSubtotalNo()));
yunguanSaleSettlementProductModel.setDESCRIPTION(cwsettlementsummaryModel.getDescription());
@ -1166,12 +1166,12 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setINVOICE_TYPE("T");
}
yunguanSaleSettlementProductModel.setATTRIBUTE4(String.valueOf(i));
//销售订单，暂时没值
yunguanSaleSettlementProductModel.setORD_NO("");
//销售订单行，暂时没值
yunguanSaleSettlementProductModel.setLINE_NO("");
//出库单行，暂时没值
yunguanSaleSettlementProductModel.setDORD_NO("");
//销售订单号
yunguanSaleSettlementProductModel.setORD_NO(cwsettlementsummaryModel.getBusinessCode());
//销售订单行号
yunguanSaleSettlementProductModel.setLINE_NO(cwsettlementsummaryModel.getOrdLn());
//出库单号
yunguanSaleSettlementProductModel.setDORD_NO(cwsettlementsummaryModel.getDocmentNo());
yunguanSaleSettlementProductModel.setCONTRACT_CD(contractLEntity.getContractNumber());
yunguanSaleSettlementProductModel.setKH_CONTR_NO(contractLEntity.getContractNo());
yunguanSaleSettlementProductModel.setCUST_ID(subjectbasicEntity.getId());
@ -1185,7 +1185,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setORD_QUANTITY(cwsettlementsummaryModel.getSettlementSum());
yunguanSaleSettlementProductModel.setQUANTITY(cwsettlementsummaryModel.getSettlementSum());
//出库量
yunguanSaleSettlementProductModel.setSTO_OUT_WGT(cwsettlementsummaryModel.getSettlementSum());
yunguanSaleSettlementProductModel.setSTO_OUT_WGT(cwsettlementsummaryModel.getStorageNumber());
yunguanSaleSettlementProductModel.setUNIT(cwsettlementsummaryModel.getSettlementUnit());
yunguanSaleSettlementProductModel.setINV_PRICE(cwsettlementsummaryModel.getSettlementPrice());
yunguanSaleSettlementProductModel.setINV_AMT(cwsettlementsummaryModel.getSettlementSubtotal());

11
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java
Unescape View File

@ -82,4 +82,15 @@ public class CwaccountsummaryEntity {
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField("ord_ln")
private String ordLn;
@TableField("business_code")
private String businessCode;
@TableField("docment_no")
private String docmentNo;
@TableField("warehouse_name")
private String warehouseName;
@TableField("storage_number")
private BigDecimal storageNumber;
}

11
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountvoucherEntity.java
Unescape View File

@ -142,4 +142,15 @@ public class CwaccountvoucherEntity {
@TableField(exist = false)
private String notTaxCount;
@TableField(exist = false)
private String ordLn;
@TableField(exist = false)
private String businessCode;
@TableField(exist = false)
private String docmentNo;
@TableField(exist = false)
private String warehouseName;
@TableField(exist = false)
private BigDecimal storageNumber;
}

11
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
Unescape View File

@ -82,4 +82,15 @@ public class CwsettlementsummaryEntity {
private String lineNo;
@TableField("DESCRIPTION")
private String description;
@TableField("ord_ln")
private String ordLn;
@TableField("business_code")
private String businessCode;
@TableField("docment_no")
private String docmentNo;
@TableField("warehouse_name")
private String warehouseName;
@TableField("storage_number")
private BigDecimal storageNumber;
}

12
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java
Unescape View File

@ -1,5 +1,6 @@
package jnpf.model.cwaccount;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.List;
import java.util.Date;
@ -66,4 +67,15 @@ public class CwaccountsummaryModel {
/** 备注 **/
@JSONField(name = "remark")
private String remark;
@JSONField(name = "ordLn")
private String ordLn;
@JSONField(name = "businessCode")
private String businessCode;
@JSONField(name = "docmentNo")
private String docmentNo;
@JSONField(name = "warehouseName")
private String warehouseName;
@JSONField(name = "storageNumber")
private BigDecimal storageNumber;
}

11
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java
Unescape View File

@ -65,4 +65,15 @@ public class CwsettlementsummaryModel {
private String itemNmInv;
@JSONField(name = "DESCRIPTION")
private String description;
@JSONField(name = "ordLn")
private String ordLn;
@JSONField(name = "businessCode")
private String businessCode;
@JSONField(name = "docmentNo")
private String docmentNo;
@JSONField(name = "warehouseName")
private String warehouseName;
@JSONField(name = "storageNumber")
private BigDecimal storageNumber;
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java
Unescape View File

@ -76,7 +76,7 @@ public class YunguanSaleSettlementProductModel {
private String QUANTITY;
/** 对应出库量 **/
@JSONField(name = "STO_OUT_WGT")
private String STO_OUT_WGT;
private BigDecimal STO_OUT_WGT;
/** 结算单位 **/
@JSONField(name = "UNIT")
private String UNIT;

Write Preview
Loading…
Cancel
Save