jg-waiwang-pro
胡川虎 5 months ago
commit a6f8cbcd8b

@ -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 @@
<select id="querySaleOrderByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOrderModel">
SELECT
'0' as CANCEL_FLAG,
a.id AS ID,
c.f_en_code AS COMP_CD,
b.kucun_org_code AS ORG_ID,
b.kucun_org_name AS ORG_NM,
f.kucun_org_code AS ORG_ID,
f.kucun_org_name AS ORG_NM,
d.f_id as DEPARTMENT_CD,
d.f_en_code AS ADD_DEPT_CODE,
d.f_full_name AS ADD_DEPT_NAME,
a.CODE AS ORD_NO,
'D' as SAL_TY,
a.external_sale_way as SAL_MTH,
f.contract_number AS CONTR_NO,
f.contract_no AS KH_CONTR_NO,
f.contract_signed_time AS CONTRACT_DT,
@ -960,66 +958,65 @@
CASE
a.transaction_mode
WHEN '1' THEN
'快递交货'
'D'
WHEN '2' THEN
'送货上门'
'B'
WHEN '3' THEN
'上门提货'
'A'
END AS DELV_MTH,
CASE
a.transport_mode
WHEN '1' THEN
'公路'
'A'
WHEN '2' THEN
'铁路'
'B'
WHEN '3' THEN
'轮船'
'C'
WHEN '4' THEN
'空运'
'A'
WHEN '5' THEN
''
'A'
END AS TRS_MTH,
CASE
f.settlement_type
WHEN '1' THEN 'A'
WHEN '2' THEN 'B'
END AS INV_MTH,
CASE
b.payment_method
WHEN '1' THEN
'无'
'现金'
WHEN '2' THEN
'现金'
WHEN '3' THEN
'银行转账'
'现金'
WHEN '4' THEN
'承兑汇票'
'承兑'
WHEN '5' THEN
'支付宝'
'现金'
WHEN '6' THEN
'微信'
'现金'
WHEN '7' THEN
'现'
'现'
END AS PAY_MTH,
f.total_amount AS CONTR_PRICE,
g.full_address AS FROM_PLACE,
a.receive_address AS TO_PLACE,
CASE
a.STATUS
WHEN '1' THEN
'待提交'
WHEN '2' THEN
'待审核'
WHEN '3' THEN
'待锁定'
WHEN '4' THEN
'待出库'
WHEN '5' THEN
'部分出库'
WHEN '6' THEN
'已完成'
WHEN '7' THEN
'已驳回'
WHEN '8' THEN
'已关闭'
END AS ORD_STS,
e.f_real_name AS ADD_NAME,
a.f_creator_time AS ADD_TIME
a.remark as REMARKS,
'B' as ORD_STS,
'N' as READ_FLAG,
'' as READ_TIME,
'' as ERR_MESSAGE,
'N' as ESB_STATUS,
'' as ESB_DTM,
'' as ESB_MESSAGE,
'' as TRADE_CLS,
'' as REP_ADS,
a.f_creator_time as ORD_REG_DTM,
e.f_real_name AS CREATE_EMP_ID,
a.f_creator_time as CREATE_DTM,
'0' as CANCLE_YN,
IF ( LOCATE( '贸易', h.NAME ) > 0, '11', '50' ) AS ORD_TY
FROM
jg_business_order a
LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id
@ -1034,6 +1031,8 @@
AND f.f_delete_mark IS NULL
LEFT JOIN jg_business_address g ON a.delivery_address = g.id
AND g.f_delete_mark IS NULL
LEFT JOIN jg_business_line h ON a.business_line_id = h.id
AND h.f_delete_mark IS NULL
WHERE a.f_delete_mark IS NULL AND a.id = #{id}
</select>
@ -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,7 +1082,10 @@
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}
</select>
<select id="getWordExcelInfo" resultType="java.util.HashMap">

