采购订单与销售订单接口

jg-waiwang-pro
vayne 6 months ago
parent 9bd0ec9a99
commit 6d1a879387

@ -860,6 +860,200 @@
AND e.f_delete_mark IS NULL
LEFT JOIN jg_contract f ON a.contract_id = f.id
AND f.f_delete_mark IS NULL
WHERE a.id = #{id}
WHERE a.delete_mark is null and a.id = #{id}
</select>
<select id="queryPurchaseOrderProductByYunGuan" resultType="jnpf.model.yunguan.YunguanPurchaseOrderProductModel">
SELECT
b.id AS ID,
c.f_en_code AS COMP_CD,
a.CODE AS ORD_NO,
d.CODE AS ITEM_CD,
d.NAME AS ITEM_NM,
d.spec AS SPEC_TYPE,
b.business_num AS QUANTITY,
b.sales_main_unit_id AS UNIT,
f.price_rate AS CONTR_PRICE,
b.not_tax_price AS PRICE,
b.business_price AS TAX_PRICE,
b.tax AS TAX_RATE,
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
FROM
jg_business_order a
RIGHT JOIN jg_business_order_product_relational b ON b.business_order_id = a.id
AND b.f_delete_mark IS NULL
LEFT JOIN base_organize c ON b.company_id = c.f_id
AND c.f_delete_mark IS NULL
LEFT JOIN jg_product d ON b.product_id = d.id
AND d.f_delete_mark IS NULL
LEFT JOIN jg_contract e ON a.contract_id = e.id
AND e.f_delete_mark IS NULL
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}
</select>
<select id="querySaleOrderByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOrderModel">
SELECT
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,
d.f_en_code AS ADD_DEPT_CODE,
d.f_full_name AS ADD_DEPT_NAME,
a.CODE AS ORD_NO,
f.contract_number AS CONTR_NO,
f.contract_no AS KH_CONTR_NO,
f.contract_signed_time AS CONTRACT_DT,
a.expect_arrive_date_start AS DELV_DT,
b.CODE AS CUST_ID,
b.NAME AS CUST_NM,
CASE
a.transaction_mode
WHEN '1' THEN
'快递交货'
WHEN '2' THEN
'送货上门'
WHEN '3' THEN
'上门提货'
END AS DELV_MTH,
CASE
a.transport_mode
WHEN '1' THEN
'公路'
WHEN '2' THEN
'铁路'
WHEN '3' THEN
'轮船'
WHEN '4' THEN
'空运'
WHEN '5' THEN
'无'
END AS TRS_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
FROM
jg_business_order a
LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id
AND b.f_delete_mark IS NULL
LEFT JOIN base_organize c ON a.company_id = c.f_id
AND c.f_delete_mark IS NULL
LEFT JOIN base_organize d ON a.department_id = d.f_id
AND d.f_delete_mark IS NULL
LEFT JOIN base_user e ON a.f_creator_user_id = e.f_id
AND e.f_delete_mark IS NULL
LEFT JOIN jg_contract f ON a.contract_id = f.id
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
WHERE a.f_delete_mark IS NULL AND a.id = #{id}
</select>
<select id="querySaleOrderProductByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOrderProductModel">
SELECT
b.id AS ID,
c.f_en_code AS COMP_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,
d.CODE AS ITEM_CD,
d.NAME AS ITEM_NM,
d.spec AS SPEC_TYPE,
b.business_num AS QUANTITY,
b.sales_main_unit_id AS UNIT,
b.business_price AS ORD_PRICE,
b.tax_count AS TOT_AMOUNT,
b.tax AS TAX_RATE_CODE,
b.not_tax_price AS TAX_PRICE,
b.not_tax_count AS AMOUNT
FROM
jg_business_order a
RIGHT JOIN jg_business_order_product_relational b ON b.business_order_id = a.id
AND b.f_delete_mark IS NULL
LEFT JOIN base_organize c ON b.company_id = c.f_id
AND c.f_delete_mark IS NULL
LEFT JOIN jg_product d ON b.product_id = d.id
AND d.f_delete_mark IS NULL
LEFT JOIN jg_contract e ON a.contract_id = e.id
AND e.f_delete_mark IS NULL
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}
</select>
</mapper>

