通宇组装摘要修改

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java

@@ -303,7 +303,13 @@ public interface WlhyServiceFeign {
     @GetMapping(value = "/feign/transportNote/selectByOrderNum")
     public R<TmsTransportNote> selectByOrderNum(@RequestParam(value = "orderNo") String orderNo);
 
-
+    /**
+     * 根据发票id查询发票信息
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/feign/invoiceList/selectById")
+    public R<TmsInvoiceList> selectInvoiceListById(@RequestParam(value = "id") String id);
     /**
      * 运输单表-支付回调
      * @param tmsPayCallbackList
@@ -512,4 +518,4 @@ public interface WlhyServiceFeign {
 
     @GetMapping(value = "/ntocc/tmsSettlementExchangeRate/queryById")
     public Result<?> queryById(@RequestParam(name="id",required=true) String id);
-}
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsInvoiceList.java

@@ -0,0 +1,225 @@
+package com.mhd.system.api.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: 销项发票表
+ * @Author: lfs
+ * @Date:   2020-02-19 08:50:47
+ * @Version: V1.0
+ */
+@Data
+@TableName("tms_invoice_list")
+public class TmsInvoiceList implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    private String id;
+	/**发票抬头*/
+    @ApiModelProperty(value = "发票抬头")
+    private String invoiceTitle;
+	/**发票金额*/
+    @ApiModelProperty(value = "发票金额")
+
+    private BigDecimal invoiceValue;
+	/**发票备注*/
+    @ApiModelProperty(value = "发票备注")
+
+    private String remark;
+	/**发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）*/
+    @ApiModelProperty(value = "发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）")
+
+    private Integer invoiceState;
+	/**发票申请时间*/
+    @ApiModelProperty(value = "发票申请时间")
+
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date invoiceApplyTime;
+	/**申请人ID*/
+    @ApiModelProperty(value = "申请人ID")
+
+    private String applicantId;
+    /**发票申请单号*/
+    @ApiModelProperty(value = "发票申请单号")
+
+    private String applyNumber;
+    /**驳回原因*/
+    @ApiModelProperty(value = "驳回原因")
+
+    private String rejectReason;
+    /**运输单ids*/
+    @ApiModelProperty(value = "运输单ids")
+
+    private String transportationIds;
+	/**退票备注*/
+    @ApiModelProperty(value = "退票备注")
+
+    private String refundRemark;
+	/**处理人ID（取消申请/开票/驳回）*/
+    @ApiModelProperty(value = "处理人ID（取消申请/开票/驳回）")
+
+    private String managerId;
+	/**处理时间*/
+    @ApiModelProperty(value = "处理时间")
+
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date managerTime;
+	/**寄出人ID*/
+    @ApiModelProperty(value = "寄出人ID")
+
+    private String sendById;
+	/**寄出时间*/
+    @ApiModelProperty(value = "寄出时间")
+
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date sendTime;
+    /**寄出邮费*/
+    @ApiModelProperty(value = "寄出邮费")
+
+    private BigDecimal sendPostage;
+    /**快递公司*/
+    @ApiModelProperty(value = "快递公司")
+
+    private String courierServicesCompany;
+    /**收件地址id*/
+    @ApiModelProperty(value = "收件地址id")
+
+    private String receivingAddressId;
+    /**手机号*/
+    @ApiModelProperty(value = "手机号")
+
+    private String phone;
+    /**收件人姓名*/
+    @ApiModelProperty(value = "收件人姓名")
+
+    private String receivingName;
+    /**邮政编码*/
+    @ApiModelProperty(value = "邮政编码")
+
+    private String postalCode;
+    /**所在地区*/
+    @ApiModelProperty(value = "所在地区")
+
+    private String location;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+
+    private String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+
+    private String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+	/**是否删除（0-否，1-是）*/
+    @ApiModelProperty(value = "是否删除（0-否，1-是）")
+
+    private Integer isDelete;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+
+    private String sysOrgCode;
+    /**发票类型（0-增值税专用发票，1-普通发票）*/
+    @ApiModelProperty(value = "发票类型（0-增值税专用发票，1-普通发票）")
+
+    private Integer invoiceType;
+    /**发票性质（0-纸质发票，1-电子发票）*/
+    @ApiModelProperty(value = "发票性质（0-纸质发票，1-电子发票）")
+
+    private Integer invoiceNature;
+    /**发票号*/
+    @ApiModelProperty(value = "发票号")
+
+    private String invoiceNumber;
+    /**快递单号*/
+    @ApiModelProperty(value = "快递单号")
+
+    private String trackingNumber;
+    /**开票代码*/
+    @ApiModelProperty(value = "开票代码")
+
+    private String invoiceCode;
+    /**发票详情信息上报状态：0-未上报，1-已上报，2-上报失败*/
+    @ApiModelProperty(value = "发票详情信息上报状态：0-未上报，1-已上报，2-上报失败")
+
+    private Integer isReport;
+    /**发票详情信息上报失败原因*/
+    @ApiModelProperty(value = "发票详情信息上报失败原因")
+
+    private String errMsg;
+
+    /**发票详情信息上报时间*/
+    @ApiModelProperty(value = "发票详情信息上报时间")
+
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    @ApiModelProperty(value = "运单事实创建人ID(创建运单时的当前登录人USER-ID)")
+    private String realCreateBy;
+
+    @ApiModelProperty(value = "运单事实创建人名称(创建运单时的当前登录人REAL-NAME)")
+    private String realCreateName;
+
+    @ApiModelProperty(value = "开票时间")
+    private Date invoiceMakeTime;
+
+    /**货主信息id*/
+    @ApiModelProperty(value = "货主信息id")
+
+    private String shipperId;
+
+    /**货主信息id*/
+    @ApiModelProperty(value = "货主姓名")
+
+    private String shipperName;
+
+    /**货主信息id*/
+    @ApiModelProperty(value = "货主公司名称")
+
+    private String companyName;
+
+    /**税务登记证号*/
+    @ApiModelProperty(value = "税务登记证号")
+
+    private String taxRegAccount;
+
+    /**组织ID*/
+    @ApiModelProperty(value = "组织ID")
+
+    private Long organizationId;
+
+    /**组织名称*/
+    @ApiModelProperty(value = "组织名称")
+
+    private String organizationName;
+
+    /**一级组织ID*/
+    @ApiModelProperty(value = "一级组织ID")
+
+    private Long topOrganizationId;
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java

@@ -212,6 +212,14 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
                 return res;
             }
 
