Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Aucma.Core.CodeBinding/appsettings.json

@@ -193,7 +193,7 @@
       "Enabled": true
     },
     "Scanner1": { //扫码器1
-      "Ip": "192.168.1.19",
+      "Ip": "169.254.91.169",
       "Name": "扫码器1"
     },
     "Scanner2": { //扫码器2

Aucma.Core.ProductOffLine/Business/offLineBusiness.cs

@@ -185,14 +185,11 @@ namespace Aucma.Core.ProductOffLine.Business
 
                 ////6.1截取订单号去查询更新BASE_ORDERINFO,全放到service处理
                 BaseOrderInfo order = await _baseOrderInfoServices.FirstAsync(x => x.OrderCode == TempOffLineInfo.ProductOrderNo);
-                //if (order.CompleteAmount == 0)
-                //{
-                //    order.BeginDate = DateTime.Now;
-                //}
+               
                 //  order.CompleteAmount++;
                 //if (order.CompleteAmount == order.OrderAmount)
                 //{
-                //    order.EndDate = DateTime.Now;
+                //    order.CompleteDate = DateTime.Now;
                 //}
                 //order.UpdatedTime = DateTime.Now;
                 //await _baseOrderInfoServices.UpdateAsync(order);