Merge remote-tracking branch 'origin/dev-v6.0.1' into dev-v6.0.1

dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java

@@ -67,8 +67,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 已转出进项税，列表页数据
      *
-     * @param reqVO
-     *            请求参数
+     * @param reqVO 请求参数
      * @return 返回结果
      */
     @Override
@@ -134,7 +133,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
         for (BaseReceiptInvoiceView view : pageInfo.getList()) {
             BaseReceiptOutRespVO vo = convertToInvoiceView(view, invoiceStatusMap);
             // 序号计算 = (当前页-1)*每页条数+1
-            vo.setXh((long)((pageInfo.getPageNum() - 1) * pageInfo.getPageSize() + index));
+            vo.setXh((long) ((pageInfo.getPageNum() - 1) * pageInfo.getPageSize() + index));
             index++;
             respVos.add(vo);
         }
@@ -157,10 +156,8 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * pojo转为view
      *
-     * @param record
-     *            请求参数
-     * @param invoiceStatusMap
-     *            请求参数
+     * @param record           请求参数
+     * @param invoiceStatusMap 请求参数
      * @return 返回结果
      */
     private BaseReceiptOutRespVO convertToInvoiceView(BaseReceiptInvoiceView record,
@@ -179,7 +176,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
         // 开票日期
         vo.setInvoiceDate(DateUtils.dateToStr(record.getInvoiceDate()));
         // 发票状态
-        vo.setInvoiceStatusName(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,record.getInvoiceStatus()));
+        vo.setInvoiceStatusName(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, record.getInvoiceStatus()));
         // 购方税号
         vo.setGfsh(record.getGfTaxNo());
         // 购方名称
@@ -209,12 +206,9 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 根据转出类型 set 抵账表中进项税转出相关字段 (部分转出 or 全部转出)
      *
