fix

Projects/永冠OPP/WCS.Service/WebApi/WMS/Request/I_WCS_MergeinfoRequest.cs

@@ -12,12 +12,12 @@ namespace WCS.Service.Entity
         /// <summary>
         /// 容器编号
         /// </summary>
-        [Required(ErrorMessage = "{0} 不可为空")]
+        //[Required(ErrorMessage = "{0} 不可为空")]
         public string ContainerBarCode { get; set; }
         /// <summary>
         /// 容器类型
         /// </summary>
-        [Required(ErrorMessage = "{0} 不可为空")]
+        //[Required(ErrorMessage = "{0} 不可为空")]
         public int ContainerType { get; set; }
         /// <summary>
         /// 物料条码
@@ -26,7 +26,7 @@ namespace WCS.Service.Entity
         /// <summary>
         /// 仓库编码
         /// </summary>
-        [Required(ErrorMessage = "{0} 不可为空")]
+        //[Required(ErrorMessage = "{0} 不可为空")]
         public string WareHouseId { get; set; }
         /// <summary>
         /// 设备编号

Projects/永冠OPP/WCS.Service/WebApi/WMS/WMS.cs

@@ -244,7 +244,7 @@ namespace WCS.Service
         {
             var res = APICaller.CallApi<I_WCS_MergeinfoResponse>(Url + "/api/Task/I_WCS_Mergeinfo", new I_WCS_MergeinfoRequest
             {
-                MatBarCode = barcode,
+                ContainerBarCode = barcode,
                 EquipmentNo = dev
             });
             if (!res.ResType)

Projects/永冠OPP/WCS.Service/Works/Station/连廊车间入库.cs

@@ -22,7 +22,7 @@ namespace WCS.Service.Works.Station
     {
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return dev.CODE is "G3052";
+            return dev.CODE is "G3052" or "G3003";
         }
 
         protected override void Do(StationDeviceGroup obj)
@@ -36,6 +36,7 @@ namespace WCS.Service.Works.Station
                 //设备组无论单卷还是双卷都必须满足的条件
                 if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException($"等待任务执行--凭证号不一致");
                 if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException($"设备运行中");
+                if (!obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态))) return;
 
                 //成功创建的任务
                 var finishTaskList = new List<FinishTaskList<int>>();