@ -120,23 +120,40 @@
<select id="saleOutBoundByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
SELECT
a.id AS OUT_ID,
e.f_id as COMP_ID,
e.f_en_code AS COMP_CD,
d.kucun_org_code AS INV_ORG_CD,
d.kucun_org_name AS INV_ORG_NM,
f.f_en_code AS DEPT_ID,
f.f_full_name AS DEPT_NM,
a.document_no AS PROD_ZL,
c.CODE AS SAL_ORDER,
h.contract_number AS CON_CD,
h.contract_no AS CON_NO,
aa.ord_ln as CK_ORDER,
IF(a.warehousing_outbound_type = 1,c.code,m.code) as SAL_ORDER,
d.CODE AS CUS_ID,
d.NAME AS CUS_NAME,
i.NAME AS STORE_ID,
a.warehousing_time as OUT_DTM,
a.remark as REMARKS,
g.f_real_name as CREATE_EMP_ID
j.CODE AS MAT_ID,
j.NAME AS MAT_NAME,
j.spec AS SPECIFICATION,
aa.outbound_unit AS UNIT,
aa.outbound_number AS OUT_QUANTITY,
'1' as OUT_FLAG,
g.f_real_name as CREATE_EMP_ID,
a.f_creator_time as CREATE_DTM,
k.f_real_name as MODIFY_EMP_ID,
a.f_last_modify_time as MODIFY_DTM,
'0' as CANCLE_YN,
'1' as OUT_TYPE,
'N' as READ_FLAG,
'' as READ_TIME,
'' as ERR_MESSAGE,
'N' as ESB_STATUS,
'' as ESB_DTM,
'' as ESB_MESSAGE,
IF(a.warehousing_outbound_type = 1,n.ord_ln,o.ord_ln) as SAL_LINE,
aa.batch_number as BATCH_ID
FROM
jg_warehousing_outbound a
RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_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
@ -145,25 +162,31 @@
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 base_user k ON a.f_last_modify_user_id = k.f_id AND k.f_delete_mark IS NULL
LEFT JOIN jg_delivery_order l on a.warehousing_id = l.id and l.f_delete_mark is null
LEFT JOIN jg_business_order m on l.business_id = m.id and m.f_delete_mark is null
LEFT JOIN jg_business_order_product_relational n on c.id = n.business_order_id and n.f_delete_mark is null and aa.product_id = n.product_id and aa.outbound_unit = n.sales_main_unit_id
LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id
WHERE
a.f_delete_mark is null
AND a.id = #{id}
</select>
<select id="saleOutBoundProductByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
SELECT
b.CODE AS MAT_ID,
b.NAME AS MAT_NAME,
b.spec AS SPECIFICATION,
a.outbound_unit AS UNIT,
a.outbound_number AS OUT_QUANTITY
FROM
jg_warehousing_outbound_product a
LEFT JOIN jg_product b ON a.product_id = b.id
AND b.f_delete_mark IS NULL
WHERE
a.f_delete_mark IS NULL
AND a.warehousing_outbound_id = #{id}
</select>
<!-- <select id="saleOutBoundProductByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">-->
<!-- SELECT-->
<!-- b.CODE AS MAT_ID,-->
<!-- b.NAME AS MAT_NAME,-->
<!-- b.spec AS SPECIFICATION,-->
<!-- a.outbound_unit AS UNIT,-->
<!-- a.outbound_number AS OUT_QUANTITY-->
<!-- FROM-->
<!-- jg_warehousing_outbound_product a-->
<!-- LEFT JOIN jg_product b ON a.product_id = b.id-->
<!-- AND b.f_delete_mark IS NULL-->
<!-- WHERE-->
<!-- a.f_delete_mark IS NULL-->
<!-- AND a.warehousing_outbound_id = #{id}-->
<!-- </select>-->
</mapper>