-     * @param invoices
-     *            请求参数
-     * @param condVO
-     *            请求参数
-     * @param userInfo
-     *            请求参数
+     * @param invoices 请求参数
+     * @param condVO   请求参数
+     * @param userInfo 请求参数
      * @return 返回结果
      */
     private List<BaseTDxRecordInvoice> setPartInvoiceByType(List<BaseTDxRecordInvoice> invoices,
@@ -285,14 +279,10 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 构建进项税转出明细
      *
-     * @param condVO
-     *            请求参数
-     * @param userInfo
-     *            请求参数
-     * @param invoice
-     *            请求参数
-     * @param record
-     *            请求参数
+     * @param condVO   请求参数
+     * @param userInfo 请求参数
+     * @param invoice  请求参数
+     * @param record   请求参数
      */
     private void createInvoiceOut(BaseInvoiceEditCondVO condVO, UserInfo userInfo, BaseTDxRecordInvoice invoice,
                                   BaseTDxRecordInvoiceOut record) {
@@ -361,10 +351,8 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
      * <p>
      * 查询底账表数据，查询转出流水 如果已经有转出流水，则update 如果没有转出流水，则insert 更正底账表转出相关字段
      *
-     * @param condVO
-     *            请求参数
-     * @param userInfo
-     *            请求参数
+     * @param condVO   请求参数
+     * @param userInfo 请求参数
      * @return 返回结果
      */
     @Override
@@ -406,10 +394,8 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 数据源设置end，事物处理
      *
-     * @param condList
-     *            请求参数
-     * @param outList
-     *            请求参数
+     * @param condList 请求参数
+     * @param outList  请求参数
      */
     @Transactional(rollbackFor = Exception.class)
     public void excuteTransferWrite(List<BaseTDxRecordInvoice> condList, List<BaseTDxRecordInvoiceOut> outList) {
@@ -422,8 +408,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 批量update 转出流水
      *
-     * @param list
-     *            请求参数
+     * @param list 请求参数
      */
     private void saveOrUpdateBatch(List<BaseTDxRecordInvoiceOut> list) {
         if (list != null && list.size() > 0) {
@@ -434,8 +419,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 根据uuids查询进项税转出明细
      *
-     * @param uuids
-     *            请求参数
+     * @param uuids 请求参数
      * @return 返回结果
      */
     private List<BaseTDxRecordInvoiceOut> listByUuids(String[] uuids) {
@@ -447,8 +431,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 取消已转出进项税 请求确认
      *
-     * @param reqVO
-     *            请求参数
+     * @param reqVO 请求参数
      * @return 返回结果
      */
     @Override
@@ -464,8 +447,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 数据库操作
      *
-     * @param uuids
-     *            请求参数
+     * @param uuids 请求参数
      */
     @Transactional(rollbackFor = Exception.class)
     public void excuteCancelWrite(String[] uuids) {
@@ -478,8 +460,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 取消进项税转出，批量revert抵账表已经更新的字段
      *
-     * @param ids
-     *            请求参数
+     * @param ids 请求参数
      */
     private void updatePartInvoiceForCancel(String[] ids) {
         List<BaseTDxRecordInvoice> list = baseIReceiptInvoiceService.selectByUuids(ids);
@@ -507,8 +488,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 进项税弹框显示 ，下拉框内容
      *
-     * @param map
-     *            请求参数
+     * @param map 请求参数
      * @return 返回结果
      */
     @Override
@@ -544,8 +524,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 取消已转出进项税列表
      *
-     * @param reqVO
-     *            请求参数
+     * @param reqVO 请求参数
      * @return 返回结果
      */
     @Override
@@ -609,7 +588,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
         for (BaseReceiptInvoiceView view : pageInfo.getList()) {
             BaseReceiptOutCancelRespVO vo = convertToInvoiceCancelView(view, invoiceStatusMap);
             // 序号计算 = (当前页-1)*每页条数+1
-            vo.setXh((long)((pageInfo.getPageNum() - 1) * pageInfo.getPageSize() + index));
+            vo.setXh((long) ((pageInfo.getPageNum() - 1) * pageInfo.getPageSize() + index));
             index++;
             respVos.add(vo);
         }
@@ -632,10 +611,8 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
     /**
      * 取消已转出进项税 pojo转vo
      *
-     * @param record
-     *            请求参数
-     * @param invoiceStatusMap
-     *            请求参数
+     * @param record           请求参数
+     * @param invoiceStatusMap 请求参数
      * @return 返回结果
      */
     private BaseReceiptOutCancelRespVO convertToInvoiceCancelView(BaseReceiptInvoiceView record,
@@ -652,7 +629,7 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
         // 开票日期
         vo.setInvoiceDate(DateUtils.dateToStr(record.getInvoiceDate()));
         // 发票状态
-        vo.setInvoiceStatusName(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,record.getInvoiceStatus()));
+        vo.setInvoiceStatusName(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, record.getInvoiceStatus()));
         // 购方税号
         vo.setGfsh(record.getGfTaxNo());
         // 购方名称
@@ -677,16 +654,18 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
         vo.setReason(reason.getOutReason());
         // 认证日期 string类型的长日期转为string类型的短日期
         String certDate = record.getCertDate();
-        Date date = DateUtils.strToDate(certDate);
+        Date date = new Date();
+        if (certDate != null) {
+            date = DateUtils.strToDate(certDate);
             vo.setCertDate(DateUtils.dateToStr(date));
+        }
         return vo;
     }
 
     /**
      * 批量将 进项税 明细转为已取消
      *
-     * @param uuids
-     *            请求参数
+     * @param uuids 请求参数
      */
     private void updateBatchByUuid(String[] uuids) {
         BaseTDxRecordInvoiceOut entity = new BaseTDxRecordInvoiceOut();

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -330,6 +330,7 @@ public class SDNYMainProcessController extends AbstractController {
         Date date = new Date();
 
         SAPInvoiceInfo info = new SAPInvoiceInfo();
+        String snFplx = convertToSapType(snInvoice.getInvoiceType());
         info.setZBAZT("0");
         info.setZXFSH(snInvoice.getSalesTaxNo());
         info.setZFPSZD(snInvoice.getPlace());
@@ -349,7 +350,7 @@ public class SDNYMainProcessController extends AbstractController {
         info.setZSCSJ(date);
         info.setZCYZT(snInvoice.getCheckStaus());
         info.setZYSHW(snInvoice.getCargoInformation());
-        info.setZFPLX(convertToSapType(snInvoice.getInvoiceType()));
+        info.setZFPLX(snFplx);
         info.setZQYD(snInvoice.getTransportRoute());
         info.setZCCRXM(snInvoice.getRiderName());
         info.setZKPRQ(snInvoice.getBillingDate());
@@ -393,9 +394,9 @@ public class SDNYMainProcessController extends AbstractController {
             sapInvoiceDetail.setZSM(info.getZSM());
             sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel());
             if (snInvoice.getInvoiceCode() != null) {
-                sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snInvoice.getInvoiceType());
+                sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx);
             } else {
-                sapInvoiceDetail.setZTID(snInvoice.getInvoiceNumber()  + snInvoice.getInvoiceType());
+                sapInvoiceDetail.setZTID(snInvoice.getInvoiceNumber()  + snFplx);
             }
             sapInvoiceDetailList.add(sapInvoiceDetail);
         }
@@ -459,9 +460,9 @@ public class SDNYMainProcessController extends AbstractController {
         info.setZPJLY(snInvoice.getSource());
         info.setZZWLX(snInvoice.getSeat());
         if (snInvoice.getInvoiceCode() != null) {
-            info.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber());
+            info.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx);
         } else {
-            info.setZTID(snInvoice.getInvoiceNumber());
+            info.setZTID(snInvoice.getInvoiceNumber() + snFplx);
         }
         return info;
     }

dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java

@@ -44,11 +44,11 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, CustomsRec
         // 表头
         String[] titlelist = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对",
             "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-            "入账月份", "入账状态", "凭证号", "业务单元", "入池时间","凭证号", "过账时间", "影像号", "账期"};
+            "入账月份", "入账状态", "凭证号", "业务单元", "入池时间", "过账时间", "影像号", "账期"};
         String[] titleprop = {"xh", "customsCode", "glzt", "fillInDate", "gfName", "gfTaxNo", "taxAmount",
             "yxTaxAmount", "auditStatus", "applyCheck", "checkStatus", "rzhYesorno", "bdkStatus", "rzhDate", "rzhType",
             "confirmUser", "cjzt", "createDate", "dataSources", "qsType", "qsStatus", "qsDate", "qsUser",
-            "inAccountDate", "inAccountStatus", "voucherNumber", "businessName", "createDate","voucherNo", "postingTime","imageId","accountPeriod"};
+            "inAccountDate", "inAccountStatus", "voucherNumber", "businessName", "createDate", "postingTime","imageId","accountPeriod"};
         // 需要设置返回列表标题时调用
         JSONObject json = super.setTitleList(titlelist, titleprop);
         try {