2222

wanshenmean

2024-11-03 a15d996584733d60d0adddcd791f029d608c4fae

2222

 .gitignore

@@ -868,3 +868,97 @@
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/project.assets.json
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/project.nuget.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/WIDESEA_StoragIntegrationServices.csproj.nuget.dgspec.json
/Code Management/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.bin
/Code Management/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.bin
/Code Management/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.bin
/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2
/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2
/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo
/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json
/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0/WIDESEAWCS_Common.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0/WIDESEAWCS_Common.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Communicator/obj/Debug/net6.0/WIDESEAWCS_Communicator.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Communicator/obj/Debug/net6.0/WIDESEAWCS_Communicator.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Debug/net6.0/WIDESEAWCS_IProcessRepository.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Debug/net6.0/WIDESEAWCS_IProcessRepository.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Debug/net6.0/WIDESEAWCS_IProcessRepository.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Debug/net6.0/WIDESEAWCS_ProcessRepository.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Debug/net6.0/WIDESEAWCS_ProcessRepository.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Debug/net6.0/WIDESEAWCS_ProcessRepository.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/输送线/Logs_20241101093806.txt
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/陈化1号堆垛机/Logs_20241030164506.txt
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/陈化输送线/Logs_20241102145422.txt
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.exe
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/apphost.exe
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.assets.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfo.cs
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfoInputs.cache
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/bin/Debug/net6.0/WIDESEA_StoragIntegrationServices.deps.json
/Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.xml
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.xml

 Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js

@@ -1,29 +1,39 @@

import gridBody from './extend/importDevicePro.vue'
import gridBody from "./extend/importDevicePro.vue";
let extension = {
  components: {
    //查询界面扩展组件
    gridHeader: '',
    gridHeader: "",
    gridBody: gridBody,
    gridFooter: '',
    gridFooter: "",
    //新建、编辑弹出框扩展组件
    modelHeader: '',
    modelBody: '',
    modelFooter: ''
    modelHeader: "",
    modelBody: "",
    modelFooter: "",
  },
  tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写)
  tableAction: "", //指定某张表的权限(这里填写表名,默认不用填写)
  buttons: { view: [], box: [], detail: [] }, //扩展的按钮
  methods: {
    //下面这些方法可以保留也可以删除
    onInit() {
      // console.log(this.detailOptions.buttons);
      // console.log(this.$refs.detail)
      var detailImport = this.detailOptions.buttons.find(item=>item.value == 'import');
      if(detailImport){
      var detailImport = this.detailOptions.buttons.find(
        (item) => item.value == "import"
      );
      if (detailImport) {
        detailImport.onClick = function () {
          this.$refs.gridBody.open();
        }
        };
      }
      this.buttons.unshift({
        //也可以用push或者splice方法来修改buttons数组
        name: "开启服务", //按钮名称
        icon: "el-icon-document", //按钮图标vue2版本见iview文档icon，vue3版本见element ui文档icon(注意不是element puls文档)
        type: "primary", //按钮样式vue2版本见iview文档button，vue3版本见element ui文档button
        onClick: function () {
          this.$Message.success("点击了按钮");
        },
      });
    },
    onInited() {
      //框架初始化配置后
@@ -64,15 +74,14 @@
      //console.log(this.$refs)
      this.$nextTick(() => {
        if (this.$refs.upload_excel) {
          alert('点击了上传按钮')
          alert("点击了上传按钮");
          this.$refs.upload_excel.upload = function () {
            console.log('点击了上传按钮')
          }
            console.log("点击了上传按钮");
          };
        }
        // alert(1)
      })

    }
  }
      });
    },
  },
};
export default extension;

 Code Management/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.bin

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.bin

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.bin

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0/WIDESEAWCS_Common.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0/WIDESEAWCS_Common.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Communicator/obj/Debug/net6.0/WIDESEAWCS_Communicator.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Communicator/obj/Debug/net6.0/WIDESEAWCS_Communicator.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MOM/ResponeRunDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,133 @@
namespace WIDESEAWCS_DTO.MOM;

/// <summary>
/// å‚数信息模型
/// </summary>
public class ParameterInfoDto
{
    /// <summary>
    /// å‚数编码
    /// </summary>
    public string ParameterCode { get; set; }

    /// <summary>
    /// å‚数类型
    /// </summary>
    public string ParameterType { get; set; }

    /// <summary>
    /// æŽ¨èå€¼
    /// </summary>
    public string TargetValue { get; set; }

    /// <summary>
    /// å•ä½
    /// </summary>
    public string UOMCode { get; set; }

    /// <summary>
    /// æŽ§åˆ¶ä¸Šé™å€¼
    /// </summary>
    public string UpperControlLimit { get; set; }

    /// <summary>
    /// æŽ§åˆ¶ä¸‹é™å€¼
    /// </summary>
    public string LowerControlLimit { get; set; }

    /// <summary>
    /// è§„格上限值
    /// </summary>
    public string UpperSpecificationsLimit { get; set; }

    /// <summary>
    /// è§„格下限值
    /// </summary>
    public string LowerSpecificationsLimit { get; set; }

    /// <summary>
    /// å‚数描述
    /// </summary>
    public string Description { get; set; }

    /// <summary>
    /// å·¥è‰ºè·¯çº¿ä¸Šå½“前设备参数信息是否可用(TRUE å¯ç”¨ /FALSE ä¸å¯ç”¨)
    /// </summary>
    public string EquipmentAvailabilityFlag { get; set; }
}

/// <summary>
/// å“åº”模型
/// </summary>
public class ResponeRunDto
{
    /// <summary>
    /// ä¼šè¯ID
    /// </summary>
    public string SessionId { get; set; }

    /// <summary>
    /// è¿”回时间
    /// </summary>
    public string ResponseTime { get; set; }

    /// <summary>
    /// è®¾å¤‡ç¼–号
    /// </summary>
    public string EquipmentCode { get; set; }

    /// <summary>
    /// æŠ¥æ–‡æŽ¥æ”¶ç»“æžœ
    /// </summary>
    public bool ResultFlag { get; set; }

    /// <summary>
    /// è¿”回状态码True：执行成功；False：执行失败
    /// </summary>
    public bool Success { get; set; }

    /// <summary>
    /// æ¶ˆæ¯ç±»åž‹
    /// </summary>
    public string MessageCode { get; set; }

