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 bdf092c7..92775c3d 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 @@ -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} + + + + + + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java index 2960bf5e..61a11390 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java @@ -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 { BigDecimal queryCurrentDayNum2(@Param("businessOrderEntity") BusinessOrderEntity businessOrderEntity); //运管采购订单接口 - YunguanPurchaseOrderModel queryPurchaseOrderByYunGuan(String id); + YunguanPurchaseOrderModel queryPurchaseOrderByYunGuan(@Param("id") String id); + //运管采购订单商品接口 + List queryPurchaseOrderProductByYunGuan(@Param("id") String id); + //运管销售订单接口 + YunguanSaleOrderModel querySaleOrderByYunGuan(@Param("id") String id); + //运管销售订单商品接口 + List querySaleOrderProductByYunGuan(@Param("id") String id); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java index e6cc27a3..94cef47a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java @@ -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 { //运管采购订单接口 YunguanPurchaseOrderModel queryPurchaseOrderByYunGuanInfo(String id); + //运管采购订单商品接口 + List queryPurchaseOrderProductByYunGuanInfo(String id); + //运管销售订单接口 + YunguanSaleOrderModel querySaleOrderByYunGuanInfo(String id); + //运管销售订单商品接口 + List querySaleOrderProductByYunGuanInfo(String id); } 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 7d020a6a..ac061b22 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 @@ -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 queryPurchaseOrderProductByYunGuanInfo(String id) { + return businessOrderMapper.queryPurchaseOrderProductByYunGuan(id); + } + + @Override + public YunguanSaleOrderModel querySaleOrderByYunGuanInfo(String id) { + return businessOrderMapper.querySaleOrderByYunGuan(id); + } + + @Override + public List querySaleOrderProductByYunGuanInfo(String id) { + return businessOrderMapper.querySaleOrderProductByYunGuan(id); + } } 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 88604c93..d7954f78 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 @@ -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 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 saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id); + JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct)); + } } } businessOrderService.saveOrUpdate(entity); 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 new file mode 100644 index 00000000..30c1d245 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseOrderProductModel.java @@ -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; + +} 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 new file mode 100644 index 00000000..a95f7929 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java @@ -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; +} 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 new file mode 100644 index 00000000..a787ee94 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderProductModel.java @@ -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; +}