@ -12,6 +12,9 @@ import jnpf.model.businessorder.BusinessOrderPagination;
import jnpf.model.businessorder.ContractModel;
import jnpf.model.businessorder.ProductByContractModel;
import jnpf.model.yunguan.YunguanPurchaseOrderModel;
import jnpf.model.yunguan.YunguanPurchaseOrderProductModel;
import jnpf.model.yunguan.YunguanSaleOrderModel;
import jnpf.model.yunguan.YunguanSaleOrderProductModel;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
@ -57,5 +60,11 @@ public interface BusinessOrderMapper extends BaseMapper<BusinessOrderEntity> {
BigDecimal queryCurrentDayNum2(@Param("businessOrderEntity") BusinessOrderEntity businessOrderEntity);
//运管采购订单接口
YunguanPurchaseOrderModel queryPurchaseOrderByYunGuan(String id);
YunguanPurchaseOrderModel queryPurchaseOrderByYunGuan(@Param("id") String id);
//运管采购订单商品接口
List<YunguanPurchaseOrderProductModel> queryPurchaseOrderProductByYunGuan(@Param("id") String id);
//运管销售订单接口
YunguanSaleOrderModel querySaleOrderByYunGuan(@Param("id") String id);
//运管销售订单商品接口
List<YunguanSaleOrderProductModel> querySaleOrderProductByYunGuan(@Param("id") String id);
}

@ -8,6 +8,9 @@ import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jnpf.model.yunguan.YunguanPurchaseOrderModel;
import jnpf.model.yunguan.YunguanPurchaseOrderProductModel;
import jnpf.model.yunguan.YunguanSaleOrderModel;
import jnpf.model.yunguan.YunguanSaleOrderProductModel;
/**
* businessOrder
@ -82,4 +85,10 @@ public interface BusinessOrderService extends IService<BusinessOrderEntity> {
//运管采购订单接口
YunguanPurchaseOrderModel queryPurchaseOrderByYunGuanInfo(String id);
//运管采购订单商品接口
List<YunguanPurchaseOrderProductModel> queryPurchaseOrderProductByYunGuanInfo(String id);
//运管销售订单接口
YunguanSaleOrderModel querySaleOrderByYunGuanInfo(String id);
//运管销售订单商品接口
List<YunguanSaleOrderProductModel> querySaleOrderProductByYunGuanInfo(String id);
}

@ -8,6 +8,9 @@ import jnpf.mapper.BusinessOrderProductRelationalMapper;
import jnpf.mapper.InventoryMapper;
import jnpf.mapper.VoucherMapper;
import jnpf.model.yunguan.YunguanPurchaseOrderModel;
import jnpf.model.yunguan.YunguanPurchaseOrderProductModel;
import jnpf.model.yunguan.YunguanSaleOrderModel;
import jnpf.model.yunguan.YunguanSaleOrderProductModel;
import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.service.OrganizeService;
import jnpf.service.*;
@ -1103,4 +1106,19 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
public YunguanPurchaseOrderModel queryPurchaseOrderByYunGuanInfo(String id) {
return businessOrderMapper.queryPurchaseOrderByYunGuan(id);
}
@Override
public List<YunguanPurchaseOrderProductModel> queryPurchaseOrderProductByYunGuanInfo(String id) {
return businessOrderMapper.queryPurchaseOrderProductByYunGuan(id);
}
@Override
public YunguanSaleOrderModel querySaleOrderByYunGuanInfo(String id) {
return businessOrderMapper.querySaleOrderByYunGuan(id);
}
@Override
public List<YunguanSaleOrderProductModel> querySaleOrderProductByYunGuanInfo(String id) {
return businessOrderMapper.querySaleOrderProductByYunGuan(id);
}
}

@ -14,6 +14,9 @@ import jnpf.engine.service.FlowTaskNodeService;
import jnpf.engine.service.FlowTaskService;
import jnpf.exception.DataException;
import jnpf.model.yunguan.YunguanPurchaseOrderModel;
import jnpf.model.yunguan.YunguanPurchaseOrderProductModel;
import jnpf.model.yunguan.YunguanSaleOrderModel;
import jnpf.model.yunguan.YunguanSaleOrderProductModel;
import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.OrganizeService;
@ -578,9 +581,20 @@ public class BusinessOrderController {
if (entity.getBusinessType().equals("1")) {
YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(purchaseOrder)) {
JSONObject jsonObject = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
log(jsonObject);
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
if (purchaseCode.get("code").equals("200")){
List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
}
}
}else if (entity.getBusinessType().equals("2")){
YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(saleOrder)){
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
if (saleCode.get("code").equals("200")){
List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
}
}
}
businessOrderService.saveOrUpdate(entity);

@ -0,0 +1,57 @@
package jnpf.model.yunguan;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class YunguanPurchaseOrderProductModel {
/** ID**/
@JSONField(name = "ID")
private String ID;
/** 租户代码**/
@JSONField(name = "COMP_CD")
private String COMP_CD;
/** 采购单号**/
@JSONField(name = "ORD_NO")
private String ORD_NO;
/** 商品编码**/
@JSONField(name = "ITEM_CD")
private String ITEM_CD;
/** 商品名称**/
@JSONField(name = "ITEM_NM")
private String ITEM_NM;
/** 规格**/
@JSONField(name = "SPEC_TYPE")
private String SPEC_TYPE;
/** 采购数量**/
@JSONField(name = "QUANTITY")
private String QUANTITY;
/** 采购单位**/
@JSONField(name = "UNIT")
private String UNIT;
/** 合同单价**/
@JSONField(name = "CONTR_PRICE")
private String CONTR_PRICE;
/** 不含税单价**/
@JSONField(name = "PRICE")
private String PRICE;
/** 采购单价**/
@JSONField(name = "TAX_PRICE")
private String TAX_PRICE;
/** 税率**/
@JSONField(name = "TAX_RATE")
private String TAX_RATE;
/** 不含税小计**/
@JSONField(name = "AMOUNT")
private String AMOUNT;
/** 含税小计**/
@JSONField(name = "TOTAL_AMOUNT")
private String TOTAL_AMOUNT;
/** 币种**/
@JSONField(name = "CURRENCY_CD")
private String CURRENCY_CD;
/** 期望送达时间**/
@JSONField(name = "DELV_DT")
private String DELV_DT;
}

