Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs

@@ -525,9 +525,10 @@
    /// <returns>反馈信息</returns>
    [HttpPost]
    [AllowAnonymous]
    public IsBaleModel2 HttpInConfirm(PortModel models)
    public ResponseModel HttpInConfirm(PortModel models)
    {

        ResponseModel result = new ResponseModel();
        result.StatusCode = 0;
        try
        {
            string str = JsonConvert.SerializeObject(models);
@@ -565,7 +566,7 @@
            var modDevice = _db.Queryable<WcsPosition>().Where(s => s.StationNum == portno && s.Text == "PLC").First();

            var (res1, val) = plcConn.GetPlcDBValue(modDevice.PosType, listPlcDevice.DbNumber, modDevice.PlcPos);
            if (val.ToString() == "120")
            if (val.ToString() == "120" || val.ToString() == "130")
            {
                //读取成功后写入130
                modDevice = _db.Queryable<WcsPosition>().Where(s => s.StationNum == portno && s.Text == "WCS").First();
@@ -573,14 +574,17 @@
                if (ret.IsSucceed)
                {
                    //回传WMS可放信号
                    return new IsBaleModel2() { Success = 0, Message = "接受成功" };
                    result.Msg = "接受成功";
                    return result;
                }
            }
            return new IsBaleModel2() { Success = -1, Message = "读取PLC点位信息失败" };
            result.StatusCode = -1;
            result.Msg = "读取PLC点位信息失败";
            return result;
        }
        catch (Exception ex)
        {
            return new IsBaleModel2() { Success = -1, Message = ex.Message };
            return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
        }
    }

@@ -594,6 +598,8 @@
    [AllowAnonymous]
    public ResponseModel HttpInRequest(PortRequestModel models)
    {
        ResponseModel result = new ResponseModel();
        result.StatusCode = 0;
        try
        {
            string str = JsonConvert.SerializeObject(models);
@@ -640,10 +646,13 @@
            var ret = plcConn.SetPlcDBValue(modDevice.PosType, listPlcDevice.DbNumber, modDevice.PlcPos, "140");//写入开始放货信号
            if (ret.IsSucceed == true)
            {
                return new ResponseModel() { StatusCode = 0, Msg = "PLC允许放货" };
                result.Msg = "PLC允许放货";
                return result;
            }
           
            return new ResponseModel() { StatusCode = -1, Msg = "读取PLC点位信息失败" };

            result.StatusCode = -1;
            result.Msg = "读取PLC点位信息失败";
            return result;
        }
        catch (Exception ex)
        {
@@ -660,9 +669,10 @@
    /// <returns>反馈信息</returns>
    [HttpPost]
    [AllowAnonymous]
    public IsBaleModel2 HttpInFinish(PortModel models)
    public ResponseModel HttpInFinish(PortModel models)
    {

        ResponseModel result = new ResponseModel();
        result.StatusCode = 0;
        try
        {
            string str = JsonConvert.SerializeObject(models);
@@ -702,13 +712,16 @@
            if (ret.IsSucceed)
            {
                //回传WMS放货信号
                return new IsBaleModel2() { Success = 0, Message = "接受成功" };
                result.Msg = "接受成功";
                return result;
            }
            return new IsBaleModel2() { Success = -1, Message = "读取PLC点位信息失败" };
            result.StatusCode = -1;
            result.Msg = "读取PLC点位信息失败";
            return result;
        }
        catch (Exception ex)
        {
            return new IsBaleModel2() { Success = -1, Message = ex.Message };
            return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
        }
    }


 Web/src/views/wcs/wcsTask/index.vue

@@ -73,7 +73,6 @@
            @cell-click="handleClick" @sort-change="sortChange" border="">
            <el-table-column type="index" label="序号" width="55" align="center" />
            <el-table-column prop="taskNo" label="任务号" width="130" show-overflow-tooltip="" />
            <el-table-column prop="levels" label="优先级" width="55" show-overflow-tooltip="" />
            <el-table-column prop="taskType" width="85" label="任务类型" show-overflow-tooltip="">
              <template #default="scope">
                <el-tag :type="dv('TaskTypeEnum', scope.row.taskType)?.tagType"> {{ dv('TaskTypeEnum',
@@ -86,16 +85,18 @@
                  scope.row.status)?.name }}</el-tag>
              </template>
            </el-table-column>
            <el-table-column prop="origin" label="来源" show-overflow-tooltip="" />
            <el-table-column prop="lotNo" label="批次号" width="130" show-overflow-tooltip="" />
            <el-table-column prop="skuNo" label="物料编码" show-overflow-tooltip="" />
            <el-table-column prop="skuName" label="物料名称" show-overflow-tooltip="" />  
            <el-table-column prop="startLocate" label="起始位置" show-overflow-tooltip="" />
            <el-table-column prop="endLocate" label="结束位置" show-overflow-tooltip="" />
            <el-table-column prop="palletNo" label="托盘号" show-overflow-tooltip="" />
            <el-table-column prop="orderNo" label="单据号" show-overflow-tooltip="" />
            <el-table-column prop="qty" label="拆垛箱数" show-overflow-tooltip="" />
            <el-table-column prop="palletQty" label="整跺箱数" show-overflow-tooltip="" />
            <el-table-column prop="lotNo" label="批次号" show-overflow-tooltip="" />
            <el-table-column prop="skuNo" label="物料编码" show-overflow-tooltip="" />
            <el-table-column prop="skuName" label="物料名称" show-overflow-tooltip="" />            
            <el-table-column prop="levels" label="优先级" width="55" show-overflow-tooltip="" />
            <el-table-column prop="origin" label="来源" show-overflow-tooltip="" />
            <el-table-column prop="orderNo" label="单据号" show-overflow-tooltip="" />
                      
            <el-table-column prop="unstackingMode" width="100" label="拆垛方式" show-overflow-tooltip="">
              <template #default="scope">
                <span v-if="scope.row.unstackingMode">