    /// <summary>
    /// æ¶ˆæ¯
    /// </summary>
    public string MOMMessage { get; set; }

    /// <summary>
    /// å·¥å•ç¼–号
    /// </summary>
    public string WipOrderNo { get; set; }

    /// <summary>
    /// äº§å“åç§°
    /// </summary>
    public string ProductDesc { get; set; }

    /// <summary>
    /// é¦–件数量
    /// </summary>
    public string FirstArticleNum { get; set; }

    /// <summary>
    /// è°ƒæœºæ•°é‡
    /// </summary>
    public string DebugNum { get; set; }

    /// <summary>
    /// å‚数版本信息
    /// </summary>
    public string ParamVersion { get; set; }

    /// <summary>
    /// æ˜¯å¦éœ€è¦è¯»å–参数
    /// </summary>
    public bool ParamRefreshFlag { get; set; }

    /// <summary>
    /// å‚数信息数组
    /// </summary>
    public List<ParameterInfoDto> ParameterInfo { get; set; } = new List<ParameterInfoDto>();
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/RequestTaskDto.cs

@@ -14,28 +14,8 @@
        public string Position { get; set; }

        /// <summary>
        /// åŒºåŸŸç¼–码
        /// </summary>
        public string AreaCode { get; set; }

        /// <summary>
        /// æ‰˜ç›˜å·
        /// </summary>
        public string PalletCode { get; set; }

        /// <summary>
        /// ç”³è¯·ç±»åž‹(1入库，2出库)
        /// </summary>
        public int Type { get; set; }

        /// <summary>
        /// å…³ç³»çš„区域
        /// </summary>
        public string Area { get; set; }

        /// <summary>
        /// å…³ç³»çš„方向
        /// </summary>
        public string Direction { get; set; }
    }
}
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Dt_EquipmentProcess.cs

@@ -33,6 +33,22 @@
    public string EquipmentType { get; set; }

    /// <summary>
    /// å·¥å•ç¼–号
    /// </summary>
    [ImporterHeader(Name = "工单编号")]
    [ExporterHeader(DisplayName = "工单编号")]
    [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "工单编号")]
    public string WipOrderNo {  get; set; }

    /// <summary>
    /// å·¥è‰ºåž‹å·
    /// </summary>
    [ImporterHeader(Name = "工艺型号")]
    [ExporterHeader(DisplayName = "工艺型号")]
    [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "工艺型号")]
    public string ProductDesc {  get; set; }

    /// <summary>
    /// å·¥è‰ºå‚数值
    /// </summary>
    [ImporterHeader(Name = "工艺参数值")]

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Debug/net6.0/WIDESEAWCS_IProcessRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Debug/net6.0/WIDESEAWCS_IProcessRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Debug/net6.0/WIDESEAWCS_IProcessRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Debug/net6.0/WIDESEAWCS_ProcessRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Debug/net6.0/WIDESEAWCS_ProcessRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Debug/net6.0/WIDESEAWCS_ProcessRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/ÊäËÍÏß/Logs_20241101093806.txt

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/³Â»¯1ºÅ¶Ñ¶â»ú/Logs_20241030164506.txt

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.exe

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/apphost.exe

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -132,8 +132,8 @@
            try
            {
                #region çœŸå®žæ•°æ®

                // åˆ›å»ºè¯·æ±‚对象
                // TODO: è°ƒç”¨æŽ¥å£èŽ·å–下一个地址
                //// åˆ›å»ºè¯·æ±‚对象
                //RequestTaskDto request = new RequestTaskDto()
                //{
                //    Position = sourceAddress,
@@ -401,6 +401,34 @@
                        task.CurrentAddress = task.NextAddress;
                        task.NextAddress = $"{random.Next(1, 1).ToString().PadLeft(3, '0')}-{random.Next(1, 1).ToString().PadLeft(3, '0')}-{random.Next(1, 1).ToString().PadLeft(3, '0')}";
                        task.TargetAddress = task.NextAddress;

                        #region çœŸå®žæ•°æ®
                        // TODO: è°ƒç”¨æŽ¥å£èŽ·å–下一个地址
                        //// åˆ›å»ºè¯·æ±‚对象
                        //RequestTaskDto request = new RequestTaskDto()
                        //{
                        //    Position = task.NextAddress,
                        //    PalletCode = task.PalletCode,
                        //};

                        //// å‘送请求并等待响应
                        //var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", request.ToJsonString()).Result;

                        //// ååºåˆ—化响应内容
                        //content = JsonConvert.DeserializeObject<WebResponseContent>(result);

                        //// æ£€æŸ¥çŠ¶æ€å¹¶è¿”回
                        //if (!content.Status)
                        //    return content;

                        //// ååºåˆ—化任务数据
                        //WMSTaskDTO taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

                        //task.CurrentAddress = task.NextAddress;
                        //task.NextAddress = taskResult.TargetAddress;
                        //task.TargetAddress = task.NextAddress;
                        #endregion

                    }
                }
                else
@@ -504,20 +532,25 @@
                    BaseDal.UpdateData(task);
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机入库完成");

                    WMSTaskDTO taskDTO = new WMSTaskDTO()
                    {
                        TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
                        Grade = 1,
                        PalletCode = task.PalletCode + "S",
                        RoadWay = "SC01",
                        SourceAddress = task.TargetAddress,
                        TargetAddress = "CLOutAreaA",
                        TaskState = (int)TaskOutStatusEnum.OutNew,
                        Id = 0,
                        TaskType = (int)TaskOutboundTypeEnum.Outbound
                    };

                    content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
                    //var x = new { taskNum = taskNum };
                    //var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result;
                    //content = JsonConvert.DeserializeObject<WebResponseContent>(result);

                    //WMSTaskDTO taskDTO = new WMSTaskDTO()
                    //{
                    //    TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
                    //    Grade = 1,
                    //    PalletCode = task.PalletCode + "S",
                    //    RoadWay = "SC01",
                    //    SourceAddress = task.TargetAddress,
                    //    TargetAddress = "CLOutAreaA",
                    //    TaskState = (int)TaskOutStatusEnum.OutNew,
                    //    Id = 0,
                    //    TaskType = (int)TaskOutboundTypeEnum.Outbound
                    //};

                    //content = ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                {
