1

HH.YiDaSyncNC/DataSync/KP_HK_SyncService.cs

@@ -72,7 +72,7 @@ namespace HH.YiDaSyncNC.DataSync
             LogHelper.WriteLog(JsonConvert.SerializeObject(idList.Count), "idList");
 
             #region 获取NC中选项数据的Id
-            var so_saleorder_bList = _db_nc.Queryable<so_saleorder_b>().Where(w => w.vbdef10 != "~").ToList();
+            var so_saleorder_bList = _db_nc.Queryable<so_saleorder_b>().Where(w => w.vbdef10 != "~" && w.dr == 0).ToList();
             var ar_gatheritemList = _db_nc.Queryable<ar_gatheritem>().Where(w => so_saleorder_bList.Select(s => s.csaleorderbid).ToList().Contains(w.src_itemid)).ToList();
             var ar_gatherbillList = _db_nc.Queryable<ar_gatherbill>().Where(w => ar_gatheritemList.Select(s => s.pk_gatherbill).ToList().Contains(w.pk_gatherbill) && w.billstatus == "1").Select(s => s.pk_gatherbill).ToList();
             #endregion
@@ -98,7 +98,7 @@ namespace HH.YiDaSyncNC.DataSync
                     continue;
                 }
 
-                LogHelper.WriteLog("", "【序号 " + i + " / "+ idList.Count + "】" + item + " 开始回写");
+                LogHelper.WriteLog("", "【序号 " + i + " / " + idList.Count + "】" + item + " 开始回写");
                 i++;
 
                 var updateData = new Dictionary<string, string>();

HH.YiDaSyncNC/DataSync/KP_SyncService.cs