@ -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}
</select>
<select id="purchaseInBoundProductByYunGuan" resultType="jnpf.model.yunguan.YunguanPurchaseInBoundModel">
SELECT
b.CODE AS ITEM_CD,
b.NAME AS ITEM_NM,
CASE
b.inventory_type
WHEN '1' THEN
'原材料'
WHEN '2' THEN
'半成品'
WHEN '3' THEN
'产成品'
END AS ITEM_TYPE,
b.spec AS SPEC_TYPE,
a.storage_unit AS UNIT,
a.storage_number AS QUANTITY,
f.business_price AS PRICE,
f.tax_count AS AMOUNT
FROM
jg_warehousing_storage_product a
LEFT JOIN jg_product b ON a.product_id = b.id AND b.f_delete_mark IS NULL
LEFT JOIN jg_warehousing_storage c ON a.warehousing_storage_id = c.id
AND c.f_delete_mark IS NULL
LEFT JOIN jg_warehousing_notification d ON c.warehousing_id = d.id
AND d.f_delete_mark IS NULL
LEFT JOIN jg_business_order e ON d.business_id = e.id
AND e.f_delete_mark IS NULL
LEFT JOIN jg_business_order_product_relational f ON e.id = f.business_order_id
AND a.product_id = f.product_id
AND a.storage_unit = f.sales_main_unit_id
AND f.f_delete_mark IS NULL
WHERE
a.f_delete_mark IS NULL
AND a.warehousing_storage_id = #{id}
</select>
<!-- <select id="purchaseInBoundProductByYunGuan" resultType="jnpf.model.yunguan.YunguanPurchaseInBoundModel">-->
<!-- SELECT-->
<!-- b.CODE AS ITEM_CD,-->
<!-- b.NAME AS ITEM_NM,-->
<!-- CASE-->
<!-- b.inventory_type-->
<!-- WHEN '1' THEN-->
<!-- '原材料'-->
<!-- WHEN '2' THEN-->
<!-- '半成品'-->
<!-- WHEN '3' THEN-->
<!-- '产成品'-->
<!-- END AS ITEM_TYPE,-->
<!-- b.spec AS SPEC_TYPE,-->
<!-- a.storage_unit AS UNIT,-->
<!-- a.storage_number AS QUANTITY,-->
<!-- f.business_price AS PRICE,-->
<!-- f.tax_count AS AMOUNT-->
<!-- FROM-->
<!-- jg_warehousing_storage_product a-->
<!-- LEFT JOIN jg_product b ON a.product_id = b.id AND b.f_delete_mark IS NULL-->
<!-- LEFT JOIN jg_warehousing_storage c ON a.warehousing_storage_id = c.id-->
<!-- AND c.f_delete_mark IS NULL-->
<!-- LEFT JOIN jg_warehousing_notification d ON c.warehousing_id = d.id-->
<!-- AND d.f_delete_mark IS NULL-->
<!-- LEFT JOIN jg_business_order e ON d.business_id = e.id-->
<!-- AND e.f_delete_mark IS NULL-->
<!-- LEFT JOIN jg_business_order_product_relational f ON e.id = f.business_order_id-->
<!-- AND a.product_id = f.product_id-->
<!-- AND a.storage_unit = f.sales_main_unit_id-->
<!-- AND f.f_delete_mark IS NULL-->
<!-- WHERE-->
<!-- a.f_delete_mark IS NULL-->
<!-- AND a.warehousing_storage_id = #{id}-->
<!-- </select>-->
</mapper>

@ -35,9 +35,9 @@ public interface WarehousingOutboundMapper extends BaseMapper<WarehousingOutboun
BigDecimal queryCurrentDayNum2(@Param("warehousingOutboundEntity") WarehousingOutboundEntity warehousingOutboundEntity);
//运管销售出库
YunguanSaleOutBoundModel saleOutBoundByYunGuan(@Param("id") String id);
//运管销售出库商品
List<YunguanSaleOutBoundModel> saleOutBoundProductByYunGuan(@Param("id") String id);
List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(@Param("id") String id);
//// 运管销售出库商品
// List<YunguanSaleOutBoundModel> saleOutBoundProductByYunGuan(@Param("id") String id);
IPage<WarehousingOutboundEntity> queryWarehousingOutboundList(@Param("page") Page<WarehousingOutboundEntity> page, @Param("warehousingOutboundPagination") WarehousingOutboundPagination warehousingOutboundPagination, @Param("ew") Wrapper<WarehousingOutboundEntity> warehousingOutboundQueryWrapper);

@ -43,9 +43,9 @@ public interface WarehousingStorageMapper extends BaseMapper<WarehousingStorageE
BigDecimal queryCurrentDayNum2(@Param("warehousingStorage") WarehousingStorageEntity warehousingStorage);
//运管采购入库
YunguanPurchaseInBoundModel purchaseInBoundByYunGuan(@Param("id") String id);
//运管采购入库商品
List<YunguanPurchaseInBoundModel> purchaseInBoundProductByYunGuan(@Param("id") String id);
List<YunguanPurchaseInBoundModel> purchaseInBoundByYunGuan(@Param("id") String id);
// //运管采购入库商品
// List<YunguanPurchaseInBoundModel> purchaseInBoundProductByYunGuan(@Param("id") String id);
IPage<WarehousingStorageEntity> queryWarehousingStorageList(@Param("page")Page<WarehousingStorageEntity> page, @Param("warehousingStoragePagination") WarehousingStoragePagination warehousingStoragePagination, @Param("ew") Wrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper);

