。

Admin.Core.Api/Admin.Core.Model.xml

@@ -3181,6 +3181,11 @@
             打印类型：箱壳、内胆
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.PrintBarCode.ProductLineCode">
+            <summary>
+            产线编号
+            </summary>
+        </member>
         <member name="T:Admin.Core.Model.PrintSuppleMentBarCode">
             <summary>
             补打二维码

Admin.Core.Model/Model_New/PrintBarCode.cs

@@ -53,5 +53,11 @@ namespace Admin.Core.Model
         /// </summary>
         [SugarColumn(ColumnName = "PRINT_BARTYPE")]
         public int PrintBarType { get; set; }
+
+        /// <summary>
+        /// 产线编号
+        /// </summary>
+        [SugarColumn(ColumnName = "PRODUCT_LINE_CODE")]
+        public string ProductLineCode { get; set; }
     }
 }

Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs

@@ -18,11 +18,22 @@ namespace Admin.Core.Repository
 
         public async Task<List<BaseOrderInfoView>> GetOrderInfoData()
         {
-            string sql = @$" select DISTINCT o.* from (
+            //string sql = @$" select DISTINCT o.* from (
-                    select r.*  from (select r.*,BP.PRODUCT_LINE_NAME  from BASE_ORDERINFO  r  LEFT JOIN BASE_PRODUCTLINE BP on r.WORK_CENTER_CODE = BP.WORK_CENTER_CODE)  r
+            //        select r.*  from (select r.*,BP.PRODUCT_LINE_NAME  from BASE_ORDERINFO  r  LEFT JOIN BASE_PRODUCTLINE BP on r.WORK_CENTER_CODE = BP.WORK_CENTER_CODE)  r
-                    left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE  where  MATERIAL_SUBCLASS='100') o  left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID 
+            //        left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE  where  MATERIAL_SUBCLASS='100') o  left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID 
-                    WHERE SUBSTR(o.ORDER_STATUS, 0, 4)!='CLSD' and SUBSTR(o.ORDER_STATUS, 0, 4)!='TECO' and PRODUCT_LINE_NAME!='一线'
+            //        WHERE SUBSTR(o.ORDER_STATUS, 0, 4)!='CLSD' and SUBSTR(o.ORDER_STATUS, 0, 4)!='TECO' and PRODUCT_LINE_NAME!='一线'
-            ";
+            //";
+
+            string sql = @$"WITH T AS(
+                         select DISTINCT o.* from (select r.*  from (select r.*,BP.PRODUCT_LINE_NAME  from BASE_ORDERINFO  r  LEFT JOIN BASE_PRODUCTLINE BP on r.WORK_CENTER_CODE = BP.WORK_CENTER_CODE)  r
+                         left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE  where  MATERIAL_SUBCLASS='100') o  left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID
+                         WHERE SUBSTR(o.ORDER_STATUS, 0, 4)!='CLSD' and SUBSTR(o.ORDER_STATUS, 0, 4)!='TECO' and PRODUCT_LINE_NAME!='一线'
+                    ),
+                    K AS(
+                        select *from C##AUCMA_SCADA.PRINT_BARCODE
+                    )
+                    SELECT t.*,(select COUNT(*) from K WHERE PRINT_BARTYPE=1 and ORDER_CODE=t.ORDER_CODE) BOXAMOUNT,(select COUNT(*) from K WHERE PRINT_BARTYPE=2 and ORDER_CODE=t.ORDER_CODE) LINERAMOUNT FROM T t";
+
 
             return await Db.CopyNew().Ado.SqlQueryAsync<BaseOrderInfoView>(sql);
         }

Admin.Core.Service/Service_New/BaseOrderInfoServices.cs

@@ -70,7 +70,8 @@ namespace Admin.Core.Service
             List<PrintPlanInfoView> list = new List<PrintPlanInfoView>();
             List<BaseBomInfo> baseBomList = await _baseBomInfoRepository.QueryAsync();
  
