修改提单管理

ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueManageBaseDto.cs

@@ -436,5 +436,20 @@ namespace DS.WMS.Core.Op.Dtos
         /// 是否扣单
         /// </summary>
         public bool IsBLSeize { get; set; }
+
+        /// <summary>
+        /// 委托编号
+        /// </summary>
+        public string CustomerNo { get; set; }
+
+        /// <summary>
+        /// 操作员
+        /// </summary>
+        public long OperatorId { get; set; }
+
+        /// <summary>
+        /// 操作员名称
+        /// </summary>
+        public string OperatorName { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueMangeQueryExtDto.cs

@@ -96,5 +96,10 @@ namespace DS.WMS.Core.Op.Dtos
         /// </summary>
         public string BusinessType { get; set; }
 
+        /// <summary>
+        /// 操作ID
+        /// </summary>
+        public Nullable<long> Operator { get; set; }
+
     }
 }

ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs

@@ -154,6 +154,9 @@ namespace DS.WMS.Core.Op.Method
                     IssuePlaceCode = a.IssuePlaceCode,
                     StlDate = a.StlDate,
                     StlName = a.StlName,
+                    CustomerNo = a.CustomerNo,
+                    OperatorId = a.OperatorId,
+                    OperatorName = a.OperatorName
                 });
 
             var q2 = q1.InnerJoin<SeaExportBillManage>((l, r) => l.Id == r.BusinessId)
@@ -189,6 +192,9 @@ namespace DS.WMS.Core.Op.Method
                     IssuePlaceCode = "",
                     StlDate = l.StlDate,
                     StlName = l.StlName,
+                    CustomerNo = l.CustomerNo,
+                    OperatorId = l.OperatorId,
+                    OperatorName = l.OperatorName
                 });
 
             var queryBase = tenantDb.UnionAll(q1, q2);
@@ -214,7 +220,8 @@ namespace DS.WMS.Core.Op.Method
 
                 .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode)
                     && otherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLQuery.ToString(), StringComparison.OrdinalIgnoreCase) 
-                    && !string.IsNullOrWhiteSpace(otherQueryCondition.BlNo), (l, r) => l.MBLNO.Contains(otherQueryCondition.BlNo))
+                    && !string.IsNullOrWhiteSpace(otherQueryCondition.BlNo), (l, r) => l.MBLNO.Contains(otherQueryCondition.BlNo) || l.HBLNO.Contains(otherQueryCondition.BlNo) 
+                    || l.CustomerNo.Contains(otherQueryCondition.BlNo))
 
                 .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode)
                     && otherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLQuery.ToString(), StringComparison.OrdinalIgnoreCase)
@@ -244,8 +251,10 @@ namespace DS.WMS.Core.Op.Method
                     && otherQueryCondition.CheckOutDateStart.HasValue, (l, r) => r.CheckOutDate >= otherQueryCondition.CheckOutDateStart)
                 .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode)
                     && otherQueryCondition.CheckOutDateEnd.HasValue, (l, r) => r.CheckOutDate < otherQueryCondition.CheckOutDateEnd)
+
                 .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode)
-                    && otherQueryCondition.Doc.HasValue, (l, r) => l.Doc  == otherQueryCondition.Doc.Value)
+                    && otherQueryCondition.Operator.HasValue, (l, r) => l.OperatorId  == otherQueryCondition.Operator.Value)
+
                 .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode)
                     && !string.IsNullOrWhiteSpace(otherQueryCondition.Status)
                     && otherQueryCondition.Status.Equals(BLIssueStatusEnum.UnCheckIn.ToString(), StringComparison.OrdinalIgnoreCase), 
@@ -313,6 +322,9 @@ namespace DS.WMS.Core.Op.Method
                         currBl.StlName = data.order.StlName;
                         currBl.ETD = data.order.ETD;
                         currBl.ETA = data.order.ETA;
+                        currBl.OperatorId = data.order.OperatorId;
+                        currBl.OperatorName = data.order.OperatorName;
+                        currBl.CustomerNo = data.order.CustomerNo;
 
                         resultList.Add(currBl);
 
@@ -352,6 +364,9 @@ namespace DS.WMS.Core.Op.Method
                         MasterHBillName = data.order.BillType == "M" ? "主单" : "分单",
                         ETD = data.order.ETD,
                         ETA = data.order.ETA,
+                        OperatorId = data.order.OperatorId,
+                        OperatorName = data.order.OperatorName,
+                        CustomerNo = data.order.CustomerNo,
                     };
 
                     if (data.order.ETD.HasValue && data.order.StlDate.HasValue)
@@ -471,6 +486,14 @@ namespace DS.WMS.Core.Op.Method
                     whereList.Remove(t);
                 }
 
+                if (whereList.Any(t => ((ConditionalModel)t).FieldName.Equals("operator", StringComparison.OrdinalIgnoreCase)))
+                {
+                    var t = whereList.FirstOrDefault(t => ((ConditionalModel)t).FieldName.Equals("operator", StringComparison.OrdinalIgnoreCase));
+                    queryExt.Operator = long.Parse(((ConditionalModel)t).FieldValue);
+
+                    whereList.Remove(t);
+                }
+
                 if (whereList.Any(t => ((ConditionalModel)t).FieldName.Equals("etd", StringComparison.OrdinalIgnoreCase)))
                 {
                     var curList = whereList.Where(t => ((ConditionalModel)t).FieldName.Equals("etd", StringComparison.OrdinalIgnoreCase)).ToList();
@@ -2796,5 +2819,20 @@ namespace DS.WMS.Core.Op.Method
         /// 结算方式
         /// </summary>
         public string StlName { get; set; }
+
+        /// <summary>
+        /// 委托编号
+        /// </summary>
+        public string CustomerNo { get; set; }
+
+        /// <summary>
+        /// 操作员
+        /// </summary>
+        public long OperatorId { get; set; }
+
+        /// <summary>
+        /// 操作员名称
+        /// </summary>
+        public string OperatorName { get; set; }
     }
 }