+            @Override
+            public R<TmsInvoiceList> selectInvoiceListById(String id) {
+                R<TmsInvoiceList> res = new R<>();
+                res.setMsg("获取发票信息失败"+cause.getMessage());
+                res.setCode(R.FAIL);
+                return res;
+            }
+
             @Override
             public AjaxResult payCallback(List<TmsPayCallbackDTO> tmsPayCallbackList) {
                 return AjaxResult.error(cause.getMessage());
@@ -517,4 +525,4 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
             }
         };
     }
-}
+}

mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java

@@ -40,6 +40,7 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.UserServiceFeign;
 import com.mhd.system.api.WlhyServiceFeign;
+import com.mhd.system.api.domain.TmsInvoiceList;
 import com.mhd.system.api.domain.TmsTransportNote;
 import com.mhd.system.api.model.LoginUser;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -410,11 +411,6 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 throw new ServiceException("该记录已同步，不需要再次同步");
             }
 
-
-         /*   if(reconciliation.getIsInvoice()!=2){
-                throw new ServiceException("该记录还未开票，不允许同步");
-            }*/
-
             try {
                 Date date = reconciliation.getCreateTime();
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -605,6 +601,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                         }
                     }
                 }else if(reconciliation.getOrganizationName().contains("通宇")){
+                    if (reconciliation.getIsInvoice() != 2) {
+                        throw new ServiceException("该记录还未开票，不允许同步");
+                    }
                     if(result.getCode()==200){
                         List<TmsOrder> list=result.getData();
                         if(ObjectUtil.isNotNull(list)){
@@ -634,6 +633,15 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
 
                                 }
 
+                            }
+                            String invoiceNumber=reconciliation.getApplyNumber();
+                            R<TmsInvoiceList> ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId());
+                            if(ajaxResult2.getCode()==200){
+                                TmsInvoiceList tmsInvoiceList= ajaxResult2.getData();
+                                if(ObjectUtil.isNotNull(tmsInvoiceList)) {
+                                    invoiceNumber=tmsInvoiceList.getInvoiceNumber();
+                                }
+
                             }
                             List<ReconciliationAccount> reconciliationAccountList=reconciliationAccountMapper.selectList(new QueryWrapper<ReconciliationAccount>().lambda()
                                     .eq(ReconciliationAccount::getReconciliationId,businessDocumentDetaliId)
@@ -647,7 +655,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                     item.setCustomer(customerCodeNc);
                                     item.setObjtype("0");
                                     item.setDirection("1");
-                                    item.setScomment("业务部：应收"+appointShipper+reconciliationAccount.getSubjectName()+reconciliation.getApplyNumber());
+                                    item.setScomment("业务部：应收"+appointShipper+reconciliationAccount.getSubjectName()+invoiceNumber);
                                     // item.setPk_currtype("CNY");
                                     item.setPk_currtype(settlementCurrency);
                                     item.setPurchaseorder("");
@@ -672,9 +680,11 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                     item.setPrice(String.valueOf(reconciliationAccount.getAmount()));
                                     item.setTaxprice(String.valueOf(reconciliationAccount.getAmount()));
                                     item.setDef75("T10");
-                                    item.setInvoiceno("");
+                                    item.setInvoiceno(invoiceNumber);
                                     ysitemList.add(item);
                                 }
