From 429dafb6699a4ed731ffe699cf5d2e6731f6cb46 Mon Sep 17 00:00:00 2001 From: vayne Date: Wed, 5 Jun 2024 17:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/BusinessOrderMapper.xml | 149 ++++++++--------- .../mapper/scm/WarehousingOutboundMapper.xml | 67 +++++--- .../mapper/scm/WarehousingStorageMapper.xml | 114 ++++++++----- .../mapper/WarehousingOutboundMapper.java | 6 +- .../jnpf/mapper/WarehousingStorageMapper.java | 6 +- .../service/WarehousingOutboundService.java | 5 - .../service/WarehousingStorageService.java | 5 - .../impl/BusinessOrderServiceImpl.java | 3 + .../jnpf/service/impl/VoucherServiceImpl.java | 1 + .../impl/WarehousingOutboundServiceImpl.java | 48 +++--- .../impl/WarehousingStorageServiceImpl.java | 45 +++-- .../controller/BusinessOrderController.java | 42 +++++ .../WarehousingOutboundController.java | 14 -- .../YunguanInterfaceController.java | 27 +++ .../java/jnpf/entity/BusinessOrderEntity.java | 2 + .../BusinessOrderProductRelationalEntity.java | 2 + .../main/java/jnpf/entity/VoucherEntity.java | 2 + .../WarehousingOutboundProductEntity.java | 2 + .../WarehousingStorageProductEntity.java | 2 + .../businessorder/BusinessOrderForm.java | 3 + .../yunguan/YunguanPurchaseInBoundModel.java | 52 +++++- .../yunguan/YunguanPurchaseOrderModel.java | 73 ++++++++- .../YunguanPurchaseOrderProductModel.java | 52 +++++- .../yunguan/YunguanSaleCollectionModel.java | 140 ++++++++++++++++ .../model/yunguan/YunguanSaleOrderModel.java | 62 ++++++- .../yunguan/YunguanSaleOrderProductModel.java | 26 ++- .../yunguan/YunguanSaleOutBoundModel.java | 40 ++++- .../yunguan/YunguanSaleSettlementModel.java | 119 ++++++++++++++ .../YunguanSaleSettlementProductModel.java | 154 ++++++++++++++++++ .../purchaseCenter/purchaseOrder/index.vue | 4 +- .../views/scm/saleCenter/saleOrder/form.vue | 15 +- .../views/scm/saleCenter/saleOrder/index.vue | 6 +- 32 files changed, 1040 insertions(+), 248 deletions(-) create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleCollectionModel.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index b5806df4..16401076 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -896,6 +896,7 @@ b.id AS ID, c.f_en_code AS COMP_CD, a.CODE AS ORD_NO, + b.ord_ln as ORD_LN, d.CODE AS ITEM_CD, d.NAME AS ITEM_NM, d.spec AS SPEC_TYPE, @@ -905,27 +906,20 @@ b.not_tax_price AS PRICE, b.business_price AS TAX_PRICE, b.tax AS TAX_RATE, + f.tax_rate_code AS TAX_RATE_CD b.not_tax_count AS AMOUNT, b.tax_count AS TOTAL_AMOUNT, 'CYN' AS CURRENCY_CD, a.expect_arrive_date_start AS DELV_DT, - CASE - a.STATUS - WHEN '1' THEN - '待提交' - WHEN '2' THEN - '待审核' - WHEN '3' THEN - '待入库' - WHEN '4' THEN - '部分入库' - WHEN '5' THEN - '已完成' - WHEN '6' THEN - '已驳回' - WHEN '7' THEN - '已关闭' - END AS ORD_STATUS + f.delv_tol_max as DELV_TOL_MAX, + f.delv_tol_min as DELV_TOL_MIN, + 'B' AS ORD_STATUS, + 'N' as READ_FLAG, + '' as READ_TIME, + '' as ERR_MESSAGE, + 'N' as ESB_STATUS, + '' as ESB_DTM, + '' as ESB_MESSAGE FROM jg_business_order a RIGHT JOIN jg_business_order_product_relational b ON b.business_order_id = a.id @@ -944,13 +938,17 @@ @@ -1041,24 +1040,11 @@ SELECT b.id AS ID, c.f_en_code AS COMP_CD, + g.f_id as DEPARTMENT_CD, a.CODE AS ORD_NO, - CASE - a.STATUS - WHEN '1' THEN - '待提交' - WHEN '2' THEN - '待审核' - WHEN '3' THEN - '待入库' - WHEN '4' THEN - '部分入库' - WHEN '5' THEN - '已完成' - WHEN '6' THEN - '已驳回' - WHEN '7' THEN - '已关闭' - END AS ORD_STS, + b.ord_ln as ORD_LN, + '' as CONTR_LINE_ID, + 'B' AS ORD_STS, d.CODE AS ITEM_CD, d.NAME AS ITEM_NM, d.spec AS SPEC_TYPE, @@ -1067,8 +1053,22 @@ b.business_price AS ORD_PRICE, b.tax_count AS TOT_AMOUNT, b.tax AS TAX_RATE_CODE, + f.tax_rate_code as TAX_RATE, + (IFNULL(b.tax_count,0) - IFNULL(b.not_tax_count,0)) as TAX_AMOUNT b.not_tax_price AS TAX_PRICE, - b.not_tax_count AS AMOUNT + b.not_tax_count AS AMOUNT, + f.delv_tol_max as DELV_TOL_MAX, + f.delv_tol_min as DELV_TOL_MIN, + '' as REMARKS1, + h.f_real_name as CREATE_EMP_ID, + a.f_creator_time as CREATE_DTM, + '0' as CANCLE_YN, + 'N' as READ_FLAG, + '' as READ_TIME, + '' as ERR_MESSAGE, + 'N' as ESB_STATUS, + '' as ESB_DTM, + '' as ESB_MESSAGE FROM jg_business_order a RIGHT JOIN jg_business_order_product_relational b ON b.business_order_id = a.id @@ -1082,6 +1082,9 @@ LEFT JOIN jg_contract_commodity f ON e.id = f.contract_id AND b.product_id = f.product_id AND f.f_delete_mark IS NULL - WHERE a.f_delete_mark IS NULL AND a.id = #{id} + LEFT JOIN base_organize g ON a.department_id = g.f_id + AND g.f_delete_mark IS NULL + LEFT JOIN base_user h ON a.f_creator_user_id = h.id AND h.f_delete_mark is null + WHERE a.f_delete_mark IS NULL AND a.id = #{id} diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml index 096f99ba..141c203c 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml @@ -120,23 +120,40 @@ - + + + + + + + + + + + + + + + diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml index 8a832185..b272a882 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml @@ -351,11 +351,15 @@ d.kucun_org_name AS INV_ORG_NM, f.f_en_code AS DEPT_CD, f.f_full_name AS DEPT_NM, + g.f_id as ADD_CODE, g.f_real_name AS ADD_NAME, a.f_creator_time AS ADD_TIME, + g.f_real_name as SUBMIT_EMP_ID, + a.f_creator_time as SUBMIT_DTM, a.document_no AS RECEIPT_NO, a.warehousing_time AS RECEIPT_DTM, - c.CODE AS ORD_NO, + IF(a.warehousing_storage_type = 1,c.code,l.code) as ORD_NO, + aa.ord_ln as ORD_LN, h.contract_number AS CON_CD, h.contract_no AS CON_NO, d.CODE AS SUPPLIER_CD, @@ -373,9 +377,34 @@ '已驳回' WHEN '5' THEN '已关闭' - END AS STO_STS + END AS STO_STS, + j.CODE AS ITEM_CD, + j.NAME AS ITEM_NM, + CASE + j.inventory_type + WHEN '1' THEN + '原材料' + WHEN '2' THEN + '半成品' + WHEN '3' THEN + '产成品' + END AS ITEM_TYPE, + j.spec AS SPEC_TYPE, + aa.storage_unit AS UNIT, + aa.storage_number AS QUANTITY, + IF(a.warehousing_storage_type = 1,m.business_price,n.business_price) as PRICE, + IF(a.warehousing_storage_type = 1,m.tax_count,n.tax_count) as AMOUNT, + g.f_real_name AS STO_EMP_ID, + a.warehousing_time AS STO_DTM, + 'N' as READ_FLAG, + '' as READ_TIME, + '' as ERR_MESSAGE, + 'N' as ESB_STATUS, + '' as ESB_DTM, + '' as ESB_MESSAGE FROM jg_warehousing_storage a + RIGHT JOIN jg_warehousing_storage_product aa ON a.id = aa.warehousing_storage_id AND aa.f_delete_mark is null LEFT JOIN jg_warehousing_notification b ON a.warehousing_id = b.id AND b.f_delete_mark IS NULL LEFT JOIN jg_business_order c ON b.business_id = c.id AND c.f_delete_mark IS NULL LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND b.f_delete_mark IS NULL @@ -384,44 +413,55 @@ LEFT JOIN base_user g ON a.f_creator_user_id = g.f_id AND e.f_delete_mark IS NULL LEFT JOIN jg_contract h ON c.contract_id = h.id AND f.f_delete_mark IS NULL LEFT JOIN jg_business_line i ON a.warehouse_id = i.id AND i.f_delete_mark IS NULL + LEFT JOIN jg_product j ON aa.product_id = j.id AND j.f_delete_mark IS NULL + LEFT JOIN jg_business_order_product_relational m ON c.id = m.business_order_id + AND aa.product_id = m.product_id + AND aa.storage_unit = m.sales_main_unit_id + AND m.f_delete_mark IS NULL + LEFT JOIN jg_receipt_order k on a.warehousing_id = k.id and k.f_delete_mark is null + LEFT JOIN jg_business_order l on k.business_id = l.id and l.f_delete_mark is null + LEFT JOIN jg_business_order_product_relational n ON l.id = n.business_order_id + AND aa.product_id = n.product_id + AND aa.storage_unit = n.sales_main_unit_id + AND n.f_delete_mark IS NULL WHERE a.f_delete_mark is null AND a.id = #{id} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundMapper.java index d4cd5498..bda5a199 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundMapper.java @@ -35,9 +35,9 @@ public interface WarehousingOutboundMapper extends BaseMapper saleOutBoundProductByYunGuan(@Param("id") String id); + List saleOutBoundByYunGuan(@Param("id") String id); +//// 运管销售出库商品 +// List saleOutBoundProductByYunGuan(@Param("id") String id); IPage queryWarehousingOutboundList(@Param("page") Page page, @Param("warehousingOutboundPagination") WarehousingOutboundPagination warehousingOutboundPagination, @Param("ew") Wrapper warehousingOutboundQueryWrapper); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingStorageMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingStorageMapper.java index ca9a6e7d..3ea830a4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingStorageMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingStorageMapper.java @@ -43,9 +43,9 @@ public interface WarehousingStorageMapper extends BaseMapper purchaseInBoundProductByYunGuan(@Param("id") String id); + List purchaseInBoundByYunGuan(@Param("id") String id); +// //运管采购入库商品 +// List purchaseInBoundProductByYunGuan(@Param("id") String id); IPage queryWarehousingStorageList(@Param("page")Page page, @Param("warehousingStoragePagination") WarehousingStoragePagination warehousingStoragePagination, @Param("ew") Wrapper warehousingStorageQueryWrapper); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java index 90c37e26..8adaa034 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java @@ -61,10 +61,5 @@ public interface WarehousingOutboundService extends IService saleOutBoundProductByYunGuanInfo(String id); - BigDecimal queryCurrentDayAmount(WarehousingOutboundEntity warehousingOutboundEntity); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingStorageService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingStorageService.java index a5d84888..07394234 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingStorageService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingStorageService.java @@ -62,10 +62,5 @@ public interface WarehousingStorageService extends IService purchaseInBoundProductByYunGuanInfo(String id); - BigDecimal queryCurrentDayAmount(WarehousingStorageEntity warehousingStorage); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java index 3c099826..49167c07 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java @@ -1054,11 +1054,14 @@ public class BusinessOrderServiceImpl extends ServiceImpl tableField158 = JsonUtil.getJsonToList(businessOrderForm.getBusinessOrderProductRelationalList(),BusinessOrderProductRelationalEntity.class); //统计采购订单商品数量 BigDecimal planReceiptNum = BigDecimal.ZERO; + int line = 1; for(BusinessOrderProductRelationalEntity entitys : tableField158){ planReceiptNum = planReceiptNum.add(entitys.getBusinessNum()); entitys.setId(RandomUtil.uuId()); entitys.setBusinessOrderId(entity.getId()); if(isSave){ + entitys.setOrdLn(String.valueOf(line)); //运管订单行号 + line++; }else{ } businessOrderProductRelationalService.saveOrUpdate(entitys); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index fddb9fd5..b5478992 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -708,6 +708,7 @@ public class VoucherServiceImpl extends ServiceImpl tableField119 = JsonUtil.getJsonToList(warehousingOutboundForm.getWarehousingOutboundProductList(),WarehousingOutboundProductEntity.class); + int line = 1; for(WarehousingOutboundProductEntity entitys : tableField119){ entitys.setId(RandomUtil.uuId()); entitys.setWarehousingOutboundId(entity.getId()); if(isSave){ + entitys.setOrdLn(String.valueOf(line)); + line++; }else{ } warehousingOutboundProductService.saveOrUpdate(entitys); @@ -708,6 +711,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl tableField119 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryProductRelationList(),WarehousingStorageProductEntity.class); + int line = 1; for(DeliveryProductRelationModel entitys : deliveryOrderForm.getDeliveryProductRelationList()){ countNum = countNum.add(entitys.getDeliveryNum()); WarehousingOutboundProductEntity warehousingOutboundProductEntity = new WarehousingOutboundProductEntity(); @@ -725,10 +729,10 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundProductByYunGuan(entity.getId()); - for (YunguanSaleOutBoundModel model : yunguanSaleOutBoundModelList){ - BeanMergeUtil.merge(model,yunguanSaleOutBoundModel); - } - if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) { - JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList)); - if (ObjectUtil.isNotEmpty(saleCode)){ - if (saleCode.get("code").equals("200")) { - } - } - } - } +// if (entity.getWarehousingOutboundType().equals("12")){ +// List yunguanSaleOutBoundModel = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId()); +//// List yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundProductByYunGuan(entity.getId()); +//// for (YunguanSaleOutBoundModel model : yunguanSaleOutBoundModelList){ +//// BeanMergeUtil.merge(model,yunguanSaleOutBoundModel); +//// } +// if (yunguanSaleOutBoundModel != null && yunguanSaleOutBoundModel.size()>0) { +// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModel)); +// if (ObjectUtil.isNotEmpty(saleCode)){ +// if (saleCode.get("code").equals("200")) { +// } +// } +// } +// } } @Override @@ -924,16 +928,6 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl saleOutBoundProductByYunGuanInfo(String id) { - return warehousingOutboundMapper.saleOutBoundProductByYunGuan(id); - } - @Override public BigDecimal queryCurrentDayAmount(WarehousingOutboundEntity warehousingOutboundEntity) { return warehousingOutboundMapper.queryCurrentDayAmount(warehousingOutboundEntity); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java index ab3e4fd3..bb9a9361 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java @@ -585,12 +585,15 @@ public class WarehousingStorageServiceImpl extends ServiceImpl tableField119 = JsonUtil.getJsonToList(warehousingStorageForm.getWarehousingStorageProductList(),WarehousingStorageProductEntity.class); + int line = 1; for(WarehousingStorageProductEntity entitys : tableField119){ entitys.setId(RandomUtil.uuId()); entitys.setWarehousingStorageId(entity.getId()); entitys.setReceivedQuantity(entitys.getStorageNumber()); if(isSave){ entitys.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false)); + entitys.setOrdLn(String.valueOf(line)); + line++; }else{ } warehousingStorageProductService.saveOrUpdate(entitys); @@ -750,6 +753,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl tableField119 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryProductRelationList(),WarehousingStorageProductEntity.class); + int line = 1; for(DeliveryProductRelationModel entitys : receiptOrderForm.getDeliveryProductRelationList()){ countNum = countNum.add(entitys.getDeliveryNum()); WarehousingStorageProductEntity warehousingStorageProductEntity = new WarehousingStorageProductEntity(); @@ -768,7 +772,9 @@ public class WarehousingStorageServiceImpl extends ServiceImpl yunguanPurchaseProductInBoundModelList = warehousingStorageMapper.purchaseInBoundProductByYunGuan(entity.getId()); - for (YunguanPurchaseInBoundModel model : yunguanPurchaseProductInBoundModelList){ - BeanMergeUtil.merge(model,yunguanPurchaseInBoundModel); - } - if (yunguanPurchaseProductInBoundModelList != null && yunguanPurchaseProductInBoundModelList.size()>0) { - JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseProductInBoundModelList)); - if (ObjectUtil.isNotEmpty(purchaseCode)){ - if (purchaseCode.get("code").equals("200")) { - } - } - } - } +// if (entity.getWarehousingStorageType().equals("15")){ +// List yunguanPurchaseInBoundModel = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId()); +//// List yunguanPurchaseProductInBoundModelList = warehousingStorageMapper.purchaseInBoundProductByYunGuan(entity.getId()); +//// for (YunguanPurchaseInBoundModel model : yunguanPurchaseProductInBoundModelList){ +//// BeanMergeUtil.merge(model,yunguanPurchaseInBoundModel); +//// } +// if (yunguanPurchaseInBoundModel != null && yunguanPurchaseInBoundModel.size()>0) { +// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModel)); +// if (ObjectUtil.isNotEmpty(purchaseCode)){ +// if (purchaseCode.get("code").equals("200")) { +// } +// } +// } +// } } @@ -1244,17 +1250,6 @@ public class WarehousingStorageServiceImpl extends ServiceImpl purchaseInBoundProductByYunGuanInfo(String id) { - return warehousingStorageMapper.purchaseInBoundProductByYunGuan(id); - } - @Override public BigDecimal queryCurrentDayAmount(WarehousingStorageEntity warehousingStorage) { return warehousingStorageMapper.queryCurrentDayAmount(warehousingStorage); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index b863657d..b09e5f1d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -116,6 +116,10 @@ public class BusinessOrderController { private FlowTaskNodeService flowTaskNodeService; @Autowired private OrganizeService organizeService; + @Autowired + private VoucherService voucherService; + @Autowired + private VoucherProductService voucherProductService; /** * 列表 @@ -128,7 +132,45 @@ public class BusinessOrderController { public ActionResult list(@RequestBody BusinessOrderPagination businessOrderPagination)throws IOException{ List list= businessOrderService.getList(businessOrderPagination); List> realList=new ArrayList<>(); + //计算销售订单的利润 for (BusinessOrderEntity entity : list) { + //计算销售订单的总额 + QueryWrapper queryWrapperSaleProduct = new QueryWrapper<>(); + queryWrapperSaleProduct.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,entity.getId()); + List businessOrderProductList = businessOrderProductRelationalService.list(queryWrapperSaleProduct); + BigDecimal saleAmount = new BigDecimal(0); //销售订单总额 + BigDecimal purchaseAmount = new BigDecimal(0); //采购订单总额 + for (BusinessOrderProductRelationalEntity productEntity : businessOrderProductList){ + saleAmount = saleAmount.add(new BigDecimal(productEntity.getTaxCount())); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(VoucherEntity::getIsTransfer,"2"); + queryWrapper.lambda().eq(VoucherEntity::getBusinessOrderId,entity.getId()); + queryWrapper.lambda().isNull(VoucherEntity::getDeleteMark); + List voucherEntityList = voucherService.list(queryWrapper); //销售订单下所有销售发货凭证 + for (VoucherEntity entity1 : voucherEntityList){ + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(VoucherEntity::getIsSaleDeliveryVoucher,"2"); + queryWrapper1.lambda().eq(VoucherEntity::getVoucherRelation,entity1.getId()); + queryWrapper1.lambda().isNull(VoucherEntity::getDeleteMark); + VoucherEntity voucherEntity = voucherService.getOne(queryWrapper1); //销售发货凭证对应的采购收货凭证 + if (ObjectUtil.isNotEmpty(voucherEntity)){ + QueryWrapper queryWrapperVoucherProduct = new QueryWrapper<>(); + queryWrapperVoucherProduct.lambda().eq(VoucherProductEntity::getVoucherId,voucherEntity.getId()); + VoucherProductEntity voucherProductEntity = voucherProductService.getOne(queryWrapperVoucherProduct); //采购收货凭证下的商品信息 + BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(voucherEntity.getBusinessOrderId()); //采购收货凭证对应的采购单 + if (ObjectUtil.isNotEmpty(businessOrderEntity) && ObjectUtil.isNotEmpty(voucherProductEntity)){ + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId()); + queryWrapper2.lambda().eq(BusinessOrderProductRelationalEntity::getProductId,voucherProductEntity.getProductId()); + BusinessOrderProductRelationalEntity businessOrderProductRelationalEntity = businessOrderProductRelationalService.getOne(queryWrapper2); //通过凭证商品id和采购单id找出采购单下具体的商品信息 + if (ObjectUtil.isNotEmpty(businessOrderProductRelationalEntity)){ + purchaseAmount = purchaseAmount.add(businessOrderProductRelationalEntity.getBusinessPrice().multiply(voucherProductEntity.getNetWeight()).setScale(2,BigDecimal.ROUND_HALF_UP)); //采购单价*凭证净重 = 采购金额 + } + } + } + } + entity.setProfit(saleAmount.subtract(purchaseAmount));//利润 Map businessOrderMap=JsonUtil.entityToMap(entity); businessOrderMap.put("id", businessOrderMap.get("id")); //副表数据 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java index b41bfad4..301c5b5d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java @@ -687,20 +687,6 @@ public class WarehousingOutboundController { //inventoryLogEntity.setRetailPrice();//零售价 inventoryLogService.saveOrUpdate(inventoryLogEntity); } - if (entity.getWarehousingOutboundType().equals("1")){ - YunguanSaleOutBoundModel yunguanSaleOutBoundModel = warehousingOutboundService.saleOutBoundByYunGuanInfo(id); - List yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundProductByYunGuanInfo(id); - for (YunguanSaleOutBoundModel model : yunguanSaleOutBoundModelList){ - BeanMergeUtil.merge(model,yunguanSaleOutBoundModel); - } - if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) { - JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList)); - if (ObjectUtil.isNotEmpty(saleCode)){ - if (saleCode.get("code").equals("200")) { - } - } - } - } } }catch(Exception e){ return ActionResult.fail("修改数据失败"); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java index d48c6c19..df79b444 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java @@ -12,6 +12,7 @@ import jnpf.base.service.ProvinceService; import jnpf.constant.PermissionConst; import jnpf.entity.*; import jnpf.model.yunguan.YunguanCustomerModel; +import jnpf.model.yunguan.YunguanSaleCollectionModel; import jnpf.permission.entity.OrganizeEntity; import jnpf.permission.service.OrganizeService; import jnpf.service.*; @@ -442,4 +443,30 @@ public class YunguanInterfaceController { YunguanCustomerModel yunguanCustomerModel = JsonUtil.getJsonToBean(str, YunguanCustomerModel.class); return ActionResult.success("运管推送签约请示到智慧成功"); } + + /** + * 运管推送销售收款-销售业务到智慧 + * + * @param + * @return + */ + @Operation(summary = "运管推送销售收款-销售业务到智慧") + @PostMapping("/syncSaleCollection") + public ActionResult syncSaleCollection(HttpServletRequest httpRequest) throws IOException { + ServletInputStream inputStream = httpRequest.getInputStream(); + byte[] bytes = new byte[httpRequest.getContentLength()]; + inputStream.read(bytes); + String str = new String(bytes, StandardCharsets.UTF_8); + System.out.println(str); + YunguanSaleCollectionModel yunguanSaleCollectionModel = JsonUtil.getJsonToBean(str, YunguanSaleCollectionModel.class); + CwpaymentreceiptEntity cwpaymentreceiptEntity = new CwpaymentreceiptEntity(); + cwpaymentreceiptEntity.setCode(yunguanSaleCollectionModel.getPREPAYMENT_NO()); + cwpaymentreceiptEntity.setPayer(yunguanSaleCollectionModel.getCUST_NAME()); + cwpaymentreceiptEntity.setApplyAmount(yunguanSaleCollectionModel.getPREPAYMENT_AMT()); + cwpaymentreceiptEntity.setPayDate(yunguanSaleCollectionModel.getPREPAYMENT_DT()); + cwpaymentreceiptEntity.setPayType(yunguanSaleCollectionModel.getCOLLECTION_TY()); + cwpaymentreceiptEntity.setRemark(yunguanSaleCollectionModel.getREMARKS()); + return ActionResult.success("运管推送销售收款到智慧成功"); + } + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java index b7522662..77119d77 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java @@ -198,4 +198,6 @@ public class BusinessOrderEntity { private String searchDateString; @TableField(exist = false) private String productId; + @TableField(exist = false) + private BigDecimal profit; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java index a24a3357..ed5bfbd8 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java @@ -76,6 +76,8 @@ public class BusinessOrderProductRelationalEntity { private String lastSalePrice; @TableField("SALE_NUM_DAY") private String saleNumDay; + @TableField("ORD_LN") + private String ordLn; @TableField(exist = false) private List voucherIdList; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java index 95d82f00..4bcb5443 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java @@ -154,6 +154,8 @@ public class VoucherEntity { private String purchaseAmount; @TableField("SALE_AMOUNT") private String saleAmount; + @TableField("VOUCHER_RELATION") + private String voucherRelation; @TableField(exist = false) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java index 0c563653..fa1202e7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java @@ -71,6 +71,8 @@ public class WarehousingOutboundProductEntity { @TableField("BUSINESS_PRICE") private BigDecimal businessPrice; + @TableField("ORD_LN") + private String ordLn; /** * 退货单的商品列表 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java index fe6203ce..fc339be5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java @@ -73,6 +73,8 @@ public class WarehousingStorageProductEntity { @TableField("BUSINESS_PRICE") private BigDecimal businessPrice; + @TableField("ORD_LN") + private String ordLn; /** * 退货单的商品列表 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java index b5b8e1bf..2e8132b3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java @@ -116,4 +116,7 @@ public class BusinessOrderForm { /** 是否转换采购/销售 */ @JsonProperty("isTransferSource") private Object isTransferSource; + /** YG销售方式 */ + @JsonProperty("externalSaleWay") + private Object externalSaleWay; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseInBoundModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseInBoundModel.java index f5d764bb..8c39e35c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseInBoundModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseInBoundModel.java @@ -3,6 +3,9 @@ package jnpf.model.yunguan; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + @Data public class YunguanPurchaseInBoundModel { /** ID**/ @@ -31,13 +34,19 @@ public class YunguanPurchaseInBoundModel { private String ADD_NAME; /** 创建时间 **/ @JSONField(name = "ADD_TIME") - private String ADD_TIME; + private Date ADD_TIME; + /** 上传人 **/ + @JSONField(name = "SUBMIT_EMP_ID") + private String SUBMIT_EMP_ID; + /** 上传时间 **/ + @JSONField(name = "SUBMIT_DTM") + private Date SUBMIT_DTM; /** 入库单号 **/ @JSONField(name = "RECEIPT_NO") private String RECEIPT_NO; /** 入库时间 **/ @JSONField(name = "RECEIPT_DTM") - private String RECEIPT_DTM; + private Date RECEIPT_DTM; /** 关联单号 **/ @JSONField(name = "ORD_NO") private String ORD_NO; @@ -73,17 +82,50 @@ public class YunguanPurchaseInBoundModel { private String UNIT; /** 入库数量 **/ @JSONField(name = "QUANTITY") - private String QUANTITY; + private BigDecimal QUANTITY; /** 入库仓库 **/ @JSONField(name = "STO_NM") private String STO_NM; /** 采购单价 **/ @JSONField(name = "PRICE") - private String PRICE; + private BigDecimal PRICE; /** 含税小计 **/ @JSONField(name = "AMOUNT") - private String AMOUNT; + private BigDecimal AMOUNT; /** 订单状态 **/ @JSONField(name = "STO_STS") private String STO_STS; + /** 入库人 **/ + @JSONField(name = "STO_EMP_ID") + private String STO_EMP_ID; + /** 入库时间 **/ + @JSONField(name = "STO_DTM") + private Date STO_DTM; + /** 确认人 **/ + @JSONField(name = "STO_CONFIRM_ID") + private String STO_CONFIRM_ID; + /** 确认时间 **/ + @JSONField(name = "STO_CONFIRM_DTM") + private Date STO_CONFIRM_DTM; + /** 入库标记 **/ + @JSONField(name = "STO_FLAG") + private String STO_FLAG; + /** 读取标记 **/ + @JSONField(name = "READ_FLAG") + private String READ_FLAG; + /** 读取时间 **/ + @JSONField(name = "READ_TIME") + private Date READ_TIME; + /** 错误信息 **/ + @JSONField(name = "ERR_MESSAGE") + private String ERR_MESSAGE; + /** ESB是否传输 **/ + @JSONField(name = "ESB_STATUS") + private String ESB_STATUS; + /** ESB传输时间 **/ + @JSONField(name = "ESB_DTM") + private Date ESB_DTM; + /** ESB错误信息 **/ + @JSONField(name = "ESB_MESSAGE") + private String ESB_MESSAGE; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderModel.java index cd29df31..aa7ecbd0 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderModel.java @@ -3,6 +3,9 @@ package jnpf.model.yunguan; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + @Data public class YunguanPurchaseOrderModel { /** ID**/ @@ -29,6 +32,9 @@ public class YunguanPurchaseOrderModel { /** 采购订单号 **/ @JSONField(name = "ORD_NO") private String ORD_NO; + /** YG订单类型 **/ + @JSONField(name = "ORD_TY") + private String ORD_TY; /** 合同编号 **/ @JSONField(name = "CONTR_CD") private String CONTR_CD; @@ -40,10 +46,10 @@ public class YunguanPurchaseOrderModel { private String RESERVE1; /** 签订日期 **/ @JSONField(name = "CONTR_DT") - private String CONTR_DT; + private Date CONTR_DT; /** 期望送达时间 **/ @JSONField(name = "DELV_DT") - private String DELV_DT; + private Date DELV_DT; /** 供应商编码 **/ @JSONField(name = "SUPPLIER_CD") private String SUPPLIER_CD; @@ -65,11 +71,74 @@ public class YunguanPurchaseOrderModel { /** 运输方式 **/ @JSONField(name = "TRS_MTH") private String TRS_MTH; + /** 票据结算 **/ + @JSONField(name = "INV_MTH") + private String INV_MTH; /** 付款方式 **/ @JSONField(name = "PAY_MTH") private String PAY_MTH; /** 定价模式 **/ @JSONField(name = "TRANS_TYPE") private String TRANS_TYPE; + /** 业务模式 **/ + @JSONField(name = "TRADE_TYPE") + private String TRADE_TYPE; + /** 合同汇率 **/ + @JSONField(name = "CONTR_EX_RATE") + private BigDecimal CONTR_EX_RATE; + /** 技术要求 **/ + @JSONField(name = "TECHNICAL_REQ") + private String TECHNICAL_REQ; + /** 备注 **/ + @JSONField(name = "REMARK") + private String REMARK; + /** 是否集团贸易 **/ + @JSONField(name = "TRADE_YN") + private String TRADE_YN; + /** 集团库存组织编码 **/ + @JSONField(name = "INV_ORG_CD_TRADE") + private String INV_ORG_CD_TRADE; + /** 集团库存组织名称 **/ + @JSONField(name = "INV_ORG_NM_TRADE") + private String INV_ORG_NM_TRADE; + /** 交货地点 **/ + @JSONField(name = "DELV_PLACE") + private String DELV_PLACE; + /** 关联销售单号 **/ + @JSONField(name = "SALE_NO") + private String SALE_NO; + /** 确认人 **/ + @JSONField(name = "CHECK_EMP_ID") + private String CHECK_EMP_ID; + /** 确认时间 **/ + @JSONField(name = "CHECK_DTM") + private Date CHECK_DTM; + /** 订单状态 **/ + @JSONField(name = "ORD_STATUS") + private String ORD_STATUS; + /** 创建人id **/ + @JSONField(name = "CREATE_EMP_ID") + private String CREATE_EMP_ID; + /** 创建时间 **/ + @JSONField(name = "CREATE_DTM") + private Date CREATE_DTM; + /** 读取标记 **/ + @JSONField(name = "READ_FLAG") + private String READ_FLAG; + /** 读取时间 **/ + @JSONField(name = "READ_TIME") + private Date READ_TIME; + /** 错误信息 **/ + @JSONField(name = "ERR_MESSAGE") + private String ERR_MESSAGE; + /** ESB是否传输 **/ + @JSONField(name = "ESB_STATUS") + private String ESB_STATUS; + /** ESB传输时间 **/ + @JSONField(name = "ESB_DTM") + private Date ESB_DTM; + /** ESB错误信息 **/ + @JSONField(name = "ESB_MESSAGE") + private String ESB_MESSAGE; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderProductModel.java index 30c1d245..0a4ad792 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderProductModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderProductModel.java @@ -3,6 +3,9 @@ package jnpf.model.yunguan; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + @Data public class YunguanPurchaseOrderProductModel { /** ID**/ @@ -14,6 +17,9 @@ public class YunguanPurchaseOrderProductModel { /** 采购单号**/ @JSONField(name = "ORD_NO") private String ORD_NO; + /** 明细行序号**/ + @JSONField(name = "ORD_LN") + private String ORD_LN; /** 商品编码**/ @JSONField(name = "ITEM_CD") private String ITEM_CD; @@ -25,33 +31,63 @@ public class YunguanPurchaseOrderProductModel { private String SPEC_TYPE; /** 采购数量**/ @JSONField(name = "QUANTITY") - private String QUANTITY; + private BigDecimal QUANTITY; /** 采购单位**/ @JSONField(name = "UNIT") private String UNIT; /** 合同单价**/ @JSONField(name = "CONTR_PRICE") - private String CONTR_PRICE; + private BigDecimal CONTR_PRICE; /** 不含税单价**/ @JSONField(name = "PRICE") - private String PRICE; + private BigDecimal PRICE; /** 采购单价**/ @JSONField(name = "TAX_PRICE") - private String TAX_PRICE; + private BigDecimal TAX_PRICE; /** 税率**/ @JSONField(name = "TAX_RATE") - private String TAX_RATE; + private BigDecimal TAX_RATE; + /** 税码**/ + @JSONField(name = "TAX_RATE_CD") + private String TAX_RATE_CD; /** 不含税小计**/ @JSONField(name = "AMOUNT") - private String AMOUNT; + private BigDecimal AMOUNT; /** 含税小计**/ @JSONField(name = "TOTAL_AMOUNT") - private String TOTAL_AMOUNT; + private BigDecimal TOTAL_AMOUNT; /** 币种**/ @JSONField(name = "CURRENCY_CD") private String CURRENCY_CD; /** 期望送达时间**/ @JSONField(name = "DELV_DT") - private String DELV_DT; + private Date DELV_DT; + /** 期望送达时间**/ + @JSONField(name = "DELV_TOL_MAX") + private BigDecimal DELV_TOL_MAX; + /** 期望送达时间**/ + @JSONField(name = "DELV_TOL_MIN") + private BigDecimal DELV_TOL_MIN; + /** 期望送达时间**/ + @JSONField(name = "ORD_STATUS") + private String ORD_STATUS; + /** 读取标记 **/ + @JSONField(name = "READ_FLAG") + private String READ_FLAG; + /** 读取时间 **/ + @JSONField(name = "READ_TIME") + private Date READ_TIME; + /** 错误信息 **/ + @JSONField(name = "ERR_MESSAGE") + private String ERR_MESSAGE; + /** ESB是否传输 **/ + @JSONField(name = "ESB_STATUS") + private String ESB_STATUS; + /** ESB传输时间 **/ + @JSONField(name = "ESB_DTM") + private Date ESB_DTM; + /** ESB错误信息 **/ + @JSONField(name = "ESB_MESSAGE") + private String ESB_MESSAGE; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleCollectionModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleCollectionModel.java new file mode 100644 index 00000000..21758bc6 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleCollectionModel.java @@ -0,0 +1,140 @@ +package jnpf.model.yunguan; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class YunguanSaleCollectionModel { + /** ID**/ + @JSONField(name = "ID") + private String ID; + /** 租户代码**/ + @JSONField(name = "COMP_CD") + private String COMP_CD; + /** 库存组织编码**/ + @JSONField(name = "ORG_ID") + private String ORG_ID; + /** 部门编码**/ + @JSONField(name = "DEPARTMENT_CD") + private String DEPARTMENT_CD; + /** 收款单号**/ + @JSONField(name = "PREPAYMENT_NO") + private String PREPAYMENT_NO; + /** 订单状态**/ + @JSONField(name = "PREPAYMENT_STS") + private String PREPAYMENT_STS; + /** 客户编码**/ + @JSONField(name = "CUST_CODE") + private String CUST_CODE; + /** 客户名称**/ + @JSONField(name = "CUST_NAME") + private String CUST_NAME; + /** 收款金额**/ + @JSONField(name = "PREPAYMENT_AMT") + private BigDecimal PREPAYMENT_AMT; + /** 币种**/ + @JSONField(name = "CURRENCY_CD") + private String CURRENCY_CD; + /** 汇率**/ + @JSONField(name = "EXCHG_RAT") + private String EXCHG_RAT; + /** 税率**/ + @JSONField(name = "TAX_RATE") + private BigDecimal TAX_RATE; + /** 收款时间**/ + @JSONField(name = "PREPAYMENT_DT") + private Date PREPAYMENT_DT; + /** 承兑编号**/ + @JSONField(name = "BILL_NOTE_NO") + private String BILL_NOTE_NO; + /** 收款方式**/ + @JSONField(name = "COLLECTION_TY") + private String COLLECTION_TY; + /** 备注**/ + @JSONField(name = "REMARKS") + private String REMARKS; + /** 制单人编号**/ + @JSONField(name = "CREATE_EMP_ID") + private String CREATE_EMP_ID; + /** 制单时间**/ + @JSONField(name = "CREATE_DTM") + private Date CREATE_DTM; + /** 修改人编码**/ + @JSONField(name = "MODIFY_EMP_ID") + private String MODIFY_EMP_ID; + /** 修改时间**/ + @JSONField(name = "MODIFY_DTM") + private Date MODIFY_DTM; + /** 是否取消**/ + @JSONField(name = "CANCLE_YN") + private String CANCLE_YN; + /** 取消人编码**/ + @JSONField(name = "CANCLE_EMP_ID") + private String CANCLE_EMP_ID; + /** 取消时间**/ + @JSONField(name = "CANCLE_DTM") + private Date CANCLE_DTM; + /** 收款ID**/ + @JSONField(name = "PREP_ID") + private Integer PREP_ID; + /** 剩余金额**/ + @JSONField(name = "SPARE_AMT") + private BigDecimal SPARE_AMT; + /** 分配标志**/ + @JSONField(name = "PREP_DISTRIBUTE_SIGN") + private String PREP_DISTRIBUTE_SIGN; + /** 收款方式**/ + @JSONField(name = "RECEIPT_MTH") + private String RECEIPT_MTH; + /** 业务归属**/ + @JSONField(name = "ATTRIBUTE1") + private String ATTRIBUTE1; + /** 票据张数**/ + @JSONField(name = "ATTRIBUTE3") + private String ATTRIBUTE3; + /** 分配人员**/ + @JSONField(name = "ASN_USER_NM") + private String ASN_USER_NM; + /** 分配时间**/ + @JSONField(name = "ASN_DT") + private Date ASN_DT; + /** 审批状态**/ + @JSONField(name = "APPROVE_STS") + private String APPROVE_STS; + /** 是否手动录入**/ + @JSONField(name = "MANUAL_FLAG") + private String MANUAL_FLAG; + /** 是否核销**/ + @JSONField(name = "WRITE_OFF_FLAG") + private String WRITE_OFF_FLAG; + /** 被核销的收款编号**/ + @JSONField(name = "WRITE_OFF_NO") + private String WRITE_OFF_NO; + /** 核销人员**/ + @JSONField(name = "WRITE_OFF_USER_NM") + private String WRITE_OFF_USER_NM; + /** 核销日期**/ + @JSONField(name = "WRITE_OFF_DT") + private Date WRITE_OFF_DT; + /** 读取标记 **/ + @JSONField(name = "READ_FLAG") + private String READ_FLAG; + /** 读取时间 **/ + @JSONField(name = "READ_TIME") + private Date READ_TIME; + /** 错误信息 **/ + @JSONField(name = "ERR_MESSAGE") + private String ERR_MESSAGE; + /** ESB是否传输 **/ + @JSONField(name = "ESB_STATUS") + private String ESB_STATUS; + /** ESB传输时间 **/ + @JSONField(name = "ESB_DTM") + private Date ESB_DTM; + /** ESB错误信息 **/ + @JSONField(name = "ESB_MESSAGE") + private String ESB_MESSAGE; +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java index 9611481d..ebd6471f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java @@ -13,6 +13,9 @@ public class YunguanSaleOrderModel { /** ID**/ @JSONField(name = "ID") private String ID; + /** 删除标记 **/ + @JSONField(name = "CANCEL_FLAG") + private String CANCEL_FLAG; /** 租户代码 **/ @JSONField(name = "COMP_CD") private String COMP_CD; @@ -31,6 +34,15 @@ public class YunguanSaleOrderModel { /** 销售订单号 **/ @JSONField(name = "ORD_NO") private String ORD_NO; + /** 订单类型 **/ + @JSONField(name = "ORD_TY") + private String ORD_TY; + /** 销售类型 **/ + @JSONField(name = "SAL_TY") + private String SAL_TY; + /** 销售方式 **/ + @JSONField(name = "SAL_MTH") + private String SAL_MTH; /** 合同编号 **/ @JSONField(name = "CONTR_NO") private String CONTR_NO; @@ -55,6 +67,9 @@ public class YunguanSaleOrderModel { /** 运输方式 **/ @JSONField(name = "TRS_MTH") private String TRS_MTH; + /** 结算方式 **/ + @JSONField(name = "INV_MTH") + private String INV_MTH; /** 付款方式 **/ @JSONField(name = "PAY_MTH") private String PAY_MTH; @@ -70,10 +85,49 @@ public class YunguanSaleOrderModel { /** 订单状态 **/ @JSONField(name = "ORD_STS") private String ORD_STS; + /** 读取标记 **/ + @JSONField(name = "READ_FLAG") + private String READ_FLAG; + /** 读取时间 **/ + @JSONField(name = "READ_TIME") + private Date READ_TIME; + /** 错误信息 **/ + @JSONField(name = "ERR_MESSAGE") + private String ERR_MESSAGE; + /** ESB是否传输 **/ + @JSONField(name = "ESB_STATUS") + private String ESB_STATUS; + /** ESB传输时间 **/ + @JSONField(name = "ESB_DTM") + private Date ESB_DTM; + /** ESB错误信息 **/ + @JSONField(name = "ESB_MESSAGE") + private String ESB_MESSAGE; + /** 贸易条款 **/ + @JSONField(name = "TRADE_CLS") + private String TRADE_CLS; + /** 收货单位 **/ + @JSONField(name = "REP_ADS") + private String REP_ADS; /** 制单人名称 **/ - @JSONField(name = "ADD_NAME") - private String ADD_NAME; + @JSONField(name = "ORD_REG_DTM") + private String ORD_REG_DTM; /** 制单时间 **/ - @JSONField(name = "ADD_TIME") - private Date ADD_TIME; + @JSONField(name = "CREATE_EMP_ID") + private String CREATE_EMP_ID; + /** 制单时间 **/ + @JSONField(name = "CREATE_DTM") + private Date CREATE_DTM; + /** 制单时间 **/ + @JSONField(name = "MODIFY_EMP_ID") + private String MODIFY_EMP_ID; + /** 制单时间 **/ + @JSONField(name = "MODIFY_DTM") + private Date MODIFY_DTM; + /** 制单时间 **/ + @JSONField(name = "ORD_CONF_DTM") + private String ORD_CONF_DTM; + /** 制单时间 **/ + @JSONField(name = "CANCLE_YN") + private Date CANCLE_YN; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderProductModel.java index a84357ee..6c9b103f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderProductModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderProductModel.java @@ -13,9 +13,18 @@ public class YunguanSaleOrderProductModel { /** 租户代码**/ @JSONField(name = "COMP_CD") private String COMP_CD; + /** 部门代码**/ + @JSONField(name = "DEPARTMENT_CD") + private String DEPARTMENT_CD; /** 销售单号**/ @JSONField(name = "ORD_NO") private String ORD_NO; + /** 销售订单行号**/ + @JSONField(name = "LINE_NO") + private String LINE_NO; + /** 合同行号**/ + @JSONField(name = "CONTR_LINE_ID") + private String CONTR_LINE_ID; /** 销售状态**/ @JSONField(name = "ORD_STS") private String ORD_STS; @@ -30,7 +39,7 @@ public class YunguanSaleOrderProductModel { private String SPEC_TYPE; /** 销售数量**/ @JSONField(name = "QUANTITY") - private String QUANTITY; + private BigDecimal QUANTITY; /** 销售单位**/ @JSONField(name = "UNIT") private String UNIT; @@ -40,13 +49,28 @@ public class YunguanSaleOrderProductModel { /** 含税小计**/ @JSONField(name = "TOT_AMOUNT") private BigDecimal TOT_AMOUNT; + /** 税码**/ + @JSONField(name = "TAX_RATE") + private String TAX_RATE; /** 税率**/ @JSONField(name = "TAX_RATE_CODE") private String TAX_RATE_CODE; + /** 税额**/ + @JSONField(name = "TAX_AMOUNT") + private BigDecimal TAX_AMOUNT; /** 不含税单价**/ @JSONField(name = "TAX_PRICE") private BigDecimal TAX_PRICE; /** 不含税小计**/ @JSONField(name = "AMOUNT") private BigDecimal AMOUNT; + /** 上允差**/ + @JSONField(name = "DELV_TOL_MAX") + private BigDecimal DELV_TOL_MAX; + /** 下允差**/ + @JSONField(name = "DELV_TOL_MIN") + private BigDecimal DELV_TOL_MIN; + /** 备注**/ + @JSONField(name = "REMARKS1") + private BigDecimal REMARKS1; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java index b2f2b1ba..21a4d343 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java @@ -3,6 +3,7 @@ package jnpf.model.yunguan; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -11,18 +12,15 @@ public class YunguanSaleOutBoundModel { @JSONField(name = "OUT_ID") private String OUT_ID; /** 租户代码 **/ + @JSONField(name = "COMP_ID") + private String COMP_ID; + /** 租户编码 **/ @JSONField(name = "COMP_CD") private String COMP_CD; -// /** 库存组织代码 **/ -// @JSONField(name = "INV_ORG_CD") -// private String INV_ORG_CD; -// /** 库存组织名称 **/ -// @JSONField(name = "INV_ORG_NM") -// private String INV_ORG_NM; /** 部门编码 **/ @JSONField(name = "DEPT_ID") private String DEPT_ID; - /** 部门名称 **/ + /** 单据编号 **/ @JSONField(name = "PROD_ZL") private String PROD_ZL; /** 明细行序号 **/ @@ -63,7 +61,7 @@ public class YunguanSaleOutBoundModel { private String UNIT; /** 出库数量 **/ @JSONField(name = "OUT_QUANTITY") - private String OUT_QUANTITY; + private BigDecimal OUT_QUANTITY; /** 出库标记 **/ @JSONField(name = "OUT_FLAG") private String OUT_FLAG; @@ -81,8 +79,32 @@ public class YunguanSaleOutBoundModel { private String MODIFY_EMP_ID; /** 修改时间 **/ @JSONField(name = "MODIFY_DTM") - private String MODIFY_DTM; + private Date MODIFY_DTM; /** 取消标记 **/ @JSONField(name = "CANCLE_YN") private String CANCLE_YN; + /** 出库类型 **/ + @JSONField(name = "OUT_TYPE") + private String OUT_TYPE; + /** 交货号 **/ + @JSONField(name = "ATTRIBUTE2") + private String ATTRIBUTE2; + /** 读取标记 **/ + @JSONField(name = "READ_FLAG") + private String READ_FLAG; + /** 读取时间 **/ + @JSONField(name = "READ_TIME") + private Date READ_TIME; + /** 错误信息 **/ + @JSONField(name = "ERR_MESSAGE") + private String ERR_MESSAGE; + /** ESB是否传输 **/ + @JSONField(name = "ESB_STATUS") + private String ESB_STATUS; + /** ESB传输时间 **/ + @JSONField(name = "ESB_DTM") + private Date ESB_DTM; + /** ESB错误信息 **/ + @JSONField(name = "ESB_MESSAGE") + private String ESB_MESSAGE; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java new file mode 100644 index 00000000..09c90a0a --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementModel.java @@ -0,0 +1,119 @@ +package jnpf.model.yunguan; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class YunguanSaleSettlementModel { + /** ID**/ + @JSONField(name = "ID") + private String ID; + /** 公司代码**/ + @JSONField(name = "COMP_CD") + private String COMP_CD; + /** 库存组织代码**/ + @JSONField(name = "ORG_ID") + private String ORG_ID; + /** 库存组织名称**/ + @JSONField(name = "ORG_NM") + private String ORG_NM; + /** 部门代码**/ + @JSONField(name = "DEPARTMENT_CD") + private String DEPARTMENT_CD; + /** 结算单号**/ + @JSONField(name = "INVOICE_NO") + private String INVOICE_NO; + /** 结算日期**/ + @JSONField(name = "INVOICE_DTM") + private Date INVOICE_DTM; + /** 单据状态**/ + @JSONField(name = "INVOICE_STS") + private String INVOICE_STS; + /** 结算类型**/ + @JSONField(name = "INVOICE_TYPE") + private String INVOICE_TYPE; + /** 结算标识**/ + @JSONField(name = "INV_FLAG") + private BigDecimal INV_FLAG; + /** 客户编码**/ + @JSONField(name = "CUST_ID") + private String CUST_ID; + /** 客户名称**/ + @JSONField(name = "CUST_NAME") + private String CUST_NAME; + /** 外部合同编号**/ + @JSONField(name = "CONTRACT_CD") + private String CONTRACT_CD; + /** 对方合同编号**/ + @JSONField(name = "KH_CONTR_NO") + private String KH_CONTR_NO; + /** 入账时间**/ + @JSONField(name = "BOOK_DATE") + private Date BOOK_DATE; + /** 事务处理类型**/ + @JSONField(name = "CUST_TY") + private String CUST_TY; + /** 结算数量**/ + @JSONField(name = "QUANTITY") + private BigDecimal QUANTITY; + /** 对应出库数量**/ + @JSONField(name = "STO_OUT_WGT") + private BigDecimal STO_OUT_WGT; + /** 结算金额**/ + @JSONField(name = "INV_AMT") + private BigDecimal INV_AMT; + /** 币种**/ + @JSONField(name = "CURRENCY_TY") + private String CURRENCY_TY; + /** 结算汇率**/ + @JSONField(name = "INV_EXCHG_RAT") + private BigDecimal INV_EXCHG_RAT; + /** 税码**/ + @JSONField(name = "TAX_RATE") + private String TAX_RATE; + /** 制单人编码**/ + @JSONField(name = "CREATE_EMP_ID") + private String CREATE_EMP_ID; + /** 制单时间**/ + @JSONField(name = "CREATE_DTM") + private Date CREATE_DTM; + /** 修改人编码**/ + @JSONField(name = "MODIFY_EMP_ID") + private String MODIFY_EMP_ID; + /** 修改时间**/ + @JSONField(name = "MODIFY_DTM") + private Date MODIFY_DTM; + /** 审核人编码**/ + @JSONField(name = "CONSDR_USER") + private String CONSDR_USER; + /** 审核时间**/ + @JSONField(name = "CONSDR_DATE") + private Date CONSDR_DATE; + /** 取消标记**/ + @JSONField(name = "CANCLE_YN") + private String CANCLE_YN; + /** 分批结算**/ + @JSONField(name = "SLIT_FLAG") + private String SLIT_FLAG; + /** 读取标记 **/ + @JSONField(name = "READ_FLAG") + private String READ_FLAG; + /** 读取时间 **/ + @JSONField(name = "READ_TIME") + private Date READ_TIME; + /** 错误信息 **/ + @JSONField(name = "ERR_MESSAGE") + private String ERR_MESSAGE; + /** ESB是否传输 **/ + @JSONField(name = "ESB_STATUS") + private String ESB_STATUS; + /** ESB传输时间 **/ + @JSONField(name = "ESB_DTM") + private Date ESB_DTM; + /** ESB错误信息 **/ + @JSONField(name = "ESB_MESSAGE") + private String ESB_MESSAGE; +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java new file mode 100644 index 00000000..f5121bfc --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java @@ -0,0 +1,154 @@ +package jnpf.model.yunguan; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +import java.util.Date; + +@Data +public class YunguanSaleSettlementProductModel { + /** ID **/ + @JSONField(name = "ID") + private String ID; + /** 租户代码 **/ + @JSONField(name = "COMP_CD") + private String COMP_CD; + /** 库存组织编码 **/ + @JSONField(name = "ORG_ID") + private String ORG_ID; + /** 库存组织名称 **/ + @JSONField(name = "ORG_NM") + private String ORG_NM; + /** 部门编码 **/ + @JSONField(name = "DEPARTMENT_CD") + private String DEPARTMENT_CD; + /** 结算单号 **/ + @JSONField(name = "INVOICE_NO") + private String INVOICE_NO; + /** 明细行序号 **/ + @JSONField(name = "ATTRIBUTE4") + private String ATTRIBUTE4; + /** 单据状态 **/ + @JSONField(name = "INVOICE_STS") + private String INVOICE_STS; + /** 结算类型 **/ + @JSONField(name = "INVOICE_TYPE") + private String INVOICE_TYPE; + /** 销售单号 **/ + @JSONField(name = "ORD_NO") + private String ORD_NO; + /** 销售单明细行序号 **/ + @JSONField(name = "LINE_NO") + private String LINE_NO; + /** 出库单号 **/ + @JSONField(name = "DORD_NO") + private String DORD_NO; + /** 外部合同编号 **/ + @JSONField(name = "CONTRACT_CD") + private String CONTRACT_CD; + /** 对方合同编号 **/ + @JSONField(name = "KH_CONTR_NO") + private String KH_CONTR_NO; + /** 客户编码 **/ + @JSONField(name = "CUST_ID") + private String CUST_ID; + /** 客户名称 **/ + @JSONField(name = "CUST_NAME") + private String CUST_NAME; + /** 商品编码 **/ + @JSONField(name = "ITEM_NO") + private String ITEM_NO; + /** 商品名称 **/ + @JSONField(name = "ITEM_NM") + private String ITEM_NM; + /** 规格 **/ + @JSONField(name = "MAT_SIZE") + private String MAT_SIZE; + /** 销售单价 **/ + @JSONField(name = "ORD_PRICE") + private String ORD_PRICE; + /** 销售数量 **/ + @JSONField(name = "ORD_QUANTITY") + private String ORD_QUANTITY; + /** 结算数量 **/ + @JSONField(name = "QUANTITY") + private String QUANTITY; + /** 对应出库量 **/ + @JSONField(name = "STO_OUT_WGT") + private String STO_OUT_WGT; + /** 结算单位 **/ + @JSONField(name = "UNIT") + private String UNIT; + /** 结算单价 **/ + @JSONField(name = "INV_PRICE") + private String INV_PRICE; + /** 结算金额 **/ + @JSONField(name = "INV_AMT") + private String INV_AMT; + /** 税码 **/ + @JSONField(name = "TAX_RATE") + private String TAX_RATE; + /** 币种 **/ + @JSONField(name = "CURRENCY_TY") + private String CURRENCY_TY; + /** 结算金额（外币） **/ + @JSONField(name = "INV_AMT_FOREG") + private String INV_AMT_FOREG; + /** 结算汇率 **/ + @JSONField(name = "INV_EXCHG_RAT") + private String INV_EXCHG_RAT; + /** 开票商品名称 **/ + @JSONField(name = "ITEM_NM_INV") + private String ITEM_NM_INV; + /** 备注 **/ + @JSONField(name = "ATTRIBUTE5") + private String ATTRIBUTE5; + /** 结算时间 **/ + @JSONField(name = "BOOK_DATE") + private String BOOK_DATE; + /** 事务处理类型 **/ + @JSONField(name = "CUST_TY") + private String CUST_TY; + /** 结算标识 **/ + @JSONField(name = "INV_FLAG") + private String INV_FLAG; + /** 制单人编码**/ + @JSONField(name = "CREATE_EMP_ID") + private String CREATE_EMP_ID; + /** 制单时间**/ + @JSONField(name = "CREATE_DTM") + private Date CREATE_DTM; + /** 修改人编码**/ + @JSONField(name = "MODIFY_EMP_ID") + private String MODIFY_EMP_ID; + /** 修改时间**/ + @JSONField(name = "MODIFY_DTM") + private Date MODIFY_DTM; + /** 取消标记**/ + @JSONField(name = "CANCLE_YN") + private String CANCLE_YN; + /** 审核人**/ + @JSONField(name = "CONSDR_USER") + private String CONSDR_USER; + /** 分批结算**/ + @JSONField(name = "SLIT_FLAG") + private String SLIT_FLAG; + /** 读取标记 **/ + @JSONField(name = "READ_FLAG") + private String READ_FLAG; + /** 读取时间 **/ + @JSONField(name = "READ_TIME") + private Date READ_TIME; + /** 错误信息 **/ + @JSONField(name = "ERR_MESSAGE") + private String ERR_MESSAGE; + /** ESB是否传输 **/ + @JSONField(name = "ESB_STATUS") + private String ESB_STATUS; + /** ESB传输时间 **/ + @JSONField(name = "ESB_DTM") + private Date ESB_DTM; + /** ESB错误信息 **/ + @JSONField(name = "ESB_MESSAGE") + private String ESB_MESSAGE; +} diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue index d69e13bb..499e093a 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue @@ -111,14 +111,14 @@ {{ scope.row.saleStatus }} - + - + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue index 027b4a36..6411f1c5 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue @@ -88,7 +88,7 @@ - + + + + + + + - + - + + +