南歧nc推送

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java

@@ -558,4 +558,9 @@ public class TmsOrder implements Serializable {
     @ApiModelProperty(value = "上级组织ID")
     private Long topOrganizationId;
 
+    @ApiModelProperty(value = "单据日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date documentDate;
+
 }

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

@@ -431,10 +431,21 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                 String makerCodeNc="";
                 if(reconciliation.getOrganizationName().contains("南岐")){
                     if(result.getCode()==200){
+                        String invoiceNumber="";
+                        R<TmsInvoiceListDetailsVO> ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId());
+                        if(ajaxResult2.getCode()==200){
+                            TmsInvoiceListDetailsVO tmsInvoiceListDetailsVO= ajaxResult2.getData();
+                            if(ObjectUtil.isNotNull(tmsInvoiceListDetailsVO)) {
+                                invoiceNumber=tmsInvoiceListDetailsVO.getTmsMakeOutInvoices().get(0).getInvoiceNumber();
+                            }
+
+                        }
                         List<TmsOrder> list=result.getData();
                         if(ObjectUtil.isNotNull(list)){
                             for(TmsOrder tmsOrder:list){
-                                R<TmsTransportNote> ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber());
+                                date=tmsOrder.getDocumentDate();
+                                dateString = sdf.format(date);
+                           /*     R<TmsTransportNote> ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber());
                                 if(ajaxResult1.getCode()==200){
                                     TmsTransportNote tmsTransportNote= ajaxResult1.getData();
                                     if(ObjectUtil.isNotNull(tmsTransportNote.getIsPaper())){
@@ -446,7 +457,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                     }else{
                                         throw new ServiceException("运单还没签收， 先签收");
                                     }
-                                }
+                                }*/
                          /*   if(null==reconciliation.getSettlementPartyId()){
                                 throw new ServiceException("没有结算方，请核对");
                             }*/
@@ -483,7 +494,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                 item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight()));
                                 item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
                                 item.setDef75("T10");
-                                item.setInvoiceno("");
+                                item.setInvoiceno(invoiceNumber);
                                 ysitemList.add(item);
                             }
                             Ysbodys bodys=new Ysbodys();
@@ -503,7 +514,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             billhead.setBilldate(dateString);
                             billhead.setSyscode("0");
                             billhead.setBillno("");
-                            billhead.setDef59("");
+                            billhead.setDef59(list.get(0).getContractNo());
                             billhead.setSrc_syscode("0");
                             billhead.setBillstatus("0");
                             billhead.setBillmaker(makerCodeNc);