服务码8位，推送恒洁中台

wwwroot/App_Code/SyncZhongTai.cs

@@ -172,7 +172,7 @@ public class SyncZhongTai
                            GDD.MATERIALCODE,
                            FP.FIRSTFHDATE,
                            FP.FIRSTFHNO,
-                           FP.BARCODE
+                           FP.BARCODE, gdd.servicecode
                       FROM TP_PM_FINISHEDPRODUCT FP
                      INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
                         ON GDD.GROUTINGDAILYDETAILID = FP.GROUTINGDAILYDETAILID
@@ -193,7 +193,7 @@ public class SyncZhongTai
                                    GDD.MATERIALCODE,
                                    FP.FIRSTFHDATE,
                                    FP.FIRSTFHNO,
-                                   FP.BARCODE
+                                   FP.BARCODE, gdd.servicecode
                               FROM TP_PM_FINISHEDPRODUCT FP
                              INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
                                 ON GDD.GROUTINGDAILYDETAILID = FP.GROUTINGDAILYDETAILID
@@ -255,21 +255,35 @@ public class SyncZhongTai
                 JArray jArray = new JArray();
                 foreach (DataRow row in dtSyncFinishProduct.Rows)
                 {
-                    // 当前日期与2022-01-01的时间间隔，转化为36进制数，0~9+A~Z，不满3位左边补0
-                    DateTime.TryParse(row["FIRSTFHDATE"].ToString(), out firstfhdate);
-                    differDays36 = Scale36.ToCurr36(firstfhdate.Subtract(_startDate).Days).PadLeft(3, '0');
-
-                    // 流水（4位，36进制数流水，0~9+A~Z）
-                    int.TryParse(row["FIRSTFHNO"] + "", out firstFhNo);
-                    firstFhNo36 = Scale36.ToCurr36(firstFhNo).PadLeft(4, '0');
-
-                    jObject = new JObject();
-                    jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
-                    jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
-                    jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + row["OUTLABELCODE"]));
-                    jObject.Add(new JProperty("serviceCode", _ss_gcdm + differDays36 + firstFhNo36));
-                    jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
-                    jArray.Add(jObject);
+                    string servicecode = row["servicecode"] + "";
+                    if (string.IsNullOrWhiteSpace(servicecode))
+                    {
+                        // 当前日期与2022-01-01的时间间隔，转化为36进制数，0~9+A~Z，不满3位左边补0
+                        DateTime.TryParse(row["FIRSTFHDATE"].ToString(), out firstfhdate);
+                        differDays36 = Scale36.ToCurr36(firstfhdate.Subtract(_startDate).Days).PadLeft(3, '0');
+
+                        // 流水（4位，36进制数流水，0~9+A~Z）
+                        int.TryParse(row["FIRSTFHNO"] + "", out firstFhNo);
+                        firstFhNo36 = Scale36.ToCurr36(firstFhNo).PadLeft(4, '0');
+
+                        jObject = new JObject();
+                        jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
+                        jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("serviceCode", _ss_gcdm + differDays36 + firstFhNo36));
+                        jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
+                        jArray.Add(jObject);
+                    }
+                    else
+                    {
+                        jObject = new JObject();
+                        jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
+                        jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + servicecode));
+                        jObject.Add(new JProperty("serviceCode", servicecode));
+                        jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
+                        jArray.Add(jObject);
+                    }
                 }
 
                 string jsonPara = JsonConvert.SerializeObject(jArray);
@@ -477,7 +491,7 @@ public class SyncZhongTai
                            GDD.MATERIALCODE,
                            FP.FIRSTFHDATE,
                            FP.FIRSTFHNO,
-                           FP.BARCODE
+                           FP.BARCODE, gdd.servicecode
                       FROM TP_PM_FINISHEDPRODUCT FP
                      INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
                         ON GDD.GROUTINGDAILYDETAILID = FP.GROUTINGDAILYDETAILID
@@ -498,7 +512,7 @@ public class SyncZhongTai
                                    GDD.MATERIALCODE,
                                    FP.FIRSTFHDATE,
                                    FP.FIRSTFHNO,
-                                   FP.BARCODE
+                                   FP.BARCODE, gdd.servicecode
                               FROM TP_PM_FINISHEDPRODUCT FP
                              INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
                                 ON GDD.GROUTINGDAILYDETAILID = FP.GROUTINGDAILYDETAILID