@@ -530,7 +563,7 @@
                {
                    throw new Exception($"任务类型错误,未找到该任务类型,任务号:【{taskNum}】,任务类型:【{task.TaskType}】");
                }
                content = WebResponseContent.Instance.OK();
                //content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.assets.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -19,7 +19,7 @@

using AutoMapper;
using HslCommunication;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using Newtonsoft.Json;
using Quartz;
using SqlSugar;
using System.Reflection;
@@ -43,6 +43,7 @@
    {
        private readonly List<string> _deviceCodes1 = new List<string>() { "1063", "1061", "1060" };
        private readonly List<string> _deviceCodes2 = new List<string>() { "1067", "1069", "1068" };
        private readonly string[] HCTrayCode = { "1012", "1013" };
        private readonly ITaskService _taskService;
        private readonly ITaskRepository _taskRepository;
        private readonly ITaskExecuteDetailService _taskExecuteDetailService;
@@ -127,6 +128,14 @@
                    //        EmptyTrayReturn(conveyorLine, command, _deviceCodes2[_deviceCodes1.Count - 1], i);
                    //    }
                    //}
                    foreach (var item in HCTrayCode)
                    {
                        ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(item);
                        if (command.InteractiveSignal != 2)
                        {
                            ChuanhuaOutbound(conveyorLine, command, HCTrayCode[0], 0);
                        }
                    }
                    Task.WaitAll(tasks.ToArray());
                }
            }
@@ -136,7 +145,7 @@
            }
            finally
            {
                WriteDebug("CommonConveyorLineJob", "test");
                //WriteDebug("CommonConveyorLineJob", "test");
                //Console.Out.WriteLine(DateTime.Now);
            }
            return Task.CompletedTask;
