Merge branch 'csc'

chengsc

2025-01-16 8b0d749cfbec8bf0afe71a8956bfeeed6f27cdfc

Merge branch 'csc'

 Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs

@@ -361,6 +361,16 @@
    /// </summary>
    public string EndCeng { get; set; }


    /// <summary>
    /// 缠膜交互
    /// </summary>
    public string ChanMo { get; set; }
    /// <summary>
    /// 拆模交互
    /// </summary>
    public string ChaiMo { get; set; }

}

public class WcsDeviceStartStop

 Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs

@@ -168,6 +168,11 @@
        var (result11, value11) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Short, DbNum, "48");
        data.EndCeng = value11.ToString();

        var (result12, value12) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Byte, DbNum, "50");
        data.ChanMo = value12.ToString();
        var (result13, value13) = modUtil.GetPlcDBValue(PLCDataTypeEnum.Byte, DbNum, "51");
        data.ChaiMo = value13.ToString();

        modUtil.Close();
        return data;
    }

 Web/src/views/device/deviceInfo/index.vue

@@ -185,6 +185,16 @@
                                            </el-form-item>
                                        </el-col>
                                        
                                        <el-col :span="6">
                                            <el-form-item label="缠膜信号">
                                                <el-input v-model="stationValue.chanMo" disabled style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="拆膜信号">
                                                <el-input v-model="stationValue.chaiMo" disabled style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                    </el-row>    
                                </el-form>
                            </div>
@@ -232,6 +242,10 @@
    endPai:'',
    endLie:'',
    endCeng:'',

    chanMo:'',
    chaiMo:'',

});