@@ -560,21 +574,35 @@ public class SyncZhongTai
                 JArray jArray = new JArray();
                 foreach (DataRow row in dtSyncFinishProduct.Rows)
                 {
-                    // 当前日期与2022-01-01的时间间隔，转化为36进制数，0~9+A~Z，不满3位左边补0
-                    DateTime.TryParse(row["FIRSTFHDATE"].ToString(), out firstfhdate);
-                    differDays36 = Scale36.ToCurr36(firstfhdate.Subtract(_startDate).Days).PadLeft(3, '0');
-
-                    // 流水（4位，36进制数流水，0~9+A~Z）
-                    int.TryParse(row["FIRSTFHNO"] + "", out firstFhNo);
-                    firstFhNo36 = Scale36.ToCurr36(firstFhNo).PadLeft(4, '0');
-
-                    jObject = new JObject();
-                    jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
-                    jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
-                    jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + row["OUTLABELCODE"]));
-                    jObject.Add(new JProperty("serviceCode", _ft_gcdm + differDays36 + firstFhNo36));
-                    jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
-                    jArray.Add(jObject);
+                    string servicecode = row["servicecode"] + "";
+                    if (string.IsNullOrWhiteSpace(servicecode))
+                    {
+                        // 当前日期与2022-01-01的时间间隔，转化为36进制数，0~9+A~Z，不满3位左边补0
+                        DateTime.TryParse(row["FIRSTFHDATE"].ToString(), out firstfhdate);
+                        differDays36 = Scale36.ToCurr36(firstfhdate.Subtract(_startDate).Days).PadLeft(3, '0');
+
+                        // 流水（4位，36进制数流水，0~9+A~Z）
+                        int.TryParse(row["FIRSTFHNO"] + "", out firstFhNo);
+                        firstFhNo36 = Scale36.ToCurr36(firstFhNo).PadLeft(4, '0');
+
+                        jObject = new JObject();
+                        jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
+                        jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("serviceCode", _ft_gcdm + differDays36 + firstFhNo36));
+                        jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
+                        jArray.Add(jObject);
+                    }
+                    else
+                    {
+                        jObject = new JObject();
+                        jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
+                        jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + servicecode));
+                        jObject.Add(new JProperty("serviceCode", servicecode));
+                        jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
+                        jArray.Add(jObject);
+                    }
                 }
 
                 string jsonPara = JsonConvert.SerializeObject(jArray);
@@ -782,7 +810,7 @@ public class SyncZhongTai
                            GDD.MATERIALCODE,
                            FP.FIRSTFHDATE,
                            FP.FIRSTFHNO,
-                           FP.BARCODE
+                           FP.BARCODE, gdd.servicecode
                       FROM TP_PM_FINISHEDPRODUCT FP
                      INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
                         ON GDD.GROUTINGDAILYDETAILID = FP.GROUTINGDAILYDETAILID
@@ -803,7 +831,7 @@ public class SyncZhongTai
                                    GDD.MATERIALCODE,
                                    FP.FIRSTFHDATE,
                                    FP.FIRSTFHNO,
-                                   FP.BARCODE
+                                   FP.BARCODE, gdd.servicecode
                               FROM TP_PM_FINISHEDPRODUCT FP
                              INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
                                 ON GDD.GROUTINGDAILYDETAILID = FP.GROUTINGDAILYDETAILID
@@ -865,21 +893,35 @@ public class SyncZhongTai
                 JArray jArray = new JArray();
                 foreach (DataRow row in dtSyncFinishProduct.Rows)
                 {
-                    // 当前日期与2022-01-01的时间间隔，转化为36进制数，0~9+A~Z，不满3位左边补0
-                    DateTime.TryParse(row["FIRSTFHDATE"].ToString(), out firstfhdate);
-                    differDays36 = Scale36.ToCurr36(firstfhdate.Subtract(_startDate).Days).PadLeft(3, '0');
-
-                    // 流水（4位，36进制数流水，0~9+A~Z）
-                    int.TryParse(row["FIRSTFHNO"] + "", out firstFhNo);
-                    firstFhNo36 = Scale36.ToCurr36(firstFhNo).PadLeft(4, '0');
-
-                    jObject = new JObject();
-                    jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
-                    jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
-                    jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + row["OUTLABELCODE"]));
-                    jObject.Add(new JProperty("serviceCode", _gt_gcdm + differDays36 + firstFhNo36));
-                    jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
-                    jArray.Add(jObject);
+                    string servicecode = row["servicecode"] + "";
+                    if (string.IsNullOrWhiteSpace(servicecode))
+                    {
+                        // 当前日期与2022-01-01的时间间隔，转化为36进制数，0~9+A~Z，不满3位左边补0
+                        DateTime.TryParse(row["FIRSTFHDATE"].ToString(), out firstfhdate);
+                        differDays36 = Scale36.ToCurr36(firstfhdate.Subtract(_startDate).Days).PadLeft(3, '0');
+
+                        // 流水（4位，36进制数流水，0~9+A~Z）
+                        int.TryParse(row["FIRSTFHNO"] + "", out firstFhNo);
+                        firstFhNo36 = Scale36.ToCurr36(firstFhNo).PadLeft(4, '0');
+
+                        jObject = new JObject();
+                        jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
+                        jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("serviceCode", _gt_gcdm + differDays36 + firstFhNo36));
+                        jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
+                        jArray.Add(jObject);
+                    }
+                    else
+                    {
+                        jObject = new JObject();
+                        jObject.Add(new JProperty("barcode", row["OUTLABELCODE"]));
+                        jObject.Add(new JProperty("productCode", row["MATERIALCODE"]));
+                        jObject.Add(new JProperty("newUniqueCode", "https://hap.hegii.com/jump?state=productInfo-" + servicecode));
+                        jObject.Add(new JProperty("serviceCode", servicecode));
+                        jObject.Add(new JProperty("codeUuid", row["OUTLABELCODE"]));
+                        jArray.Add(jObject);
+                    }
                 }
 
                 string jsonPara = JsonConvert.SerializeObject(jArray);