@@ -152,39 +161,86 @@
        public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue)
        {
            var taskNew = _taskService.QueryCraneConveyorLineTask(command.Barcode.ObjToInt(), childDeviceCode);
            var TaskTray = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
            if (TaskTray != null && TaskTray.TaskType == (int)TaskOutboundTypeEnum.OutTray)
            var Taskout = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
            if (Taskout != null)
            {
                // ç©ºæ‰˜ç›˜ä»»åŠ¡
                if (TaskTray.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
                if (Taskout.TaskType == (int)TaskOutboundTypeEnum.OutTray)
                {
                    ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(TaskTray);
                    taskCommand.InteractiveSignal = command.InteractiveSignal;
                    if (command.Barcode == "")
                    if (Taskout.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
                    {
                        taskCommand.TargetAddress = 1092;
                    }
                    conveyorLine.SendCommand(taskCommand, childDeviceCode);

                    ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);

                    _taskService.UpdateTaskStatusToNext(TaskTray);
                }
                else if(TaskTray.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
                {
                    if(command.Barcode == "")
                    {
                        ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(TaskTray);
                        ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
                        taskCommand.InteractiveSignal = command.InteractiveSignal;
                        taskCommand.TargetAddress = 1092;
                        if (command.Barcode == "")
                        {
                            taskCommand.TargetAddress = 1092;
                        }
                        conveyorLine.SendCommand(taskCommand, childDeviceCode);

                        ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                        _taskService.UpdateTaskStatusToNext(TaskTray);

                        _taskService.UpdateTaskStatusToNext(Taskout);
                    }
                    else if (Taskout.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
                    {
                        if (command.Barcode == "")
                        {
                            ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
                            taskCommand.InteractiveSignal = command.InteractiveSignal;
                            taskCommand.TargetAddress = 1092;
                            conveyorLine.SendCommand(taskCommand, childDeviceCode);

                            ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                            _taskService.UpdateTaskStatusToNext(Taskout);
                        }
                    }
                }
                else if (Taskout.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                {
                    if (Taskout.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
                    {
                        ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
                        taskCommand.InteractiveSignal = command.InteractiveSignal;
                        if (command.Barcode == "")
                        {
                            //todo æ²¡æœ‰æ˜Žç¡®å¼‚常口，送到目标巷道的NG口
                            //taskCommand.TargetAddress = 1092;
                        }
                        conveyorLine.SendCommand(taskCommand, childDeviceCode);

                        ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);

                        _taskService.UpdateTaskStatusToNext(Taskout);
                    }
                    else if (Taskout.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
                    {
                        if (command.Barcode == "")
                        {
                            ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(Taskout);
                            taskCommand.InteractiveSignal = command.InteractiveSignal;
                            // todo  é€åˆ°ç›®æ ‡å··é“çš„NG口
                            taskCommand.TargetAddress = 1092;
                            conveyorLine.SendCommand(taskCommand, childDeviceCode);

                            ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                            _taskService.UpdateTaskStatusToNext(Taskout);
                        }
                        else
                        {
                            // todo è°ƒç”¨WMS任务完成接口
                            var x = new { taskNum = Taskout.TaskNum };
                            var result = HttpHelper.GetAsync("http:127.0.0.1:8098/api/Task/CompleteTaskAsync", x.ToJsonString()).Result;
                            WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                            if (content.Status)
                            {
                                ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
                                _taskService.UpdateTaskStatusToNext(Taskout);
                            }
                        }
                    }
                }
            }
            if( taskNew == null)
            if (taskNew == null)
            {
                if (_taskService.RequestWMSTask(command.Barcode, childDeviceCode).Status)
                {
@@ -210,7 +266,7 @@
        /// <param name="conveyorLine">输送线实例对象</param>
        /// <param name="command">读取的请求信息</param>
        /// <param name="childDeviceCode">子设备编号</param>
        /// <param name="ProtocalDetailValue">线体当前bool读取偏移地址</param>
        /// <param name="index">读取的第一个位置</param>
        public void EmptyTrayReturn(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index)
        {
            var tasks = _taskRepository.QueryData(x => (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) && x.TaskType == (int)TaskOutboundTypeEnum.OutTray);
@@ -228,10 +284,78 @@
                    Id = 0,
                    TaskType = (int)TaskOutboundTypeEnum.OutTray
                };

                #region çœŸå®žæ•°æ®

                // TODO: è°ƒç”¨æŽ¥å£èŽ·å–下一个地址
                //RequestTaskDto request = new RequestTaskDto()
                //{
                //    Position = sourceAddress,
                //    PalletCode = palletCode,
                //};

                //// å‘送请求并等待响应
                //var result = HttpHelper.PostAsync("http:127.0.0.1:8098/api/Task/RequestTaskAsync", request.ToJsonString()).Result;

                //// ååºåˆ—化响应内容
                //WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);

                //// æ£€æŸ¥çŠ¶æ€å¹¶è¿”回
                ////if (!content.Status)
                ////    return content;

                //// ååºåˆ—化任务数据
                //WMSTaskDTO task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

                #endregion

                var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
                if (content.Status)
                {
                    Console.WriteLine("空托盘呼叫成功");
                }
            }
        }

        /// <summary>
        /// é™ˆåŒ–出库
        /// </summary>
        /// <param name="conveyorLine">输送线实例对象</param>
        /// <param name="command">读取的请求信息</param>
        /// <param name="childDeviceCode">子设备编号</param>
        /// <param name="index">线体当前bool读取偏移地址</param>
        public void ChuanhuaOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int index)
        {
            var tasks = _taskRepository.QueryData(x => (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) && x.TaskType == (int)TaskOutboundTypeEnum.Outbound);
            if (tasks.Count <= index)
            {
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
                    Grade = 1,
                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
                    RoadWay = "CHSC01",
                    SourceAddress = "001-001-001",
                    TargetAddress = childDeviceCode,
                    TaskState = (int)TaskOutStatusEnum.OutNew,
                    Id = 0,
                    TaskType = (int)TaskOutboundTypeEnum.Outbound,
                };

                var content = _taskService.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
                if (content.Status)
                {
                    Console.WriteLine("出库呼叫成功");
                }
            }
            else
            {
                Dt_Task task = tasks[index];
                if (task != null)
                {
                    ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
                    taskCommand.InteractiveSignal = command.InteractiveSignal;
                    conveyorLine.SendCommand(taskCommand, childDeviceCode);
                }
            }
        }
@@ -270,7 +394,6 @@
            if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
            {
                ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);


                //conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode);
                WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -322,10 +322,13 @@
                        var process = _processRepository.QueryData(x => x.EquipmentName == commonStackerCrane.DeviceName).FirstOrDefault();
                        if (process == null)
                        {
                            ResponeRunDto runDto = JsonConvert.DeserializeObject<ResponeRunDto>(respone);
                            process = new Dt_EquipmentProcess()
                            {
                                EquipmentName = commonStackerCrane.DeviceName,
                                EquipmentType = commonStackerCrane.DeviceCode.Substring(commonStackerCrane.DeviceCode.IndexOf("SC")),
                                EquipmentName = commonStackerCrane.DeviceCode,
                                EquipmentType = commonStackerCrane.DeviceName.Substring(commonStackerCrane.DeviceCode.IndexOf("堆垛机")),
                                WipOrderNo = runDto.WipOrderNo,
                                ProductDesc = runDto.ProductDesc,
                                ProcessValue = JsonConvert.SerializeObject(result)
                            };
                            var isResult = await _processRepository.AddDataAsync(process) > 0;

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs

@@ -76,7 +76,7 @@
    #region ä»»åŠ¡ç±»åž‹

    /// <summary>
    /// ä»»åŠ¡ç±»åž‹   100 å‡ºåº“;盘点出库 101; 102 åˆ†æ‹£å‡ºåº“;103 è´¨æ£€å‡ºåº“;200 å…¥åº“;盘点入库 201;分拣入库 202;质检入库 203;移库 300;库内移库 301;库外移库 302
    /// ä»»åŠ¡ç±»åž‹   
    /// </summary>

    public enum TaskInboundTypeEnum

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/RequestTaskDto.cs

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace WIDESEA_DTO;
namespace WIDESEA_DTO;

public class RequestTaskDto
{
@@ -14,27 +8,7 @@
    public string Position { get; set; }

    /// <summary>
    /// åŒºåŸŸç¼–码
    /// </summary>
    public string AreaCode { get; set; }

    /// <summary>
    /// æ‰˜ç›˜å·
    /// </summary>
    public string PalletCode { get; set; }

    /// <summary>
    /// ç”³è¯·ç±»åž‹(1入库，2出库)
    /// </summary>
    public int Type { get; set; }

    /// <summary>
    /// å…³ç³»çš„区域
    /// </summary>
    public string Area { get; set; }

    /// <summary>
    /// å…³ç³»çš„方向
    /// </summary>
    public string Direction { get; set; }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/Dt_EquipmentProcess.cs

@@ -36,6 +36,22 @@
        public string EquipmentType { get; set; }

        /// <summary>
        /// å·¥å•ç¼–号
        /// </summary>
        [ImporterHeader(Name = "工单编号")]
        [ExporterHeader(DisplayName = "工单编号")]
        [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "工单编号")]
        public string WipOrderNo { get; set; }

        /// <summary>
        /// å·¥è‰ºåž‹å·
        /// </summary>
        [ImporterHeader(Name = "工艺型号")]
        [ExporterHeader(DisplayName = "工艺型号")]
        [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "工艺型号")]
        public string ProductDesc { get; set; }

        /// <summary>
        /// å·¥è‰ºå‚数值
        /// </summary>
        [ImporterHeader(Name = "工艺参数值")]

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResponeRunDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,130 @@
namespace WIDESEA_DTO.MOM;

public class ParameterInfoDto
{
    /// <summary>
    /// å‚数编码
    /// </summary>
    public string ParameterCode { get; set; }

    /// <summary>
    /// å‚数类型
    /// </summary>
    public string ParameterType { get; set; }

    /// <summary>
    /// æŽ¨èå€¼
    /// </summary>
    public string TargetValue { get; set; }

    /// <summary>
    /// å•ä½
    /// </summary>
    public string UOMCode { get; set; }

    /// <summary>
    /// æŽ§åˆ¶ä¸Šé™å€¼
    /// </summary>
    public string UpperControlLimit { get; set; }

    /// <summary>
    /// æŽ§åˆ¶ä¸‹é™å€¼
    /// </summary>
    public string LowerControlLimit { get; set; }

    /// <summary>
    /// è§„格上限值
    /// </summary>
    public string UpperSpecificationsLimit { get; set; }

    /// <summary>
    /// è§„格下限值
    /// </summary>
    public string LowerSpecificationsLimit { get; set; }

    /// <summary>
    /// å‚数描述
    /// </summary>
    public string Description { get; set; }

    /// <summary>
    /// å·¥è‰ºè·¯çº¿ä¸Šå½“前设备参数信息是否可用(TRUE å¯ç”¨ /FALSE ä¸å¯ç”¨)
    /// </summary>
    public string EquipmentAvailabilityFlag { get; set; }
}

/// <summary>
/// å“åº”模型
/// </summary>
public class ResponeRunDto
{
    /// <summary>
    /// ä¼šè¯ID
    /// </summary>
    public string SessionId { get; set; }

    /// <summary>
    /// è¿”回时间
    /// </summary>
    public string ResponseTime { get; set; }

    /// <summary>
    /// è®¾å¤‡ç¼–号
    /// </summary>
    public string EquipmentCode { get; set; }

    /// <summary>
    /// æŠ¥æ–‡æŽ¥æ”¶ç»“æžœ
    /// </summary>
    public bool ResultFlag { get; set; }

    /// <summary>
    /// è¿”回状态码True：执行成功；False：执行失败
    /// </summary>
    public bool Success { get; set; }

    /// <summary>
    /// æ¶ˆæ¯ç±»åž‹
    /// </summary>
    public string MessageCode { get; set; }

    /// <summary>
    /// æ¶ˆæ¯
    /// </summary>
    public string MOMMessage { get; set; }

    /// <summary>
    /// å·¥å•ç¼–号
    /// </summary>
    public string WipOrderNo { get; set; }

    /// <summary>
    /// äº§å“åç§°
    /// </summary>
    public string ProductDesc { get; set; }

    /// <summary>
    /// é¦–件数量
    /// </summary>
    public string FirstArticleNum { get; set; }

    /// <summary>
    /// è°ƒæœºæ•°é‡
    /// </summary>
    public string DebugNum { get; set; }

    /// <summary>
    /// å‚数版本信息
    /// </summary>
    public string ParamVersion { get; set; }

    /// <summary>
    /// æ˜¯å¦éœ€è¦è¯»å–参数
    /// </summary>
    public bool ParamRefreshFlag { get; set; }

    /// <summary>
    /// å‚数信息数组
    /// </summary>
    public List<ParameterInfoDto> ParameterInfo { get; set; } = new List<ParameterInfoDto>();
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResultTrayCellsStatus.cs

@@ -2,15 +2,66 @@
{
    public class ResultTrayCellsStatus : BasicResult
    {
        /// <summary>
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        public string TrayBarcode { get; set; }

        /// <summary>
        /// ç”µèŠ¯åˆ—表
        /// </summary>
        public List<SerialNoDto> SerialNos { get; set; } = new List<SerialNoDto>();

        /// <summary>
        /// ç»‘定代码
        /// </summary>
        public string BindCode { get; set; }
        public List<TrayCellsSerialNos> SerialNos { get; set; }

        /// <summary>
        /// æ–™æ¡†å±žæ€§åˆ—表
        /// </summary>
        public List<TrayBarcodePropertyDto> TrayBarcodePropertys { get; set; } = new List<TrayBarcodePropertyDto>();
    }

    public class TrayCellsSerialNos
    /// <summary>
    /// ç”µèŠ¯ä¿¡æ¯æ¨¡åž‹
    /// </summary>
    public class SerialNoDto
    {
        /// <summary>
        /// ç”µèŠ¯å·
        /// </summary>
        public string SerialNo { get; set; }

        /// <summary>
        /// é€šé“号
        /// </summary>
        public int PositionNo { get; set; }

        /// <summary>
        /// ç”µèŠ¯çŠ¶æ€
        /// </summary>
        public int SerialNoStatus { get; set; }
    }

    /// <summary>
    /// æ–™æ¡†å±žæ€§æ¨¡åž‹
    /// </summary>
    public class TrayBarcodePropertyDto
    {
        /// <summary>
        /// æ–™æ¡†å±žæ€§
        /// </summary>
        public string TrayBarcodeProperty { get; set; }

        /// <summary>
        /// å·¥åº
        /// </summary>
        public string ProcessCode { get; set; }

        /// <summary>
        /// é€‚用物料编码/工艺型号
        /// </summary>
        public string ProductType { get; set; }
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs

@@ -132,4 +132,11 @@
    /// <param name="type"></param>
    /// <returns></returns>
    Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input);

    /// <summary>
    /// è¯·æ±‚空托盘任务
    /// </summary>
    /// <param name="position"></param>
    /// <returns></returns>
    Task<WebResponseContent> RequestTrayTaskAsync(string position);
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/CellState/CellStateService.cs

@@ -100,7 +100,7 @@
                DtBoxingInfo boxingInfo = new DtBoxingInfo()
                {
                    IsFull = true,
                    PalletCode = "",
                    PalletCode = result.TrayBarcode,
                };
                var details = new List<DtBoxingInfoDetail>();
                foreach (var item in result.SerialNos)
@@ -108,9 +108,10 @@
                    DtBoxingInfoDetail detail = new DtBoxingInfoDetail()
                    {
                        SerialNumber = item.SerialNo,
                        OrderNo = result.BindCode,
                        OrderNo = item.PositionNo.ToString(),
                        Status = item.SerialNoStatus,
                        BatchNo = item.PositionNo.ToString()
                        Remark = result.TrayBarcodePropertys.ToJsonString(),
                        MaterielCode = result.BindCode,
                    };
                    details.Add(detail);
                }

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/ProcessApply/ProcessApplyService.cs

@@ -33,10 +33,7 @@
            if (x != null)
            {
                var ResultProcess = JsonConvert.DeserializeObject<ResultProcessApply>(x);
                if (ResultProcess.Success)
                {
                    //工艺路线储存起来
                }
                content.OK(data: ResultProcess);
            }
            LogFactory.GetLog("工艺路线申请").Info(true, $"\r\r--------------------------------------");
            LogFactory.GetLog("工艺路线申请").Info(true, x);

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/bin/Debug/net6.0/WIDESEA_StoragIntegrationServices.deps.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Debug/net6.0/WIDESEA_StoragIntegrationServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs

@@ -135,7 +135,7 @@
                        LocationType = locType,
                        Remark = "",
                        Depth = locType > 1 ? (((line - 1) % 4) + 1) == 2 || (((line - 1) % 4) + 1) == 3 ? 1 : 2 : 1,
                        RoadwayNo = locType > 1 ? $"SC{((line - 1) / 4) + 1}" : $"SC{((line - 1) / 2) + 1}",
                        RoadwayNo = locType > 1 ? $"CHSC{((line - 1) / 4) + 1}" : $"CHSC{((line - 1) / 2) + 1}",
                        LocationStatus = LocationEnum.Free.ObjToInt(),
                        AreaId = areaId,
                        Creater = "systeam",
@@ -245,7 +245,7 @@
                SourceAddress = originalLocationID,
                TaskNum = taskNo,
                TargetAddress = emptyLocation.LocationCode,
                TaskState = TaskInStatusEnum.RelocationNew.ObjToInt(),
                //TaskState = TaskInStatusEnum.RelocationNew.ObjToInt(),
                TaskType = TaskTypeEnum.RelocationIn.ObjToInt(),
            };


 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -1,10 +1,10 @@
using Mapster;
using System.Collections.Generic;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IStoragIntegrationServices;
using WIDESEA_StoragIntegrationServices;
namespace WIDESEA_StorageOutTaskServices; 
using WIDESEA_StorageBasicRepository;

namespace WIDESEA_StorageOutTaskServices;

public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
@@ -25,6 +25,7 @@
    private readonly IBoxingInfoRepository _boxingInfoRepository;
    private readonly ICellStateService _cellStateService;
    private readonly IProcessApplyService _processApplyService;
    private readonly IDt_AreaInfoRepository _areaInfoRepository;

    public Dt_TaskService(IDt_TaskRepository BaseDal,
                                IUnitOfWorkManage unitOfWorkManage,
@@ -42,7 +43,8 @@
                                ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
                                IBoxingInfoRepository boxingInfoRepository,
                                ICellStateService cellStateService,
                                IProcessApplyService processApplyService) : base(BaseDal)
                                IProcessApplyService processApplyService,
                                IDt_AreaInfoRepository areaInfoRepository) : base(BaseDal)
    {
        _unitOfWorkManage = unitOfWorkManage;
        _outOrderRepository = outOrderRepository;
@@ -59,7 +61,8 @@
        _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
        _boxingInfoRepository = boxingInfoRepository;
        _cellStateService = cellStateService;
        _processApplyService = processApplyService
        _processApplyService = processApplyService;
        _areaInfoRepository = areaInfoRepository;
    }

    #region å¤–部接口方法
@@ -195,7 +198,7 @@

            // ä¿®æ”¹è´§ä½ä¿¡æ¯ä¸ºæœ‰è´§
            var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
            locationInf.LocationStatus = (int)LocationEnum.Lock;
            locationInf.LocationStatus = (int)LocationEnum.InStock;

            LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务完成", $"货位地址：{task.TargetAddress},修改后货位数据：{locationInf}");

@@ -241,7 +244,7 @@
        if (stock == null)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, "库存不存在存在，判断是否是入库任务", $"{task.TaskType}");
            if (task.TaskType == (int)TaskTypeEnum.Inbound)
            if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务", "");
                return await CompleteInboundTaskAsync(task);
@@ -254,7 +257,7 @@
        }
        LogFactory.GetLog("任务完成").InfoFormat(true, "验证库存是否存在", JsonConvert.SerializeObject(stock));

        if (task.TaskType == (int)TaskTypeEnum.Outbound)
        if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, "出库任务", "");
            if (task.TaskState == TaskOutStatusEnum.SC_OutExecuting.ObjToInt())
