ÏîÄ¿´úÂë/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs

@@ -44,7 +44,6 @@
                    throw new Exception();
                }


                //todo ä¼˜åŒ– å¦‚未查询到任务则处理
                //if (content.Data != null)
                //{

 ÏîÄ¿´úÂë/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -667,17 +667,21 @@
                {
                    if(task.NextAddress == task.TargetAddress)
                    {
                        int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
                        task.TaskState = nextStatus;
                        task.CurrentAddress = task.NextAddress;
                        task.NextAddress = task.NextAddress;
                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";
                        int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();

                        task.TaskState = nextStatus;
                        Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
                        task_Hty.TaskId = 0;
                        //task_Hty.CarType = task.CarType;
                        task_Hty.PVI = task.PVI;
                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);

                    }
                    else
                    {

                        var routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
                        if (!routers.Any()) return WebResponseContent.Instance.Error($"未找到设备路由信息");


 ÏîÄ¿´úÂë/WCS/WCSServer/WIDESEAWCS_Tasks/TT/CommonConveyorLineTTJob.cs

@@ -82,11 +82,11 @@
            _stationManagerRepository = stationManagerRepository;
        }

        static Dictionary<string, string> TCRoadWay = new Dictionary<string, string>()
        {
             { "TC05", "SC02-SC04" },
             { "TC06", "SC06-SC08" },
        };
        //static Dictionary<string, string> TCRoadWay = new Dictionary<string, string>()
        //{
        //     { "TC05", "SC02-SC04" },
        //     { "TC06", "SC06-SC08" },
        //};

        public async Task Execute(IJobExecutionContext context)
        {

 ÏîÄ¿´úÂë/WMS/WMSClient/src/api/buttons.js

@@ -103,7 +103,7 @@
    onClick: function () {
      this.printClick()
    }
  },{
  }, {
    name: '任务完成',
    // icon: 'el-icon-printer',
    type: 'primary',
@@ -111,9 +111,9 @@
    // color: '#529b2e',
    value: 'TaskHandComplete',
    onClick: function () {
      

    }
  },{
  }, {
    name: '直接出库',
    // icon: 'el-icon-printer',
    type: 'primary',
@@ -121,26 +121,26 @@
    // color: '#529b2e',
    value: 'OutBound',
    onClick: function () {
      

    }
  },{
  }, {
    name: '初始化库位',
    type: 'primary',
    // color: '#529b2e',
    value: 'initializeLocation',
    onClick: function () {
      

    }
    
  },{

  }, {
    name: '补录数据',
    type: 'primary',
    // color: '#529b2e',
    value: 'SupplementationData',
    onClick: function () {
      

    }
  },{
  }, {
    name: '指定出库',
    // icon: 'el-icon-printer',
    type: 'primary',
@@ -148,10 +148,10 @@
    // color: '#529b2e',
    value: 'ManualOutBound',
    onClick: function () {
      

    }
  }
  ,{
  , {
    name: '启用',
    // icon: 'el-icon-printer',
    type: 'primary',
@@ -159,9 +159,9 @@
    // color: '#529b2e',
    value: 'EnableLocation',
    onClick: function () {
      

    }
  },{
  }, {
    name: '禁用',
    // icon: 'el-icon-printer',
    type: 'primary',
@@ -169,7 +169,7 @@
    // color: '#529b2e',
    value: 'DisableLocation',
    onClick: function () {
      

    }
  },
  {
@@ -180,7 +180,7 @@
    // color: '#529b2e',
    value: 'Boxing',
    onClick: function () {
      

    }
  }
  ,
@@ -192,9 +192,9 @@
    // color: '#529b2e',
    value: 'RequestIn',
    onClick: function () {
      

    }
  },{
  }, {
    name: '确认任务',
    // icon: 'el-icon-printer',
    type: 'primary',
@@ -202,7 +202,29 @@
    // color: '#529b2e',
    value: 'confirmTask',
    onClick: function () {
      

    }
  }
  , {
    name: '锁定',
    // icon: 'el-icon-printer',
    type: 'primary',
    // plain: true,
    // color: '#529b2e',
    value: 'stockLock',
    onClick: function () {

    }
  }
  , {
    name: '解锁',
    // icon: 'el-icon-printer',
    type: 'primary',
    // plain: true,
    // color: '#529b2e',
    value: 'stockUnLock',
    onClick: function () {

    }
  }
]

 ÏîÄ¿´úÂë/WMS/WMSClient/src/extension/widesea_wms/stock/VV_StockInfo.js