@ -61,10 +61,5 @@ public interface WarehousingOutboundService extends IService<WarehousingOutbound
BigDecimal queryCurrentDayNum2(WarehousingOutboundEntity warehousingOutboundEntity);
//运管销售出库
YunguanSaleOutBoundModel saleOutBoundByYunGuanInfo(String id);
//运管销售出库商品
List<YunguanSaleOutBoundModel> saleOutBoundProductByYunGuanInfo(String id);
BigDecimal queryCurrentDayAmount(WarehousingOutboundEntity warehousingOutboundEntity);
}

@ -62,10 +62,5 @@ public interface WarehousingStorageService extends IService<WarehousingStorageEn
BigDecimal queryCurrentDayNum2(WarehousingStorageEntity warehousingStorage);
//运管采购入库
YunguanPurchaseInBoundModel purchaseInBoundByYunGuan(String id);
//运管采购入库商品
List<YunguanPurchaseInBoundModel> purchaseInBoundProductByYunGuanInfo(String id);
BigDecimal queryCurrentDayAmount(WarehousingStorageEntity warehousingStorage);
}

@ -1091,11 +1091,14 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
List<BusinessOrderProductRelationalEntity> 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);

@ -708,6 +708,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
if (StringUtil.isNotEmpty(entitys.getIsSaleDeliveryVoucherSource())){
VoucherEntity voucherEntity = voucherMapper.selectById(entitys.getIsSaleDeliveryVoucherSource());
voucherEntity.setIsSaleDeliveryVoucher("2");
voucherEntity.setVoucherRelation(entity.getId());
voucherMapper.updateById(voucherEntity);
}
}