@@ -291,65 +294,156 @@
    /// <returns>包含任务信息的响应内容</returns>
    public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
    {
        // åˆ›å»ºä¸€ä¸ªWebResponseContent对象
        WebResponseContent content = new WebResponseContent();

        try
        {
            // æ ¹æ®æ‰˜ç›˜èŽ·å–库存信息
            //var stockInfo = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
            // åˆ›å»ºä¸€ä¸ªTrayCellsStatusDto对象，并赋值
            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
            {
                TrayBarcode = input.PalletCode
            };
            content = await _cellStateService.GetTrayCellStatusAsync(trayCells);
            if (content.Status)
            {
                ResultTrayCellsStatus result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());

                ProcessApplyDto process = new ProcessApplyDto()
                {
                    WipOrderNo = result.BindCode,
                    SerialNos = result.SerialNos.Select(item => new SerialNos
                    {
                        SerialNo = item.SerialNo
                    }).ToList()
                };
                content = await _processApplyService.GetProcessApplyAsync(process);
                if (content.Status)
                {
                    var X = SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>().Where(x => x.EquipmentType == "CH").ToList();
                }
            // è°ƒç”¨GetTrayCellStatusAsync方法，获取整盘电芯
            content = await GetTrayCellStatusAsync(trayCells);
            // å¦‚果状态为false，则返回content
            if (!content.Status) return content;

            }
            // è°ƒç”¨GetProcessApplyAsync方法，获取工艺申请
            ProcessApplyDto process = await GetProcessApplyAsync(content);
            // å¦‚æžœprocess为null，则返回content
            if (process == null) return content;

            // èŽ·å–仓库区域信息
            var areaInfo = await _wareAreaInfoRepository.QueryFirstAsync(x => x.WareAreaCode == input.AreaCode);
            // è°ƒç”¨GetProcessResponseAsync方法，获取工艺响应
            var processResponse = await GetProcessResponseAsync(process, input.Position);

            // æŸ¥è¯¢æ˜¯å¦å·²æœ‰ä»»åŠ¡
            // è°ƒç”¨BaseDal.QueryFirstAsync方法，查询任务
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);

            if (task != null)
            {
                // æ›´æ–°çŽ°æœ‰ä»»åŠ¡
                content = await UpdateExistingTask(input, areaInfo.AreaID, task);
            }
            else
            {
                // åˆ›å»ºæ–°ä»»åŠ¡
                content = await CreateNewTask(input, areaInfo.AreaID);
            }
            // å¦‚æžœtask不为null，则调用UpdateExistingTask方法，更新任务；否则调用CreateNewTask方法，创建新任务
            content = task != null ? await UpdateExistingTask(input, task) : await CreateNewTask(processResponse, input);
        }
        catch (Exception err)
        {
            // é”™è¯¯å¤„理
            // å¦‚果发生异常，则调用content.Error方法，记录错误信息，并输出错误信息
            content.Error(err.Message);
            Console.WriteLine(err.Message);
        }

        // è¿”回content
        return content;
    }

    // èŽ·å–托盘单元格状态
    private async Task<WebResponseContent> GetTrayCellStatusAsync(TrayCellsStatusDto trayCells)
    {
        // è°ƒç”¨_cellStateService.GetTrayCellStatusAsync方法，获取托盘单元格状态
        return await _cellStateService.GetTrayCellStatusAsync(trayCells);
    }

    // èŽ·å–工艺申请
    private async Task<ProcessApplyDto> GetProcessApplyAsync(WebResponseContent content)
    {
        // å¦‚果状态为false，则返回null
        if (!content.Status) return null;

        // å°†content.Data转换为ResultTrayCellsStatus对象
        var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
        // åˆ›å»ºä¸€ä¸ªProcessApplyDto对象，并赋值
        return new ProcessApplyDto()
        {
            WipOrderNo = result.BindCode,
            SerialNos = result.SerialNos.Select(item => new SerialNos
            {
                SerialNo = item.SerialNo
            }).ToList()
        };
    }

    // èŽ·å–工艺响应
    private async Task<List<Dt_EquipmentProcess>> GetProcessResponseAsync(ProcessApplyDto process, string position)
    {
        // å¦‚æžœprocess为null，则返回null
        if (process == null) return null;

        // è°ƒç”¨_processApplyService.GetProcessApplyAsync方法，获取工艺申请
        WebResponseContent content = await _processApplyService.GetProcessApplyAsync(process);
        // å¦‚果状态为false，则返回null
        if (!content.Status) return null;

        // å°†content.Data转换为ResultProcessApply对象
        var apply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
        // æ ¹æ®position的值，返回不同的Dt_EquipmentProcess列表
        switch (position)
        {
            case "1088":
                return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
                    .Where(x => x.EquipmentType == "陈化" && x.WipOrderNo == apply.WipOrderNo && x.ProductDesc == apply.ProductNo)
                    .ToList();

            default:
                return new List<Dt_EquipmentProcess>();
        }
    }

    #endregion è¯·æ±‚任务

    #region è¯·æ±‚空托盘

    public async Task<WebResponseContent> RequestTrayTaskAsync(string position)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "CH");

            var stockInfo = _stockInfoRepository.QueryData(x => x.Remark == area.AreaCode && x.StockInfoDetails.Any(z => z.MaterielCode == "空托盘")).OrderBy(x => x.CreateDate).FirstOrDefault();
            // åˆ›å»ºæ–°ä»»åŠ¡å®žä¾‹
            var task = new Dt_Task
            {
                CurrentAddress = stockInfo.LocationCode,
                Grade = 1,
                Roadway = stockInfo.LocationInfo.RoadwayNo,
                TargetAddress = position,
                Dispatchertime = DateTime.Now,
                MaterialNo = "",
                NextAddress = position,
                OrderNo = null,
                PalletCode = stockInfo.PalletCode,
                SourceAddress = stockInfo.LocationCode,
                TaskState = (int)TaskOutStatusEnum.OutNew,
                TaskType = (int)TaskOutboundTypeEnum.OutTray,
                TaskNum = await BaseDal.GetTaskNo(),
                Creater = "Systeam"
            };

            var taskId = await BaseDal.AddDataAsync(task);
            bool isResult = taskId > 0;
            if (isResult)
            {
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    TaskNum = task.TaskNum.Value,
                    Grade = 1,
                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
                    RoadWay = task.Roadway,
                    SourceAddress = stockInfo.LocationCode,
                    TargetAddress = task.Roadway,
                    TaskState = (int)TaskOutStatusEnum.OutNew,
                    Id = 0,
                    TaskType = (int)TaskOutboundTypeEnum.OutTray
                };
                content.OK(data: taskDTO);
            }
        }
        catch (Exception ex)
        {
            throw;
        }
        return content;
    }

    #endregion è¯·æ±‚空托盘

    #endregion å¤–部接口方法