@@ -91,6 +91,58 @@
        }
      };




      // åº“存锁定
      var stockLock = this.buttons.find(x => x.value == "stockLock");
      if (stockLock != null) {
        stockLock.onClick = () => {
          let rows = this.$refs.table.getSelected();
          if (rows.length == 0) {
            return this.$error("请选择数据!");
          }
          let ids = rows.map(x => {
            return x.id;
          })
          this.http.post(`/api/VV_StockInfo/stockLock`, ids, "库存锁定中...").then((result) => {
            if (result.status) {
              this.$Message.success(result.message);
              this.refresh();
            } else {
              this.$Message.error(result.message);
              this.refresh();
            }
          })

        }
      };

      // åº“存解锁
      var stockUnLock = this.buttons.find(x => x.value == "stockUnLock");
      if (stockUnLock != null) {
        stockUnLock.onClick = () => {
          let rows = this.$refs.table.getSelected();
          if (rows.length == 0) {
            return this.$error("请选择数据!");
          }
          let ids = rows.map(x => {
            return x.id;
          })
          this.http.post(`/api/VV_StockInfo/stockUnLock`, ids, "库存解锁中...").then((result) => {
            if (result.status) {
              this.$Message.success(result.message);
              this.refresh();
            } else {
              this.$Message.error(result.message);
              this.refresh();
            }
          })

        }
      };


      // this.columns.forEach((column) => {
      //   if (column.field == 'materielName') {
      //     column.formatter = (row) => {

 ÏîÄ¿´úÂë/WMS/WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt

Binary files differ

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_IStorageBasicService/Stock/IVV_StockInfoService.cs

@@ -2,4 +2,7 @@

public interface IVV_StockInfoService : IService<VV_StockInfo>
{
    WebResponseContent stockLock(object[] keys);

    WebResponseContent stockUnLock(object[] keys);
}

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Dt_PalletStockInfo.cs

@@ -155,7 +155,7 @@
        public int TaskStatus { get; set; }

        /// <summary>
        /// ä¿ç•™çŠ¶æ€
        /// ä¿ç•™çŠ¶æ€ 0-不保留  1-保留
        /// </summary>
        [ImporterHeader(Name = "保留状态")]
        [ExporterHeader(DisplayName = "保留状态")]

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs

@@ -39,14 +39,14 @@
                    var assemblyOrderInfo = _assemblyOrderInfoRepository.QueryFirst(x => x.workOrderNo == item.workOrderNo && x.orderType == item.workOrderType);
                    if (assemblyOrderInfo == null) throw new Exception($"拉动锁车失败:未知总装工单号{item.workOrderNo}");

                    Dt_PalletStockInfo carinfo = null;
                    //Dt_PalletStockInfo carinfo = null;
                    VV_StockInfo OutStock = new VV_StockInfo();
                    Dt_CarBodyInfo carbodyinfo = null;
                    //Dt_CarBodyInfo carbodyinfo = null;
                    if (!string.IsNullOrEmpty(item.pvi))
                    {
                        // carinfo = _palletStockInfoRepository.QueryFirst(x => x.PVI == item.pvi && x.pbMaterial == item.pbMaterial);
                        //carbodyinfo = _carBodyRepository.QueryFirst(x => x.pbMaterial == item.pbMaterial && x.PVI == item.pvi);
                        OutStock = _VVStockInfoRepository.QueryFirst(X => X.PVI == item.pvi && X.pbMaterial == item.pbMaterial);
                        OutStock = _VVStockInfoRepository.QueryFirst(x => x.PVI == item.pvi && x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0);
                        if (OutStock == null)
                        {
                            throw new Exception($"未找到指定PVI车身信息{item.pvi}");
@@ -56,7 +56,7 @@
                    {
                        //carinfo = _palletStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial).OrderBy(x => x.biwInPassTime).FirstOrDefault();
                        //carbodyinfo = _carBodyRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.BodyStatus == 0).OrderBy(x => x.biwInPassTime).FirstOrDefault();
                        OutStock = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.workOrderType == item.workOrderType).OrderBy(x => x.biwInPassTime).FirstOrDefault();
                        OutStock = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0 && x.workOrderType == item.workOrderType).OrderBy(x => x.biwInPassTime).FirstOrDefault();
                    }

                    if (OutStock == null)

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs

@@ -72,6 +72,10 @@
                foreach (var item in maxGroup)
                {
                    var number = _taskRepository.QueryData(x => x.TargetAddress == item.Key).Count();
                    if (item.Count() - number <= 0)
                    {
                        continue;
                    }
                    result.Add(item.Key, item.Count() - number);
                }