@ -538,10 +538,13 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
}
if (warehousingOutboundForm.getWarehousingOutboundProductList()!=null){
List<WarehousingOutboundProductEntity> 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<WarehousingOutbo
//统计发货数量
BigDecimal countNum = BigDecimal.ZERO;
// List<WarehousingStorageProductEntity> 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<WarehousingOutbo
warehousingOutboundProductEntity.setOrganizeJsonId(deliveryOrder.getOrganizeJsonId());
warehousingOutboundProductEntity.setCompanyId(deliveryOrder.getCompanyId());
warehousingOutboundProductEntity.setDepartmentId(deliveryOrder.getDepartmentId());
warehousingOutboundProductEntity.setBusinessPrice(entitys.getReturnUnit());//采购发货单出库
warehousingOutboundProductEntity.setBusinessPrice(entitys.getReturnUnit());//采购发货单出库
warehousingOutboundProductEntity.setOrdLn(String.valueOf(line));
warehousingOutboundProductService.saveOrUpdate(warehousingOutboundProductEntity);
line++;
//查询商品详情
@ -898,20 +902,20 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
warehousingOutboundPoundlistService.saveOrUpdate(entitys);
}
}
if (entity.getWarehousingOutboundType().equals("12")){
YunguanSaleOutBoundModel yunguanSaleOutBoundModel = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
List<YunguanSaleOutBoundModel> 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> yunguanSaleOutBoundModel = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
//// List<YunguanSaleOutBoundModel> 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<WarehousingOutbo
return warehousingOutboundMapper.queryCurrentDayNum2(warehousingOutboundEntity);
}
@Override
public YunguanSaleOutBoundModel saleOutBoundByYunGuanInfo(String id) {
return warehousingOutboundMapper.saleOutBoundByYunGuan(id);
}
@Override
public List<YunguanSaleOutBoundModel> saleOutBoundProductByYunGuanInfo(String id) {
return warehousingOutboundMapper.saleOutBoundProductByYunGuan(id);
}
@Override
public BigDecimal queryCurrentDayAmount(WarehousingOutboundEntity warehousingOutboundEntity) {
return warehousingOutboundMapper.queryCurrentDayAmount(warehousingOutboundEntity);

@ -585,12 +585,15 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
}
if (warehousingStorageForm.getWarehousingStorageProductList()!=null){
List<WarehousingStorageProductEntity> 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<WarehousingStorag
//统计收货数量
BigDecimal countNum = BigDecimal.ZERO;
// List<WarehousingStorageProductEntity> 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<WarehousingStorag
warehousingStorageProductEntity.setOrganizeJsonId(receiptOrder.getOrganizeJsonId());
warehousingStorageProductEntity.setCompanyId(receiptOrder.getCompanyId());
warehousingStorageProductEntity.setDepartmentId(receiptOrder.getDepartmentId());
warehousingStorageProductEntity.setOrdLn(String.valueOf(line));
warehousingStorageProductService.saveOrUpdate(warehousingStorageProductEntity);
line++;
//查询商品详情
ProductWarehouseEntity productWarehouseEntity = new ProductWarehouseEntity();
@ -931,20 +937,20 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
warehousingStoragePoundlistService.saveOrUpdate(entitys);
}
}
if (entity.getWarehousingStorageType().equals("15")){
YunguanPurchaseInBoundModel yunguanPurchaseInBoundModel = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
List<YunguanPurchaseInBoundModel> 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> yunguanPurchaseInBoundModel = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
//// List<YunguanPurchaseInBoundModel> 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<WarehousingStorag
public BigDecimal queryCurrentDayNum2(WarehousingStorageEntity warehousingStorage) {
return warehousingStorageMapper.queryCurrentDayNum2(warehousingStorage);
}
@Override
public YunguanPurchaseInBoundModel purchaseInBoundByYunGuan(String id) {
return warehousingStorageMapper.purchaseInBoundByYunGuan(id);
}
@Override
public List<YunguanPurchaseInBoundModel> purchaseInBoundProductByYunGuanInfo(String id) {
return warehousingStorageMapper.purchaseInBoundProductByYunGuan(id);
}
@Override
public BigDecimal queryCurrentDayAmount(WarehousingStorageEntity warehousingStorage) {
return warehousingStorageMapper.queryCurrentDayAmount(warehousingStorage);

@ -119,6 +119,10 @@ public class BusinessOrderController {
private FlowTaskNodeService flowTaskNodeService;
@Autowired
private OrganizeService organizeService;
@Autowired
private VoucherService voucherService;
@Autowired
private VoucherProductService voucherProductService;
/**
*
@ -131,7 +135,45 @@ public class BusinessOrderController {
public ActionResult list(@RequestBody BusinessOrderPagination businessOrderPagination)throws IOException{
List<BusinessOrderEntity> list= businessOrderService.getList(businessOrderPagination);
List<Map<String, Object>> realList=new ArrayList<>();
//计算销售订单的利润
for (BusinessOrderEntity entity : list) {
//计算销售订单的总额
QueryWrapper<BusinessOrderProductRelationalEntity> queryWrapperSaleProduct = new QueryWrapper<>();
queryWrapperSaleProduct.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,entity.getId());
List<BusinessOrderProductRelationalEntity> 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<VoucherEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(VoucherEntity::getIsTransfer,"2");
queryWrapper.lambda().eq(VoucherEntity::getBusinessOrderId,entity.getId());
queryWrapper.lambda().isNull(VoucherEntity::getDeleteMark);
List<VoucherEntity> voucherEntityList = voucherService.list(queryWrapper); //销售订单下所有销售发货凭证
for (VoucherEntity entity1 : voucherEntityList){
QueryWrapper<VoucherEntity> 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<VoucherProductEntity> 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<BusinessOrderProductRelationalEntity> 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<String, Object> businessOrderMap=JsonUtil.entityToMap(entity);
businessOrderMap.put("id", businessOrderMap.get("id"));
//副表数据

@ -687,20 +687,6 @@ public class WarehousingOutboundController {
//inventoryLogEntity.setRetailPrice();//零售价
inventoryLogService.saveOrUpdate(inventoryLogEntity);
}
if (entity.getWarehousingOutboundType().equals("1")){
YunguanSaleOutBoundModel yunguanSaleOutBoundModel = warehousingOutboundService.saleOutBoundByYunGuanInfo(id);
List<YunguanSaleOutBoundModel> 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("修改数据失败");

@ -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("运管推送销售收款到智慧成功");
}
}

@ -198,4 +198,6 @@ public class BusinessOrderEntity {
private String searchDateString;
@TableField(exist = false)
private String productId;
@TableField(exist = false)
private BigDecimal profit;
}

@ -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<String> voucherIdList;

@ -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)

@ -71,6 +71,8 @@ public class WarehousingOutboundProductEntity {
@TableField("BUSINESS_PRICE")
private BigDecimal businessPrice;
@TableField("ORD_LN")
private String ordLn;
/**
* 退

@ -73,6 +73,8 @@ public class WarehousingStorageProductEntity {
@TableField("BUSINESS_PRICE")
private BigDecimal businessPrice;
@TableField("ORD_LN")
private String ordLn;
/**
* 退

@ -116,4 +116,7 @@ public class BusinessOrderForm {
/** 是否转换采购/销售 */
@JsonProperty("isTransferSource")
private Object isTransferSource;
/** YG销售方式 */
@JsonProperty("externalSaleWay")
private Object externalSaleWay;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -111,14 +111,14 @@
{{ scope.row.saleStatus }}
</template>
</el-table-column>
<el-table-column prop="contractName" label="关联合同号" align="center" width="130">
<el-table-column prop="contractName" label="关联合同号" align="center" width="200">
</el-table-column>
<el-table-column label="是否紧急" prop="urgentOrder1" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.urgentOrder1 }}
</template>
</el-table-column>
<el-table-column prop="wareHouseName" label="收货仓库" align="center" width="100">
<el-table-column prop="wareHouseName" label="收货仓库" align="center" width="200">
</el-table-column>
<el-table-column prop="planPurchaseNum" label="计划采购数量" align="center" width="120">
</el-table-column>

@ -88,7 +88,7 @@
</JnpfOpenData>
</jnpf-form-tip-item>
</el-col>
<el-col :span="9" v-if="judgeShow('deliveryType')">
<el-col :span="8" v-if="judgeShow('deliveryType')">
<jnpf-form-tip-item label="配送方式" v-if="judgeShow('deliveryType')" prop="deliveryType">
<JnpfSelect v-model="dataForm.deliveryType" @change="changeData('deliveryType', -1)"
placeholder="请选择" :disabled="judgeWrite('deliveryType')" clearable
@ -97,6 +97,16 @@
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('transportMode')">
<jnpf-form-tip-item label="YG销售方式" v-if="judgeShow('transportMode')"
prop="carriageMode">
<JnpfSelect v-model="dataForm.externalSaleWay"
@change="changeData('transportMode', -1)" placeholder="请选择"
:disabled="judgeWrite('transportMode')" clearable :style='{ "width": "100%" }'
:options="externalSaleWayMethodOptions" :props="externalSaleWayMethodProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<template v-if="dataForm.orderType == 3">
<el-col :span="24">
<div style="padding:15px 0px">
@ -1191,6 +1201,7 @@ export default {
expectArriveDateEnd: undefined,
createOrderDate: undefined,
deliveryType: "2",
externalSaleWay: undefined,
contractId: undefined,
currency: undefined,
saleMode: undefined,
@ -1344,6 +1355,8 @@ export default {
urgentOrderProps: { "label": "fullName", "value": "id" },
deliveryTypeOptions: [{ "fullName": "仓配", "id": "1" }, { "fullName": "直送", "id": "2" }],
deliveryTypeProps: { "label": "fullName", "value": "id" },
externalSaleWayMethodOptions: [{ "fullName": "全款赊销", "id": "A" }, { "fullName": "预收款赊销", "id": "B" }, { "fullName": "预收全款或预收部分款", "id": "C" }, { "fullName": "款到发货,(定金订货,款到发货)", "id": "D" }],
externalSaleWayMethodProps: { "label": "fullName", "value": "id" },
contractIdcolumnOptions: [{ "label": "合同编码", "value": "contractNumber" }, { "label": "合同名称", "value": "contractName" },],
currencyOptions: [{ "fullName": "人民币", "id": "1" }, { "fullName": "港元", "id": "2" }, { "fullName": "美元", "id": "3" }, { "fullName": "欧元", "id": "4" }, { "fullName": "加币", "id": "5" }, { "fullName": "日元", "id": "6" }, { "fullName": "台币", "id": "7" }],
currencyProps: { "label": "fullName", "value": "id" },

@ -108,7 +108,7 @@
{{ scope.row.purchaseStatus }}
</template>
</el-table-column>
<el-table-column prop="contractNumber" label="关联合同号" align="center" width="120">
<el-table-column prop="contractNumber" label="关联合同号" align="center" width="150">
</el-table-column>
<!-- <template v-if="this.deliveryType == '1'">
<el-table-column prop="result" label="校验结果" sortable align="center" width="100">
@ -116,7 +116,9 @@
</template> -->
<el-table-column prop="urgentOrder1" label="是否紧急" align="center" width="100">
</el-table-column>
<el-table-column prop="wareHouseName" label="发货仓库" align="center" width="100">
<el-table-column prop="wareHouseName" label="发货仓库" align="center" width="200">
</el-table-column>
<el-table-column prop="profit" label="利润" align="center" width="140">
</el-table-column>
<el-table-column prop="planPurchaseNum" label="计划销售数量" align="center" width="140">
</el-table-column>

Loading…
Cancel
Save