From 090ce57b1b1e196c1d8652ab2bd72d219a732c98 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Tue, 7 Mar 2023 16:58:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8E=9F=E5=A7=8B=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/model/OrderProcessInfo.java | 9 ++++++ .../mybatis/mapper/OrderProcessInfoMapper.xml | 29 ++++++++++++++++--- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java index e045a091..bd7f7d32 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java @@ -213,6 +213,15 @@ public class OrderProcessInfo implements Serializable { * 是否预制发票 */ private String yzfp; + /** + * 原始结算单号 + */ + private String originDdh; + /** + * 原始订单ID + */ + private String originOrderId; + diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 83bb11fa..b9e4750a 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -50,6 +50,8 @@ + + @@ -85,7 +87,7 @@ ghf_mc, ghf_nsrsbh, kpxm, ddcjsj, ddlx, ddzt, ddly, ywlx,ywlx_id,kpfs, sbyy, order_status, create_time, update_time,xhf_nsrsbh,xhf_mc,ent_id,sksbdm,fg_status,edit_status,num,check_status,check_time, - bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp + bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id @@ -853,6 +868,12 @@ yzfp = #{processInfo.yzfp,jdbcType=VARCHAR}, + + yzfp = #{processInfo.originDdh,jdbcType=VARCHAR}, + + + yzfp = #{processInfo.originOrderId,jdbcType=VARCHAR}, + From 64ad37d28c59b5a5adda9c15e33ba6cd621bafbe Mon Sep 17 00:00:00 2001 From: liufeilong Date: Wed, 8 Mar 2023 10:06:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=BC=80=E7=A5=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AE=9A=E5=88=B6=E5=8C=96=E5=AD=97=E6=AE=B5=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseservice/config/BaseXxlJobConfig.java | 4 +- .../thirdservice/user/model/DeptEntity.java | 10 +++++ .../openapi/protocol/v4/order/DdmxxxBO.java | 10 +++++ .../openapi/protocol/v4/order/DdtxxBO.java | 43 +++++++++++++++++++ ...AllocateInvoiceInterfaceServiceImplV3.java | 28 ++++++++++-- .../consumer/utils/BeanTransitionUtils.java | 17 ++++++-- 6 files changed, 103 insertions(+), 9 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java index 198a31aa..fde53335 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java @@ -13,8 +13,8 @@ import org.springframework.context.annotation.Configuration; * * @author xuxueli 2017-04-28 */ -@Configuration -@ComponentScan(basePackages = "com.dxhy.order.baseservice.job") +//@Configuration +//@ComponentScan(basePackages = "com.dxhy.order.baseservice.job") @Slf4j @RefreshScope public class BaseXxlJobConfig { diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java index fe3cd0ef..237d55eb 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java @@ -172,4 +172,14 @@ public class DeptEntity implements Serializable { * 组织类型（0:虚拟组织，1:实体组织） */ private String groupType; + + /** + * 开票组织名称 + */ + private String invoiceName; + + /** + * 开票税号 + */ + private String invoiceNsrsbh; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdmxxxBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdmxxxBO.java index e7ba4856..5986f597 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdmxxxBO.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdmxxxBO.java @@ -120,5 +120,15 @@ public class DdmxxxBO implements Serializable { private String BYZD1; private String BYZD2; private String BYZD3; + + /** + * 批号 + */ + private String PH; + + /** + * 矿别 + */ + private String KB; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java index b7ab796b..1b061a4c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java @@ -6,6 +6,7 @@ import lombok.Setter; import lombok.ToString; import java.io.Serializable; +import java.util.Date; /** * 订单全数据协议bean @@ -321,5 +322,47 @@ public class DdtxxBO implements Serializable { private String BYZD3; private String BYZD4; private String BYZD5; + + /** + * 报账单号 + */ + private String BZDH; + /** + * 系统来源 + */ + private String XTLY; + /** + * 公司代码 + */ + private String GSDM; + /** + * 驳回状态 + */ + private String BHZT; + /** + * 员工姓名 + */ + private String YGXM; + /** + * 开票凭证号 + */ + private String KPPZH; + /** + * 凭证过账日期 + */ + private String PZGZRQ; + /** + * 是否预制发票 + */ + private String YZFP; + /** + * 原始订单号 + */ + private String ORIGINDDH; + /** + * 原始订单ID + */ + private String ORIGINORDERID; + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index 8fd8a445..cb7ffded 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -32,10 +32,7 @@ import com.dxhy.order.consumer.modules.order.service.OrderProcessService; import com.dxhy.order.consumer.modules.validate.service.ValidateInterfaceOrderService; import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService; import com.dxhy.order.consumer.openapi.protocol.v4.checklimit.RedisCheckLimit; -import com.dxhy.order.consumer.openapi.protocol.v4.order.DdkzxxBO; -import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxReqBO; -import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxRspBO; -import com.dxhy.order.consumer.openapi.protocol.v4.order.DdzxxBO; +import com.dxhy.order.consumer.openapi.protocol.v4.order.*; import com.dxhy.order.consumer.openapi.service.AllocateInvoiceInterfaceServiceV3; import com.dxhy.order.consumer.openapi.service.CommonInterfaceService; import com.dxhy.order.consumer.utils.BeanTransitionUtils; @@ -845,6 +842,29 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt } } } + //入库前 山能定制化新增字段赋值 + DdtxxBO ddtxx = ddpcxxReq.getDDZXX().get(0).getDDTXX(); + List ddmxxx = ddpcxxReq.getDDZXX().get(0).getDDMXXX(); + + for(OrderProcessInfo processInfo:insertProcessInfo){ + processInfo.setBzdh(ddtxx.getBZDH()); + processInfo.setXtly(ddtxx.getXTLY()); + processInfo.setGsdm(ddtxx.getGSDM()); + processInfo.setBhzt(ddtxx.getBHZT()); + processInfo.setYgxm(ddtxx.getYGXM()); + processInfo.setKppzh(ddtxx.getKPPZH()); + processInfo.setPzgzrq(DateUtil.parse(ddtxx.getPZGZRQ(),"yyyy-MM-dd")); + processInfo.setYzfp(ddtxx.getYZFP()); + processInfo.setOriginDdh(ddtxx.getDDH()); + processInfo.setOriginOrderId(processInfo.getOrderInfoId()); + } + for(OrderItemInfo itemInfo:insertOrderItem.get(0)){ + itemInfo.setPh(ddmxxx.get(0).getPH()); + itemInfo.setKb(ddmxxx.get(0).getKB()); + //TODO lfl 这两在哪赋值？ + itemInfo.setZnfm(""); + itemInfo.setTswl(""); + } /* * 手动导入判断 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index d2c55728..7a8fb012 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3464,14 +3464,14 @@ public class BeanTransitionUtils { FpkjReqSap req = JsonUtils.getInstance().parseObject(zdataString, FpkjReqSap.class); //批次信息 ddpcxxBO.setDDQQPCH(isinput.getSAPKEY()); - ddpcxxBO.setNSRSBH(deptEntity.getTaxpayerCode()); + ddpcxxBO.setNSRSBH(deptEntity.getInvoiceNsrsbh()); ddpcxxBO.setFPLXDM(CommonUtils.transSnFplxdm(req.getZFPLX())); ddpcxxBO.setKPFS(ConfigureConstant.STRING_1); //订单头信息 ddtxxBO.setDDQQLSH(isinput.getSAPKEY()); ddtxxBO.setKPLX(req.getZSFHZ()); - ddtxxBO.setXHFSBH(deptEntity.getTaxpayerCode()); - ddtxxBO.setXHFMC(deptEntity.getName()); + ddtxxBO.setXHFSBH(deptEntity.getInvoiceNsrsbh()); + ddtxxBO.setXHFMC(deptEntity.getInvoiceName()); ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); @@ -3484,6 +3484,15 @@ public class BeanTransitionUtils { ddtxxBO.setHJJE(req.getZBHSJE()); ddtxxBO.setHJSE(req.getZZSE()); ddtxxBO.setDDH(req.getZJSDH()); + ddtxxBO.setBZDH(req.getZBZDH()); + ddtxxBO.setXTLY(req.getZSJLY()); + ddtxxBO.setGSDM(req.getBUKRS()); + ddtxxBO.setBHZT(ConfigureConstant.STRING_0); + ddtxxBO.setYGXM(req.getPENAM()); + ddtxxBO.setKPPZH(req.getZKPPZH()); + ddtxxBO.setPZGZRQ(req.getZGZRQ()); + ddtxxBO.setYZFP(ConfigureConstant.STRING_0); + ddtxxBO.setORIGINDDH(req.getZJSDH()); //TODO lfl 清单标志怎么处理？ ddtxxBO.setQDBZ("0"); //明细信息 @@ -3511,6 +3520,8 @@ public class BeanTransitionUtils { ddmxxxBO.setJE(detail.getZHSJE()); ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1); ddmxxxBO.setSE(detail.getZZSE()); + ddmxxxBO.setPH(detail.getCHARG()); + ddmxxxBO.setKB(detail.getKTYPE()); //TODO lfl 优惠政策标识 取税编对应的优惠政策标识! ddmxxxBO.setYHZCBS("0"); ddmxList.add(ddmxxxBO); From 4898b694cbb6f7e872da69bdc6ba2f63fd334523 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Wed, 8 Mar 2023 11:41:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E9=A9=B3=E5=9B=9E=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=E4=B8=9A=E5=8A=A1=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InvoiceRemarkSetServiceImpl.java | 1 + .../service/impl/InterfaceServiceImplV6.java | 39 +++++++++++++++---- .../mybatis/mapper/OrderProcessInfoMapper.xml | 31 ++++++++------- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRemarkSetServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRemarkSetServiceImpl.java index 04cde62e..eb40e32c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRemarkSetServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoiceRemarkSetServiceImpl.java @@ -56,6 +56,7 @@ public class InvoiceRemarkSetServiceImpl implements InvoiceRemarkSetService { for(int i=0;i queryMap = new HashMap<>(); + queryMap.put("bzdh",bzdh); + List orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(queryMap, null, null); + if(orderProcessInfos.size()!=1){ + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); + esOutput.setZMESSAGE("根据报账单号未查询到唯一结算单"); + }else { + OrderProcessInfo orderProcessInfo = orderProcessInfos.get(0); + orderProcessInfo.setBhzt(ConfigureConstant.STRING_1); + int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null); + if(i == 1){ + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); + esOutput.setZMESSAGE("驳回状态更新成功"); + }else { + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); + esOutput.setZMESSAGE("驳回状态更新失败"); + } + } poCommonResponseParam.setES_OUTPUT(esOutput); return poCommonResponseParam; } diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index b9e4750a..c7f49b50 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -571,19 +571,6 @@ #{item} or op.ent_id is null) - - - - - order by op.update_time desc - - - order by op.ddcjsj asc - - - order by op.ddcjsj desc,op.num desc,op.create_time desc,op.id desc - - and op.bzdh = #{map.bzdh,jdbcType=VARCHAR} @@ -614,6 +601,20 @@ and op.origin_order_id = #{map.originOrderId,jdbcType=VARCHAR} + + + + + order by op.update_time desc + + + order by op.ddcjsj asc + + + order by op.ddcjsj desc,op.num desc,op.create_time desc,op.id desc + + + @@ -869,10 +870,10 @@ yzfp = #{processInfo.yzfp,jdbcType=VARCHAR}, - yzfp = #{processInfo.originDdh,jdbcType=VARCHAR}, + origin_ddh = #{processInfo.originDdh,jdbcType=VARCHAR}, - yzfp = #{processInfo.originOrderId,jdbcType=VARCHAR}, + origin_order_id = #{processInfo.originOrderId,jdbcType=VARCHAR}, From deab82ddfe9a1e9b098b8830c2bfcb1ec1cf5868 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Wed, 8 Mar 2023 16:19:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=9F=BF=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/model/OrderProcessInfo.java | 4 ++++ .../mybatis/mapper/OrderProcessInfoMapper.xml | 22 ++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java index bd7f7d32..1c455610 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java @@ -221,6 +221,10 @@ public class OrderProcessInfo implements Serializable { * 原始订单ID */ private String originOrderId; + /** + * 矿别 + */ + private String kb; diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index c7f49b50..719b806d 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -52,6 +52,7 @@ + @@ -87,7 +88,7 @@ ghf_mc, ghf_nsrsbh, kpxm, ddcjsj, ddlx, ddzt, ddly, ywlx,ywlx_id,kpfs, sbyy, order_status, create_time, update_time,xhf_nsrsbh,xhf_mc,ent_id,sksbdm,fg_status,edit_status,num,check_status,check_time, - bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id + bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id,kb