@@ -114,7 +118,7 @@
                    TaskNum = _taskRepository.GetTaskNo().Result,
                    Creater = "Systeam",
                    PVI = json.PVI,

                    CarType = carInfo.CarType
                };
                _unitOfWorkManage.BeginTran();


 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StorageBasicServices/Stock/VV_StockInfoService.cs

@@ -11,8 +11,53 @@

public class VV_StockInfoService : ServiceBase<VV_StockInfo, IVV_StockInfoRepository>, IVV_StockInfoService
{
    public VV_StockInfoService(IVV_StockInfoRepository BaseDal) : base(BaseDal)
    private readonly IDt_PalletStockInfoRepository _repository;
    public VV_StockInfoService(IVV_StockInfoRepository BaseDal, IDt_PalletStockInfoRepository repository) : base(BaseDal)
    {
        _repository = repository;
    }

    public WebResponseContent stockLock(object[] keys)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            foreach (var item in keys)
            {
                var stock = _repository.QueryFirst(x => x.Id == Convert.ToInt32(item));
                if (stock.LockOrder != 1){
                    stock.StockStatus = 1;
                    _repository.UpdateData(stock);
                }

            }
            return content.OK("锁定成功!");
        }
        catch (Exception e)
        {
            return content.Error(e.Message);
        }

    }

    public WebResponseContent stockUnLock(object[] keys)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            foreach (var item in keys)
            {
                var stock = _repository.QueryFirst(x => x.Id == Convert.ToInt32(item));
                stock.StockStatus = 0;
                _repository.UpdateData(stock);

            }
            return content.OK("解锁成功!");
        }
        catch (Exception e)
        {
            return content.Error(e.Message);
        }

    }
}

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs

@@ -108,7 +108,7 @@
                // åˆ›å»ºå¹¶æ·»åŠ ä»»åŠ¡åˆ°æ•°æ®åº“
                hasTask = new Dt_Task
                {
                    Grade = 1,
                    Grade = 3,
                    Roadway = Outstation.Roadway,
                    TargetAddress = "RB043",
                    Dispatchertime = DateTime.Now,

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs

@@ -41,12 +41,12 @@
            {
                //涂装不生产  åˆ™åœæ­¢æ‹‰åŠ¨å‡ºåº“
                var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "2");
                if (area.AreaStatus != 1l) { return Task.CompletedTask; }
                if (area.AreaStatus != 1) { return Task.CompletedTask; }

                var stockInfo = _palletStockInfoRepository.Db.Queryable<Dt_PalletStockInfo>()
                    //.Where(x => x.LockStatue == 0)
                    .Includes(x => x.CarBodyInfo)
                    .Where(x => x.CarBodyInfo.CarType == 1 && x.TaskStatus == 0)
                    .Where(x => x.CarBodyInfo.CarType == 1 && x.TaskStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0)
                    .OrderBy(x => x.CreateDate) // æŽ’序
                    .ToList(); // èŽ·å–第一个元素

@@ -73,7 +73,7 @@
                var location = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
                location.LocationStatus = (int)LocationEnum.InStockDisable;
                lockStock.TaskStatus = 1;
                if (stationLists == null || stationLists.Count == 0) throw new Exception("出库站台未配置或未启用");
                if (!stationLists.Any()) throw new Exception("出库站台未配置或未启用");

                Dt_StationManager Outstation = null;

@@ -92,7 +92,7 @@
                // åˆ›å»ºå¹¶æ·»åŠ ä»»åŠ¡åˆ°æ•°æ®åº“
                hasTask = new Dt_Task
                {
                    Grade = 1,
                    Grade = 3,
                    Roadway = Outstation.Roadway,
                    TargetAddress = Outstation.stationChildCode,
                    Dispatchertime = DateTime.Now,

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_WMSServer/Controllers/Stock/VV_StockInfoController.cs

@@ -11,4 +11,25 @@
    {

    }
    /// <summary>
    /// åº“存锁定
    /// </summary>
    /// <param name="keys"></param>
    /// <returns></returns>
    [HttpPost,HttpGet,Route("stockLock"),AllowAnonymous]
    public WebResponseContent stockLock([FromBody]object[] keys)
    {
        return Service.stockLock(keys);
    }
    /// <summary>
    /// åº“存解锁
    /// </summary>
    /// <param name="keys"></param>
    /// <returns></returns>
    [HttpPost, HttpGet, Route("stockUnLock"), AllowAnonymous]
    public WebResponseContent stockUnLock([FromBody] object[] keys)
    {
        return Service.stockUnLock(keys);
    }

}