-            List<BaseOrderInfoView> orderList = await this.GetAllOrderInfoData();
+           // List<BaseOrderInfoView> orderList = await this.GetAllOrderInfoData();
+            List<BaseOrderInfoView> orderList = await this.GetOrderInfoData();
           
             if (orderList == null) return null;
             orderList.ForEach(bb =>

Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs

@@ -2,6 +2,7 @@
 using Admin.Core.IService;
 using Admin.Core.Model;
 using Admin.Core.Model.ViewModels;
+using Admin.Core.Service;
 using Admin.Core.Socket;
 using Aucma.Core.PrintTo.Models;
 using Aucma.Core.PrintTo.Views;
@@ -53,11 +54,7 @@ namespace Aucma.Core.PrintTo.ViewModels
 
         private async void InitializeAsync()
         {
-            await Task.Run(() =>
+            await LoadData();
-            {
-                Task.WaitAll(LoadData());
-
-            });
         }
 
         #region 加载DataGrid数据
@@ -88,8 +85,8 @@ namespace Aucma.Core.PrintTo.ViewModels
                     order.LinerAmount = item.LinerAmount;
                     order.BoxAmount = item.BoxAmount;
                     order.ErrorNum = item.ErrorAmount;
-                    order.LinerCodeNum = item.LinerAmount;
+                    order.LinerCodeNum = item.PrintLinerAmount;
-                    order.BoxCodeNum = item.BoxAmount;
+                    order.BoxCodeNum = item.PrintBoxAmount;
                     order.PrintName = item.PrintName;
                     order.CompleteAmount = item.CompleteAmount;
                     datalist.Add(order);
@@ -250,7 +247,12 @@ namespace Aucma.Core.PrintTo.ViewModels
                     type = 1;
                 }
                 //查询当前数据库当前已经打印的数量
+               
                 var printBarCodeList = await _printBarCodeServices.QueryAsync(d => d.OrderCode == order_code && d.PrintBarType == type);
+                foreach (var item in printBarCodeList)
+                {
+                  await  _printBarCodeServices.DeleteByIdAsync(item.ObjId);
+                }
                 if (printBarCodeList != null &&  printBarCodeList.Count != 0)
                 {
                     //计算剩余数量

Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs

@@ -381,6 +381,7 @@ namespace Aucma.Core.PrintTo.ViewModels
                         printBarCode.MaterialName = item.MaterialName;
                         printBarCode.PrintTime = DateTime.Now;
                         printBarCode.SupplementMaterial =0;
+                        printBarCode.ProductLineCode = "CX_02";
                         if (string.IsNullOrEmpty(printBarCode.MaterialBarcode))
                         {
                             throw new Exception("条码生成异常");//抛出异常，回滚事务，事务退出

Aucma.Core.ProductOffLine/Business/offLineBusiness.cs

@@ -802,10 +802,14 @@ namespace Aucma.Core.ProductOffLine.Business
                     BaseOrderInfo order = _baseOrderInfoServices.FirstAsync(x => x.OrderCode == TempOffLineInfo.ProductOrderNo.Replace("0000", "")).Result;
                     if (order != null)
                     {
-                        if (order.OrderType == "ZP03")
+                        if (TempOffLineInfo.ProductOrderNo.Replace("0000","").StartsWith("3"))
                         {
                             orderType = 3;
                         }
+                        //if (order.OrderType == "ZP03")
+                        //{
+                        //    orderType = 3;
+                        //}
                         TempOffLineInfo.OrderQty = order.OrderAmount; // 订单数量*5
                         TempOffLineInfo.ActQty = order.CompleteAmount;  // 订单已上传*6
                     }

Aucma.Core.SheetMetal/ViewModels/LoginPageViewModel.cs

@@ -124,7 +124,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
         #region 班组添加到集合中
         public void AddTeamData()
         {
-            var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode==appConfig.ProductlineCode).Result;
+            var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode==appConfig.ProductlineCode   && d.TeamCode.Contains(appConfig.TeamConfig)).Result;
             if (baseTeamMembersList == null) return;
             foreach (var item in baseTeamMembersList)
             {

Aucma.Core.SheetMetal/config/AppConfig.cs

@@ -73,7 +73,14 @@ namespace Aucma.Core.SheetMetal.Config
             set { iniHelper.IniWriteValue("system", "Account", value); }
         }
 
-      
+        /// <summary>
+        /// 登录界面班组展示配置
+        /// </summary>
+        public string TeamConfig
+        {
+            get { return iniHelper.IniReadValue("system", "TeamConfig"); }
+            set { iniHelper.IniWriteValue("system", "TeamConfig", value); }
+        }
 
     }
 }