Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

DSWeb.DJYMQ/DS7Service.cs

@@ -2204,6 +2204,10 @@ SELECT @ps_BillNo as N'billno'";
                     if (ctnlist != null && ctnlist.Count > 0)
                         DS6Data.t_op_ctn.RemoveRange(ctnlist);
                     var newctnList = head.GetCtnList(newhead.编号);
+                    
+                    
+
+
                     if (newctnList != null && newctnList.Count > 0) {
                         DS6Data.t_op_ctn.AddRange(newctnList);
                         //logger.Debug($"新增ctn：{newhead.主提单号};{newhead.DJYID}");
@@ -2675,7 +2679,7 @@ SELECT @ps_BillNo as N'billno'";
             newhead.货物重量 = head.kgs.ToString() + "KGS";
             newhead.货物尺码 = head.cbm.ToString() + "CBM";
 
-            newhead.提箱返场状态 = "";
+            
             if (ctnList != null && ctnList.Count > 0) {
 
                 var 箱量 = 0;
@@ -2714,7 +2718,8 @@ SELECT @ps_BillNo as N'billno'";
                     //    newhead.货物尺码 += ctn.尺码.ToString() + "CBM";
                     //}
                 }
-                newhead.提箱返场状态 = $"提箱:{提箱}/{箱量} 返场:{返场}/{箱量}";
+                //20240612 改为依据返回报文内的数量直接变更
+                //newhead.提箱返场状态 = $"提箱:{提箱}/{箱量} 返场:{返场}/{箱量}";
             }
             
             
@@ -3116,6 +3121,20 @@ SELECT @ps_BillNo as N'billno'";
                 return null;
             }
 
+            public int Get箱状态数量( string 箱状态)
+            {
+                var result = 0;
+                if (StatusLogs != null && StatusLogs.Exists(x => x.Status == 箱状态))
+                {
+                    var 提箱信息 = StatusLogs.First(x => x.Status == 箱状态);
+                    if (提箱信息.Details != null )
+                    {
+                        result = 提箱信息.Details.Count();
+                    }
+                }
+                return result;
+            }
+
             class 箱型箱量item
             {
 
@@ -3194,6 +3213,16 @@ SELECT @ps_BillNo as N'billno'";
                     return result;
                 }
 
+                public int get箱量() 
+                {
+                    var result = 0;
+                    foreach (var item in 箱型箱量信息)
+                    {
+                        result += item.箱量;
+                    }
+                    return result;
+                }
+
                 #region 箱型对应
                 public int get箱型1()
                 {
@@ -3749,6 +3778,14 @@ SELECT @ps_BillNo as N'billno'";
 
                 result.小票截止时间 = Get小票截止时间();
 
+                //20240612 改为依据返回报文内的数量直接变更
+                result.提箱返场状态 = "";
+
+                var 提箱 = Get箱状态数量("提箱");
+                var 返场 = Get箱状态数量("返场");
+                var 箱量 = 箱型箱量.get箱量();
+                result.提箱返场状态 = $"提箱:{提箱}/{箱量} 返场:{返场}/{箱量}";
+
                 return result;
             }
 
@@ -3807,6 +3844,15 @@ SELECT @ps_BillNo as N'billno'";
                 return result;
             }
 
+            public static string GetCtnStatus() 
+            {
+                var result = "";
+
+
+
+                return result;
+            }
+
             public string dealGoodsinfo(string goodscode, string goodsname,string description,string hscode) {
                 var result = "";
 

DSWeb/Areas/CommMng/DAL/PubSysDAL.cs

@@ -369,9 +369,14 @@ namespace DSWeb.Areas.CommMng.DAL
 
                 var OPUserList = cdc.VW_user.Where(x => x.SHOWNAME == head.op).ToList();
 
-                if (OPUserList != null && OPUserList.Count > 0) {
+                if (OPUserList != null && OPUserList.Count > 0)
+                {
                     OPUser = OPUserList[0];
                 }
+                else {
+                    SaveLog($"大简云操作[{head.op}]在东胜系统中不存在", "", "接收大简云订舱", "错误");
+                    return;
+                }
 
                 var currentBill = DSWeb.MvcShipping.DAL.MsOpSeaeDAL.MsOpSeaeDAL.GetData($" B.DJYID={head.Id}", OPUser.USERID);
 

DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs

@@ -2817,13 +2817,13 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
 
                 if (BasicDataRefDAL.具有webconfig公司代码("FH")) {
                     strSql.Append(" union all ");
-                    strSql.Append(" select 20GP DW,0,0 ");
+                    strSql.Append(" select '20GP' DW,0,0 ");
                     strSql.Append(" union all ");
-                    strSql.Append(" select 20TK DW,0,0 ");
+                    strSql.Append(" select '20TK' DW,0,0 ");
                     strSql.Append(" union all ");
-                    strSql.Append(" select 40GP DW,0,0 ");
+                    strSql.Append(" select '40GP' DW,0,0 ");
                     strSql.Append(" union all ");
-                    strSql.Append(" select 40HC DW,0,0 ");
+                    strSql.Append(" select '40HC' DW,0,0 ");
                 }
 
                 return SetWMSINUnitData(strSql);

DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs

@@ -1985,7 +1985,12 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
                 {
                     foreach (var orderfee in orderfeeList)
                     {
-                        MsChFeeDAL.MakeNewFee(USERID, headData.gId, "车辆费用", "其它", 2, orderfee.FEENAME, orderfee.AMOUNT, "单票", 1, "","","RMB","车辆成本");
+                        //MsChFeeDAL.MakeNewFee(USERID, headData.gId, "车辆费用", "其它", 2, orderfee.FEENAME, orderfee.AMOUNT, "单票", 1, "","","RMB","车辆成本");
+
+                        var newfee = ChFeeHelper.getChFee(USERID, headData.gId, "车辆费用", 2, orderfee.FEENAME, orderfee.AMOUNT, "单次", 1, "", "","");
+                        newfee.BXGID = "任务生成";
+
+                        cdc.ch_fee.Add(newfee);
                     }
                     task.ISCOMPLETE = 1;
                     cdc.op_task.AddOrUpdate(task);
@@ -2018,6 +2023,7 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
 
                         //MsChFeeDAL.MakeNewFee(USERID, headData.gId, "车辆费用", "其它", 2, orderfee.FEENAME, orderfee.AMOUNT, "单票", 1, "");
                         var newfee = ChFeeHelper.getChFee(USERID, headData.gId, cust, 2, feename, (decimal)Fuel.JYAMOUNT, "单次", (decimal)Fuel.JYCOUNT, "", Fuel.JYTYPE+" "+Fuel.REMARK);
+                        newfee.BXGID = "任务生成";
 
                         cdc.ch_fee.Add(newfee);
                     }
@@ -2058,7 +2064,7 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
                     return result;
                 }
 
-                var feelist = cdc.ch_fee.Where(x => x.BSNO == headData.gId ).ToList();
+                var feelist = cdc.ch_fee.Where(x => x.BSNO == headData.gId && x.BXGID=="任务生成" ).ToList();
                 
                 if (feelist != null && feelist.Count > 0) {