@@ -640,7 +734,7 @@
    /// <param name="task">任务实例</param>
    /// <param name="content">响应内容</param>
    /// <returns></returns>
    private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, int areaId, Dt_Task task)
    private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
    {
        // åˆ›å»ºWebResponseContent对象
        WebResponseContent content = new WebResponseContent();
@@ -652,26 +746,26 @@
        int beforeStatus = 0;

        // æ ¹æ®ä»»åŠ¡ç±»åž‹åˆ¤æ–­æ˜¯å‡ºåº“任务还是入库任务
        if (input.Type == (int)TaskTypeEnum.Outbound)
        {
            // å¤„理出库任务
            toAddress = await GetRoadWayAsync(areaId, task.Roadway, input.Direction, input.Area, input.Type);
            taskState = (int)TaskOutStatusEnum.SC_OutFinish;
        }
        else
        {
            // å¤„理入库任务
            location = await GetLocationDistributeAsync(areaId, task.Roadway);
            toAddress = location.LocationCode;
            taskState = (int)TaskInStatusEnum.Line_InFinish;
            beforeStatus = location.LocationStatus;
        //if (input.Type == (int)TaskTypeEnum.Outbound)
        //{
        //    // å¤„理出库任务
        //    toAddress = await GetRoadWayAsync(areaId, task.Roadway, input.Direction, input.Area, input.Type);
        //    taskState = (int)TaskOutStatusEnum.SC_OutFinish;
        //}
        //else
        //{
        // å¤„理入库任务
        location = await GetLocationDistributeAsync(task.Roadway);
        toAddress = location.LocationCode;
        taskState = (int)TaskInStatusEnum.Line_InFinish;
        beforeStatus = location.LocationStatus;

            // æ›´æ–°è´§ä½ä¿¡æ¯
            location.LocationStatus = (int)LocationEnum.Lock;
        }
        // æ›´æ–°è´§ä½ä¿¡æ¯
        location.LocationStatus = (int)LocationEnum.Lock;
        //}

        // æ›´æ–°ä»»åŠ¡ä¿¡æ¯
        task.SourceAddress = input.Position;
        //task.SourceAddress = input.Position;
        task.CurrentAddress = input.Position;
        task.TargetAddress = toAddress;
        task.NextAddress = toAddress;
@@ -686,23 +780,21 @@
        // å°è¯•æ›´æ–°ä»»åŠ¡
        bool isResult = await BaseDal.UpdateDataAsync(task);
        bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
        if (input.Type != (int)TaskTypeEnum.Outbound)

        // åˆ›å»ºLocationChangeRecordDto对象
        LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
        {
            // åˆ›å»ºLocationChangeRecordDto对象
            LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
            {
                // è®¾ç½®å˜é‡
                AfterStatus = location.LocationStatus,
                BeforeStatus = beforeStatus,
                TaskNum = task.TaskNum.Value,
                LocationId = location.Id,
                LocationCode = location.LocationCode,
                ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
            };
            // æ›´æ–°ä½ç½®çŠ¶æ€
            isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
            isUpdateLo = await _locationRepository.UpdateDataAsync(location);
        }
            // è®¾ç½®å˜é‡
            AfterStatus = location.LocationStatus,
            BeforeStatus = beforeStatus,
            TaskNum = task.TaskNum.Value,
            LocationId = location.Id,
            LocationCode = location.LocationCode,
            ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
        };
        // æ›´æ–°ä½ç½®çŠ¶æ€
        isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
        isUpdateLo = await _locationRepository.UpdateDataAsync(location);

        if (isResult && isUpdateLo && isTaskDetail)
        {
@@ -726,11 +818,12 @@
    /// <param name="areaId">区域ID</param>
    /// <param name="content">响应内容</param>
    /// <returns></returns>
    private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, int areaId)
    private async Task<WebResponseContent> CreateNewTask(List<Dt_EquipmentProcess> process, RequestTaskDto input)
    {
        WebResponseContent content = new WebResponseContent();
        List<string> strings = process.Select(x => x.EquipmentName).ToList();
        // èŽ·å–目标地址
        string ToAddress = await GetRoadWayAsync(areaId, input.Position, input.Direction, input.Area, input.Type);
        string ToAddress = await GetRoadWayAsync(strings);

        // åˆ›å»ºæ–°ä»»åŠ¡å®žä¾‹
        var task = new Dt_Task
@@ -765,7 +858,7 @@
                    Grade = 1,
                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
                    RoadWay = task.Roadway,
                    SourceAddress = "001-001-001",
                    SourceAddress = input.Position,
                    TargetAddress = task.Roadway,
                    TaskState = (int)TaskInStatusEnum.InNew,
                    Id = 0,
@@ -787,13 +880,13 @@
    /// <param name="areaId">区域主键</param>
    /// <param name="roadWay">巷道</param>
    /// <returns></returns>
    public async Task<DtLocationInfo> GetLocationDistributeAsync(int areaId, string roadWay)
    public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay)
    {
        #region èŽ·å–货位

        try
        {
            var locations = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
            var locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
            if (locations == null)
            {
                return null;
@@ -818,36 +911,16 @@
    /// <param name="Direction">方向</param>
    /// <param name="area">关系区域</param>
    /// <returns></returns>
    public async Task<string> GetRoadWayAsync(int areaId, string position, string Direction, string area, int type)
    public async Task<string> GetRoadWayAsync(List<string> process)
    {
        var point = new PointStackerRelation();
        if (type == (int)TaskTypeEnum.Inbound)
        {
            point = await _pointStackerRelationRepository.QueryFirstAsync(x => x.Direction == Direction && x.PointCode == position && x.Area == area);
            if (point == null) { return null; }
            var locationInfos = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && point.StackerCode.Contains(x.RoadwayNo));
            var groupWithMinCount = locationInfos.GroupBy(x => x.RoadwayNo).OrderBy(x => x.Count()).FirstOrDefault();
        var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
            .GroupBy(x => x.RoadwayNo)
             .OrderBy(g => g.Count()) // æ ¹æ®æ¯ä¸ªç»„的元素数量排序
             .First(); // å–出数量最少的组

            if (groupWithMinCount != null)
                return groupWithMinCount.Key;
            else
                return null;
        }
        else if (type == (int)TaskTypeEnum.Outbound)
        {
            point = await _pointStackerRelationRepository.QueryFirstAsync(x => x.Direction == Direction && position == x.StackerCode && x.Area == area);
            if (point == null) { return null; }
        string minRoadwayNo = minGroup.Key; // æ•°é‡æœ€å°‘的组的Key

            string station = point.PointCodeList[0];

            var rList = point.PointCodeList;
            rList.Remove(station);
            rList.Add(station);

            point.PointCodeList = rList;
            return station;
        }
        else { return null; }
        return minRoadwayNo;
    }

    #endregion ä»»åŠ¡è¯·æ±‚方法

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Integration/CellStateController.cs

@@ -22,7 +22,7 @@

        // POST: api/CellState/GetTrayCellState
        [HttpPost("GetTrayCellState")]
        public Task<dynamic> GetTrayCellStateAsync([FromBody] TrayCellsStatusDto input)
        public Task<WebResponseContent> GetTrayCellStateAsync([FromBody] TrayCellsStatusDto input)
        {
            return _cellStateService.GetTrayCellStatusAsync(input);
        }

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Integration/ProcessApplyController.cs

@@ -21,8 +21,8 @@
    /// <returns></returns>
    // POST: api/ProcessApply/ProcessApply
    [HttpPost("ProcessApply")]
    public async Task<dynamic> ProcessApplyAsync([FromBody] ProcessApplyDto input)
    public async Task<WebResponseContent> ProcessApplyAsync([FromBody] ProcessApplyDto input)
    {
        return await _processApplyService.ProcessApplyAsync(input);
        return await _processApplyService.GetProcessApplyAsync(input);
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs

@@ -23,9 +23,9 @@
    }

    /// <summary>
    /// å‡ºåº“任务完成
    /// ä»»åŠ¡å®Œæˆ
    /// </summary>
    /// <param name="saveModel">出库数据</param>
    /// <param name="saveModel">任务号</param>
    /// <returns>成功或失败</returns>
    [HttpGet, Route("CompleteTaskAsync"), AllowAnonymous]
    public async Task<WebResponseContent> CompleteTaskAsync(int taskNum)
@@ -54,4 +54,15 @@
    {
        return await Service.RequestTaskAsync(input);
    }

    /// <summary>
    /// ç©ºæ‰˜ç›˜è¯·æ±‚
    /// </summary>
    /// <param name="input">请求数据</param>
    /// <returns></returns>
    [HttpPost, AllowAnonymous, Route("RequestTrayTaskAsync")]
    public async Task<WebResponseContent> RequestTrayTaskAsync([FromBody] string position)
    {
        return await Service.RequestTrayTaskAsync(position);
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.xml

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.xml

ÎļþÒÑɾ³ý