托盘管理

Controller/SCP_BARCODE_CONTROLLER.cs

@@ -1203,7 +1203,7 @@ namespace CK.SCP.Controller
         private static string GetLastPalletsBarCode(string partcode, string batch, int lastnum)
         {
 
-            var barcode = "G.";
+            var barcode = string.Empty;
             barcode += partcode + ScpCache.Config.条码分隔符;
 
             if (ScpCache.Config.条码包含供应商简称)
@@ -1214,7 +1214,7 @@ namespace CK.SCP.Controller
             {
                 barcode += batch + ScpCache.Config.条码分隔符;
             }
-            barcode += lastnum.ToString(ScpCache.Config.ÌõÂëÐòÁкŸñʽ);
+            barcode += lastnum.ToString(ScpCache.Config.ÍÐÂëÐòÁкŸñʽ);
             return barcode;
         }
         private static string GetLastSmallBarCode(string partcode, string batch, int lastnum)

Controller/SCP_V_TA_VEND_PART_CONTROLLER.cs

@@ -71,7 +71,14 @@ namespace CK.SCP.Controller
                     {
                         q = q.Where(p => p.PartDesc.Contains(p_entity.PartDesc));
                     }
-                
+                    if (p_entity.UserInAddress != null && p_entity.UserInAddress.Count > 0)
+                    {
+                        q = q.Where(p => p_entity.UserInAddress.Contains(p.Site));
+                    }
+                    if (p_entity.UserInVendIds != null && p_entity.UserInVendIds.Count > 0)
+                    {
+                        q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId));
+                    }
                     _ret.State = ReturnStatus.Succeed;
                     _ret.Result = q;
 

Models/ScpCache.cs

@@ -313,7 +313,8 @@ namespace CK.SCP.Models
         public bool 条码包含供应商简称 { get; set; } = false;
  
         public string 二维码格式 { get; set; } = "1";
-        public string 条码序列号格式 { get; set; } = "000000";
+        public string 条码序列号格式 { get; set; } = "000000"; 
+        public string 托码序列号格式 { get; set; } = "700000";
         public string 小包装条码序列号格式 { get; set; } = "600000";
         public bool 负数发票 { get; set; } = false;
     }

Models/ScpEntity/V_TA_VEND_PART.cs

@@ -36,5 +36,11 @@ namespace CK.SCP.Models.ScpEntity
         public string ProjectId { get; set; }
         [NotMapped]
         public string PartDesc { get; set; }
+        [NotMapped]
+        public List<string> UserInAddress { set; get; }
+
+        [NotMapped]
+        public List<string> UserInVendIds { set; get; }
+
     }
 }

SCP/Views/BasicData/SCP_TA_VEND_PART.aspx.cs

@@ -44,6 +44,11 @@ namespace SCP.Views.BasicData
             _entity.VendId = txtVendId.Text;
             _entity.PartCode = txtPartCode.Text;
             _entity.ProjectId = txtVendId.Text;
+            if (!CurrentUser.RoleList.Contains("管理员"))
+            {
+                _entity.UserInAddress = CurrentUser.FactoryList;
+                _entity.UserInVendIds = CurrentUser.VenderList;
+            }
             SCP_V_TA_VEND_PART_CONTROLLER.Get_V_TA_VEND_PART_List(_entity, (rs) => {
                 if (rs.State == ReturnStatus.Succeed)
                 {