@ -0,0 +1,74 @@
package jnpf.model.yunguan;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class YunguanSaleOrderModel {
/** ID**/
@JSONField(name = "ID")
private String 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_CD")
private String DEPT_CD;
/** 部门名称 **/
@JSONField(name = "DEPT_NM")
private String DEPT_NM;
/** 销售订单号 **/
@JSONField(name = "ORD_NO")
private String ORD_NO;
/** 合同编号 **/
@JSONField(name = "CONTR_NO")
private String CONTR_NO;
/** 对方合同编号 **/
@JSONField(name = "KH_CONTR_NO")
private String KH_CONTR_NO;
/** 签订日期 **/
@JSONField(name = "CONTRACT_DT")
private String CONTRACT_DT;
/** 期望送达时间 **/
@JSONField(name = "DELV_DT")
private String DELV_DT;
/** 客户编码 **/
@JSONField(name = "CUST_ID")
private String CUST_ID;
/** 客户名称 **/
@JSONField(name = "CUST_NM")
private String CUST_NM;
/** 交货方式 **/
@JSONField(name = "DELV_MTH")
private String DELV_MTH;
/** 运输方式 **/
@JSONField(name = "TRS_MTH")
private String TRS_MTH;
/** 付款方式 **/
@JSONField(name = "PAY_MTH")
private String PAY_MTH;
/** 合同金额 **/
@JSONField(name = "CONTR_PRICE")
private String CONTR_PRICE;
/** 发货地址 **/
@JSONField(name = "FROM_PLACE")
private String FROM_PLACE;
/** 收货地址 **/
@JSONField(name = "TO_PLACE")
private String TO_PLACE;
/** 订单状态 **/
@JSONField(name = "ORD_STS")
private String ORD_STS;
/** 制单人名称 **/
@JSONField(name = "ADD_NAME")
private String ADD_NAME;
/** 制单时间 **/
@JSONField(name = "ADD_TIME")
private String ADD_TIME;
}

@ -0,0 +1,50 @@
package jnpf.model.yunguan;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class YunguanSaleOrderProductModel {
/** ID**/
@JSONField(name = "ID")
private String ID;
/** 租户代码**/
@JSONField(name = "COMP_CD")
private String COMP_CD;
/** 销售单号**/
@JSONField(name = "ORD_NO")
private String ORD_NO;
/** 销售状态**/
@JSONField(name = "ORD_STS")
private String ORD_STS;
/** 商品编码**/
@JSONField(name = "ITEM_CD")
private String ITEM_CD;
/** 商品名称**/
@JSONField(name = "ITEM_NM")
private String ITEM_NM;
/** 规格**/
@JSONField(name = "SPEC_TYPE")
private String SPEC_TYPE;
/** 销售数量**/
@JSONField(name = "QUANTITY")
private String QUANTITY;
/** 销售单位**/
@JSONField(name = "UNIT")
private String UNIT;
/** 销售单价**/
@JSONField(name = "ORD_PRICE")
private String ORD_PRICE;
/** 含税小计**/
@JSONField(name = "TOT_AMOUNT")
private String TOT_AMOUNT;
/** 税率**/
@JSONField(name = "TAX_RATE_CODE")
private String TAX_RATE_CODE;
/** 不含税单价**/
@JSONField(name = "TAX_PRICE")
private String TAX_PRICE;
/** 不含税小计**/
@JSONField(name = "AMOUNT")
private String AMOUNT;
}
Loading…
Cancel
Save