1

web/djy.Service/Ams/AmsService.cs

@@ -468,7 +468,14 @@ namespace djy.Service.Ams
                             masterBillInfo.shippingNo = null;
                             masterBillInfo.shipCompany = cARRIERIDList.Where(x => x.Code == master.CARRIERID).Select(x => x.MapCode).FirstOrDefault();
                             masterBillInfo.vessel = master.VESSEL;
-                            masterBillInfo.voyage = master.VOYNO;
+                            if (master.VOYNO.TrimAll().Length > 4)
+                            {
+                                masterBillInfo.voyage = master.VOYNO.TrimAll().Substring(0, 5);
+                            }
+                            else {
+                                masterBillInfo.voyage = master.VOYNO;
+                            }
+                         
                             masterBillInfo.requesterDea = sysOptionConfig.Webconfig.requesterDea;
                             masterBillInfo.consignmentType = master.ConsignmentType;
                             masterBillInfo.loadHarbour = master.LoadingPort;
@@ -598,7 +605,16 @@ namespace djy.Service.Ams
                             masterBillInfo.shippingNo = null;
                             masterBillInfo.shipCompany = cARRIERIDList.Where(x => x.Code == master.CARRIERID).Select(x => x.MapCode).FirstOrDefault();
                             masterBillInfo.vessel = master.VESSEL;
-                            masterBillInfo.voyage = master.VOYNO;
+                            if (master.VOYNO.TrimAll().Length > 4)
+                            {
+                                masterBillInfo.voyage = master.VOYNO.TrimAll().Substring(0, 5);
+                            }
+                            else
+                            {
+                                masterBillInfo.voyage = master.VOYNO;
+                            }
+
+                          
                             masterBillInfo.requesterDea = sysOptionConfig.Webconfig.requesterDea;
                             masterBillInfo.consignmentType = master.ConsignmentType;
                             masterBillInfo.loadHarbour = master.LoadingPort;
@@ -823,6 +839,12 @@ namespace djy.Service.Ams
                             JObject rlt = JObject.Parse(gethtml);
                             var code = rlt.GetValue("code").ToString();
                             var msg = rlt.GetValue("msg").ToString();
+                            if (msg== "验签失败") {
+
+                                req.Code = 200;
+                                req.Message = "验签失败";
+                                return req;
+                            }
                             var data = rlt.GetValue("data").ToString();
                             JObject drlt = JObject.Parse(data);
                             var result = drlt.GetValue("result").ToString();

web/djy.Service/ISF/IsfService.cs

@@ -205,7 +205,7 @@ namespace djy.Service.Isf
                     Where(x => x.UserID == user.GID).
                     WhereIf(CompanyType != null, x => x.CompanyType == CompanyType).
                     WhereIf(InFoType != null, x => x.InFoType == InFoType).
-                    WhereIf(TemPlateName != null, x => TemPlateName.Contains(x.TemPlateName)).
+                    WhereIf(TemPlateName != null, x => x.TemPlateName.Contains(TemPlateName)).
                     ToList();
                 return List;
             }