@@ -236,8 +236,12 @@ namespace HH.YiDaSyncNC.DataSync
                     {
                         var detailObjList1 = (List<object>)ydDataSource["tableField_lvc9x4vt"]; // 大业主开票明细
 
-                        if (detailObjList1.Count() > 0 && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList1.FirstOrDefault())["textField_lvdojfup"].ToString()))
+                        LogHelper.WriteLog(JsonConvert.SerializeObject(detailObjList1.FirstOrDefault()), "大业主0");
+
+                        if (detailObjList1.Count() > 0 && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList1.FirstOrDefault())["textField_lvdojfup"].ToString())
+                            && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList1.FirstOrDefault())["textField_lvynhq7q"].ToString()))
                         {
+                            LogHelper.WriteLog(JsonConvert.SerializeObject(dataSource), "大业主1");
 
                             foreach (var objItem in detailObjList1)
                             {
@@ -290,7 +294,7 @@ namespace HH.YiDaSyncNC.DataSync
                                 detailItem.价税合计 = jshj.ToString();
 
                                 detailItem.换算率 = "1.00/1.00";
-                                detailItem.税码 = ydDataSource["selectField_lvc9x4vp"].ToString() == "增值税普票" ? "CN11"  :  "CN04"; // 税率码 
+                                detailItem.税码 = ydDataSource["selectField_lvc9x4vp"].ToString() == "增值税普票" ? "CN11" : "CN04"; // 税率码 
                                 detailItem.税率 = Convert.ToDecimal(((Dictionary<string, object>)objItem)["numberField_lvd8pp2x"].ToString()).ToString(); // 税率
 
                                 detailItem.开票内容 = ((Dictionary<string, object>)objItem)["textField_lvd8pp2t"].ToString();
@@ -310,8 +314,13 @@ namespace HH.YiDaSyncNC.DataSync
                     var detailObjList2 = (List<object>)ydDataSource["tableField_lvd8pp44"]; // 工程订单开票明细
                     if (ydDataSource.FirstOrDefault(f => f.Key == "tableField_lvd8pp44").Value != null)
                     {
-                        if (detailObjList2.Count() > 0 && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList2.FirstOrDefault())["textField_lvdojfur"].ToString()))
+                        LogHelper.WriteLog(JsonConvert.SerializeObject(detailObjList2.FirstOrDefault()), "gc0");
+
+                        if (detailObjList2.Count() > 0 && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList2.FirstOrDefault())["textField_lvdojfur"].ToString())
+                            && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList2.FirstOrDefault())["numberField_lvd8pp3y_value"].ToString()))
                         {
+                            LogHelper.WriteLog(JsonConvert.SerializeObject(detailObjList2.FirstOrDefault()), "gc1");
+
                             dataSource.项目 = "PM99001";
 
                             foreach (var objItem in detailObjList2)
@@ -385,8 +394,12 @@ namespace HH.YiDaSyncNC.DataSync
                     var detailObjList3 = (List<object>)ydDataSource["tableField_lvdnme13"]; // 小业主
                     if (ydDataSource.FirstOrDefault(f => f.Key == "tableField_lvdnme13").Value != null)
                     {
-                        if (detailObjList3.Count() > 0 && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList3.FirstOrDefault())["textField_lvdojfus"].ToString()))
+                        LogHelper.WriteLog(JsonConvert.SerializeObject(detailObjList3.FirstOrDefault()), "x0");
+
+                        if (detailObjList3.Count() > 0 && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList3.FirstOrDefault())["textField_lvdojfus"].ToString())
+                             && !string.IsNullOrWhiteSpace(((Dictionary<string, object>)detailObjList3.FirstOrDefault())["numberField_lvdnme0w_value"].ToString()))
                         {
+                            LogHelper.WriteLog(JsonConvert.SerializeObject(detailObjList3.FirstOrDefault()), "x1");
 
                             foreach (var objItem in detailObjList3)
                             {

HH.YiDaSyncNC/DataSync/ZC_SyncService.cs

@@ -122,7 +122,7 @@ namespace HH.YiDaSyncNC.DataSync
                 //data.transi_type = "H1-00";
                 //data.ts = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
-                var a = ydDataSource.FirstOrDefault(f => f.Key == "textField_lydsc49c").Value;
+                //var a = ydDataSource.FirstOrDefault(f => f.Key == "textField_lydsc49c").Value;
 
                 //if (ydDataSource["textField_lydsc49c"].ToString().Contains("PM"))
                 //{
@@ -145,7 +145,7 @@ namespace HH.YiDaSyncNC.DataSync
 
                 ncResData.bSuccess = false;
                 ncResData.ncNo = "";
-                ncResData.log = "同步失败【账簿不是最小未结账月！】";
+                ncResData.log = "同步失败【使用部门为空！】";
 
                 var ydRes = _dingTalkService.UpdateFormDataSyncDataById(ncResData, item);
 

HH.YiDaSyncNC/Models/FK_FKD_SyncServiceModel.cs

@@ -143,7 +143,7 @@ namespace HH.YiDaSyncNC.Models
                             new XElement("local_notax_de",itemData.价税合计),
 
                             new XElement("payaccount",item.付款银行账户),
-                            new XElement("invoiceno",item.发票号.Substring(0,40)),
+                            new XElement("invoiceno",item.发票号.Length<=40?item.发票号:item.发票号.Substring(0,40)),
 
                             new XElement("def12",itemData.税额),
                             new XElement("def11",itemData.无税金额),

HH.YiDaSyncNC/Models/FK_XZ_SyncServiceModel.cs

@@ -147,7 +147,7 @@ namespace HH.YiDaSyncNC.Models
                             new XElement("local_notax_de",itemData.价税合计),
 
                             new XElement("payaccount",item.付款银行账户),
-                            new XElement("invoiceno",item.发票号.Substring(0,40)),
+                            new XElement("invoiceno",item.发票号.Length<=40?item.发票号:item.发票号.Substring(0,40)),
 
                             new XElement("def12",itemData.税额),
                             new XElement("def11",itemData.无税金额),

HH.YiDaSyncNC/Models/FK_YF_SyncServiceModel.cs

@@ -143,7 +143,7 @@ namespace HH.YiDaSyncNC.Models
                             new XElement("local_notax_de",itemData.价税合计),
 
                             new XElement("payaccount",item.付款银行账户),
-                            new XElement("invoiceno",item.发票号.Substring(0,40)),
+                            new XElement("invoiceno",item.发票号.Length<=40?item.发票号:item.发票号.Substring(0,40)),
 
                             new XElement("def12",itemData.税额),
                             new XElement("def11",itemData.无税金额),

HH.YiDaSyncNC/Program.cs

@@ -83,8 +83,8 @@ namespace HH.YiDaSyncNC
                 #endregion
 
                 #region 开票
-                //KP_SyncService kp_SyncService = new KP_SyncService(_Static_AppType, _Static_SystemToken, _Static_UserId, _Static_FormId_KP, db, db_nc, _Static_NCApiUrl);
-                //kp_SyncService.DataSync();
+                KP_SyncService kp_SyncService = new KP_SyncService(_Static_AppType, _Static_SystemToken, _Static_UserId, _Static_FormId_KP, db, db_nc, _Static_NCApiUrl);
+                kp_SyncService.DataSync();
 
                 //// 退票
                 //KP_TP_SyncService kp_tp_SyncService = new KP_TP_SyncService(_Static_AppType, _Static_SystemToken, _Static_UserId, _Static_FormId_KP, db, db_nc, _Static_NCApiUrl);
@@ -121,7 +121,7 @@ namespace HH.YiDaSyncNC
                 //FKYF_SyncService fkyf_SyncService = new FKYF_SyncService(_Static_AppType, _Static_SystemToken, _Static_UserId, _Static_FormId_FK, db, db_nc, _Static_NCApiUrl);
                 //fkyf_SyncService.DataSync();
 
-                // 付款单（预付）
+                // 日常费用付款（预付）
                 //FK_YF_SyncService fk_yf_SyncService = new FK_YF_SyncService(_Static_AppType, _Static_SystemToken, _Static_UserId, _Static_FormId_FK, db, db_nc, _Static_NCApiUrl);
                 //fk_yf_SyncService.DataSync();
 
@@ -136,18 +136,18 @@ namespace HH.YiDaSyncNC
 
                 #region 薪资付款
                 // 应付
-                FK_XZ_SyncService fk_xz_SyncService = new FK_XZ_SyncService(_Static_AppType, _Static_SystemToken, _Static_UserId, _Static_FormId_FK, db, db_nc, _Static_NCApiUrl);
-                fk_xz_SyncService.DataSync_公积金();
-                fk_xz_SyncService.DataSync_社保();
-                fk_xz_SyncService.DataSync_薪资();
-                fk_xz_SyncService.DataSync_发放人力外包工资();
+                //FK_XZ_SyncService fk_xz_SyncService = new FK_XZ_SyncService(_Static_AppType, _Static_SystemToken, _Static_UserId, _Static_FormId_FK, db, db_nc, _Static_NCApiUrl);
+                //fk_xz_SyncService.DataSync_公积金();
+                //fk_xz_SyncService.DataSync_社保();
+                //fk_xz_SyncService.DataSync_薪资();
+                //fk_xz_SyncService.DataSync_发放人力外包工资();
 
-                fk_xz_SyncService.DataSync_业务外包付款();
+                //fk_xz_SyncService.DataSync_业务外包付款();
 
-                fk_xz_SyncService.DataSync_公积金_预付();
-                fk_xz_SyncService.DataSync_社保_预付();
-                fk_xz_SyncService.DataSync_薪资_预付();
-                fk_xz_SyncService.DataSync_发放人力外包工资_预付();
+                //fk_xz_SyncService.DataSync_公积金_预付();
+                //fk_xz_SyncService.DataSync_社保_预付();
+                //fk_xz_SyncService.DataSync_薪资_预付();
+                //fk_xz_SyncService.DataSync_发放人力外包工资_预付();
 
                 #endregion
 
@@ -170,11 +170,6 @@ namespace HH.YiDaSyncNC
                 //kp_hk_SyncService.DataSync();
                 #endregion
 
-                #region 开票档案回款回写
-                //KP_HK_SyncService kp_hk_SyncService = new KP_HK_SyncService(_Static_AppType, _Static_SystemToken, _Static_UserId, _Static_FormId_KP, db, db_nc, _Static_NCApiUrl);
-                //kp_hk_SyncService.DataSync();
-                #endregion
-
                 Environment.Exit(0);
             }
             catch (Exception ex)