+                            }else{
+                                throw  new ServiceException("未查询到账单的费用科目信息， 请核对");
                             }
 
                             Ysbodys bodys=new Ysbodys();
@@ -1009,7 +1019,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                 item.setPurchaseorder(tmsOrder.getGoodsNumber());
                                 item.setObjtype("0");
                                 item.setDirection("1");
-                                item.setScomment(tmsOrder.getAppointShipper());
+                                item.setScomment("业务部："+tmsOrder.getAppointShipper()+"物流费");
                                 item.setPk_currtype(tmsOrder.getSettlementCurrency());
                                 item.setMoney_cr(String.valueOf(tmsOrder.getCollectedFreight()));
                                 item.setMoney_bal(String.valueOf(tmsOrder.getCollectedFreight()));

sql/finance.sql

@@ -1,23 +1,26 @@
-CREATE TABLE NGWL_TEST_FINANCE.`RECONCILIATION_ACCOUNT` (
+CREATE TABLE "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"
-  `ID` varchar(36) NOT NULL,
+(
-  `CREATE_BY` varchar(50) DEFAULT NULL ,
+"ID" BIGINT IDENTITY(1, 1) NOT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL ,
+"CREATE_BY" VARCHAR(50) DEFAULT NULL,
-  `UPDATE_BY` varchar(50) DEFAULT NULL ,
+"CREATE_TIME" DATETIME(6) DEFAULT NULL,
-  `UPDATE_TIME` datetime DEFAULT NULL ,
+"UPDATE_BY" VARCHAR(50) DEFAULT NULL,
-  `DEL_FLAG` int DEFAULT '0' ,
+"UPDATE_TIME" DATETIME(6) DEFAULT NULL,
-  `ORG_NAME` varchar(255) DEFAULT NULL,
+"DEL_FLAG" INT DEFAULT '0',
-  `ORGANIZATION_ID` int DEFAULT '0',
+"ORG_NAME" VARCHAR(255) DEFAULT NULL,
-  `TOP_ORGANIZATION_ID` int DEFAULT '0',
+"ORGANIZATION_ID" INT DEFAULT '0',
-  `ORGANIZATION_NAME` varchar(255) DEFAULT NULL ,
+"TOP_ORGANIZATION_ID" INT DEFAULT '0',
-  `RECONCILIATION_ID` varchar(32) DEFAULT NULL ,
+"ORGANIZATION_NAME" VARCHAR(255) DEFAULT NULL,
-  `ACCOUNT_ID` int DEFAULT '0' ,
+"RECONCILIATION_ID" VARCHAR(32) DEFAULT NULL,
-  `ACCOUNT_TYPE` int DEFAULT '0',
+"ACCOUNT_ID" INT DEFAULT '0',
-  `SUBJECT_CODE` varchar(255) DEFAULT NULL,
+"ACCOUNT_TYPE" INT DEFAULT '0',
-  `SUBJECT_NAME` varchar(255) DEFAULT NULL,
+"SUBJECT_CODE" VARCHAR(255) DEFAULT NULL,
-  `RATE` decimal(10,2) DEFAULT '0.00',
+"SUBJECT_NAME" VARCHAR(255) DEFAULT NULL,
-  `AMOUNT` decimal(10,2) DEFAULT '0.00',
+"RATE" DECIMAL(10,2) DEFAULT '0.00',
-  PRIMARY KEY (`ID`)
+"AMOUNT" DECIMAL(10,2) DEFAULT '0.00',
-);
+"CREATE_BY_NAME" VARCHAR(255) DEFAULT NULL,
+"UPDATE_BY_NAME" VARCHAR(255) DEFAULT NULL,
+NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
 COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."CREATE_BY" IS '创建人';
 COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."CREATE_TIME" IS '创建日期';
 COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."UPDATE_BY" IS '更新人';
@@ -34,10 +37,6 @@ COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."SUBJECT_CODE" IS
 COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."SUBJECT_NAME" IS '科目名称';
 COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."RATE" IS '科目费率';
 COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."AMOUNT" IS '金额';
-
-
-ALTER TABLE "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT" ADD COLUMN CREATE_BY_NAME varchar(255) DEFAULT NULL ;
 COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT".CREATE_BY_NAME IS '创建人';
-
-ALTER TABLE "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT" ADD COLUMN UPDATE_BY_NAME varchar(255) DEFAULT NULL ;
 COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT".UPDATE_BY_NAME IS '更新人';
+