1

huanghongfeng

14 小时以前 b1c2dd1869a51b8f0e4acb9ddeb148f796db147f

1

 ÏîÄ¿´úÂë/DP/src/views/home.vue

@@ -91,7 +91,7 @@
      let timer = setTimeout(() => {
        this.loading = false;
        clearTimeout(timer);
      }, 500);
      }, 1500);
    },
  },
};

 ÏîÄ¿´úÂë/DP/src/views/indexs/center-map.vue

@@ -10,12 +10,12 @@
          autoplay 
          preload="auto"
          muted
          @click="unmuteVideo"
          @click="handleVideoClick"
        >
          æ‚¨çš„浏览器不支持视频播放。
        </video>
        <div v-if="isMuted" class="mute-hint" @click="unmuteVideo">
          <span>点击取消静音（5秒后自动播放声音）</span>
        <div v-if="showUnmuteButton" class="unmute-button" @click="unmuteVideo">
          <span>🔇 ç‚¹å‡»å–消静音</span>
        </div>
      </dv-border-box-13>
    </div>
@@ -26,45 +26,81 @@
export default {
  data() {
    return {
      isMuted: false,
      unmuteTimeout: null // å­˜å‚¨å®šæ—¶å™¨ä»¥ä¾¿æ¸…理
      showUnmuteButton: true, // æ˜¾ç¤ºå–消静音按钮
      hasUserInteracted: false, // è®°å½•ç”¨æˆ·æ˜¯å¦å·²äº¤äº’
      wasPlaying: false // è®°å½•è§£é™¤é™éŸ³å‰çš„播放状态
    };
  },
  mounted() {
    this.initVideo();
    this.adjustVideoSize();
    window.addEventListener('resize', this.adjustVideoSize);

    // 5秒后自动取消静音
    this.unmuteTimeout = setTimeout(() => {
      this.unmuteVideo();
    }, 5000);
  },
  beforeDestroy() {
    window.removeEventListener('resize', this.adjustVideoSize);
    if (this.unmuteTimeout) {
      clearTimeout(this.unmuteTimeout); // æ¸…除定时器避免内存泄漏
    const video = this.$refs.videoPlayer;
    if (video) {
      video.removeEventListener('error', this.handleVideoError);
    }
  },
  methods: {
    initVideo() {
    async initVideo() {
      const video = this.$refs.videoPlayer;
      if (video) {
        video.addEventListener('ended', () => {
          video.currentTime = 0;
          video.play();
        });
        // ç¡®ä¿è§†é¢‘以静音状态开始
        video.muted = true;
        
        // æ·»åŠ é”™è¯¯ç›‘听
        video.addEventListener('error', this.handleVideoError);
        
        // å°è¯•è‡ªåŠ¨æ’­æ”¾ï¼ˆé™éŸ³çŠ¶æ€ä¸‹é€šå¸¸å…è®¸ï¼‰
        try {
          await video.play();
          this.wasPlaying = true;
        } catch (error) {
          console.log('自动播放被阻止:', error);
        }
      }
      document.addEventListener('click', this.unmuteVideo, { once: true });
    },
    unmuteVideo() {
    
    handleVideoClick() {
      if (!this.hasUserInteracted) {
        this.hasUserInteracted = true;
        // ç”¨æˆ·ç¬¬ä¸€æ¬¡ç‚¹å‡»è§†é¢‘时尝试解除静音
        this.unmuteVideo();
      }
    },
    
    async unmuteVideo() {
      const video = this.$refs.videoPlayer;
      if (video) {
      if (!video) return;
      
      // è®°å½•å½“前播放状态
      this.wasPlaying = !video.paused;
      
      try {
        // å…ˆç¡®ä¿è§†é¢‘在播放
        if (this.wasPlaying) {
          await video.play();
        }
        
        // è§£é™¤é™éŸ³
        video.muted = false;
        video.volume = 1.0;
        this.isMuted = false;
        
        // éšè—å–消静音按钮
        this.showUnmuteButton = false;
      } catch (error) {
        console.error('解除静音失败:', error);
        // æ˜¾ç¤ºæç¤ºï¼Œå‘ŠçŸ¥ç”¨æˆ·éœ€è¦äº¤äº’才能播放声音
        this.showUnmuteButton = true;
      }
    },
    
    handleVideoError(e) {
      const video = e.target;
      console.error('视频错误:', video.error);
    },
    
    adjustVideoSize() {
      const video = this.$refs.videoPlayer;
      if (video) {
@@ -78,7 +114,6 @@
</script>

<style scoped>
/* æ ·å¼ä¿æŒä¸å˜ */
.centermap {
  width: 100%;
  height: 100%;
@@ -106,18 +141,27 @@
  width: 100%;
  height: 100%;
  object-fit: cover;
  cursor: pointer;
}

.mute-hint {
.unmute-button {
  position: absolute;
  top: 50%;
  left: 50%;
  transform: translate(-50%, -50%);
  background: rgba(0,0,0,0.7);
  bottom: 20px;
  right: 20px;
  background: rgba(0, 0, 0, 0.7);
  color: white;
  padding: 10px 20px;
  border-radius: 5px;
  padding: 8px 16px;
  border-radius: 20px;
  cursor: pointer;
  z-index: 10;
  font-size: 14px;
  display: flex;
  align-items: center;
  gap: 8px;
  transition: all 0.3s ease;
  
  &:hover {
    background: rgba(0, 0, 0, 0.9);
  }
}
</style>

 ÏîÄ¿´úÂë/DP/src/views/indexs/station-one.vue

@@ -34,7 +34,7 @@
  },
  methods: {
    fetchData() {
      axios.post("http://127.0.0.1:5000/api/LocationInfo/LocationStatus", null)
      axios.post("http://172.21.1.139:5000/api/LocationInfo/LocationStatus", null)
        .then((response) => {
          this.tableData = [];
          response.forEach(item => {

 ÏîÄ¿´úÂë/DP/src/views/indexs/station-two.vue

@@ -38,7 +38,7 @@
    },
    methods: {
        fetchData() {
      axios.post("http://127.0.0.1:5000/api/Dt_WheelsStock/InventoryStatistics", null)
      axios.post("http://172.21.1.139:5000/api/Dt_WheelsStock/InventoryStatistics", null)
        .then((response) => {
          this.tableData = [];
          response.forEach(item => {

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json

@@ -14,12 +14,15 @@
  //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
  //"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
  //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",

  "ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
  //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=172.21.1.139;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=Admin123;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  
  //"ConnectionString": "Data Source=172.21.1.139;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=Admin123;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称

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

@@ -911,6 +911,8 @@
            }
        }


        //读取申请，给agv下发任务
        public WebResponseContent GetAGVTaskdistribution(string TargetAddress)
        {

@@ -927,6 +929,7 @@
                var wmsIpAddress = wmsBase + completeTask;
                var taskDto = new RequestTaskDto()
                {
                    RequestType = "999",
                    Position = TargetAddress,
                };


 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -378,9 +378,8 @@
            else
            {
                conveyorLine.SetValue(ConveyorLineDBName.ResponState, 2, stationInfo.stationChildCode);
                Console.Out.WriteLine($"读取到输送线申请,申请条码：{command.Number}，未找到,写入申诉信故障：2");
                Console.Out.WriteLine($"读取到输送线申请,申请条码：{command.Number}，未找到任务，申请下一地址为：{stationInfo.stationChildCode},写入申诉信故障：2");
            }
            //_taskService.UpdatePosition(task.TaskNum, stationInfo.stationChildCode);
        }

        #region è½¦è½´çº¿äº¤äº’
@@ -415,7 +414,6 @@
        /// <param name="ProtocalDetailValue">线体当前bool读取偏移地址</param>
        public void RequestTakeCZ(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManager stationInfo)
        {

            WebResponseContent content = _taskService.UpdateAxleCurrentStatue(command.Number);
            if (content.Status)
            {

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/Home.vue

@@ -10,7 +10,7 @@
        <el-button class="bun1" type="danger" v-if="item.stationStatus === '0'"
          v-on:click="selectss(1)">1号压装机</el-button>
        <p>
          2号压装机 :
          1号压装机 :
          <el-tag type="success" v-if="item.stationStatus === '1'">启用</el-tag>
          <el-tag type="danger" v-if="item.stationStatus === '0'">禁用</el-tag>
        </p>
@@ -23,7 +23,7 @@
        <el-button class="bun2" type="danger" v-if="item.stationStatus === '0'"
          v-on:click="selectss(2)">2号压装机</el-button>
        <p>
          1号压装机 :
          2号压装机 :
          <el-tag type="success" v-if="item.stationStatus === '1'">启用</el-tag>
          <el-tag type="danger" v-if="item.stationStatus === '0'">禁用</el-tag>
        </p>

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue

@@ -26,11 +26,18 @@
        const editFormFields = ref({ "locationStatus": "" });
        const editFormOptions = ref([
            [
                { "title": "货位状态", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] }, 
                { "title": "是否禁用", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] }, 
                { "title": "货位状态", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
                { "title": "是否禁用", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] },
            ]
        ]);
        const searchFormFields = ref({ "LocationID": "",roadWayNO:"","column":"","row":"","layer":"" });
        const searchFormFields = ref({
            locationCode:"",
            locationStatus:"",
            roadWayNO:"",
            column:"",
            enalbeStatus:"",
            depth:"",
        });
        const searchFormOptions = ref([
            [
                { "title": "货位编号", "field": "locationCode", type: "text" },
@@ -38,9 +45,9 @@
                { "title": "巷道编号", "field": "roadWayNO", type: "text" },
            ],
            [
                { "title": "行", "field": "row", type: "int" },
                { "title": "列", "field": "column", type: "int" },
                { "title": "层", "field": "layer", type: "int" },
                { "title": "行", "field": "row", type: "text" },
                { "title": "列", "field": "column", type: "text" },
                { "title": "层", "field": "layer", type: "text" },
            ],
            [
                { "title": "是否禁用", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] },
@@ -51,23 +58,23 @@
        const columns = ref([{ field: 'id', title: '货位ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
        { field: 'locationCode', title: '货位编号', type: 'string', width: 110, require: true, align: 'left' },
        { field: 'locationName', title: '货位名称', type: 'string', width: 120, align: 'left' },
        { field: 'roadwayNo', title: '巷道号', type: 'string', width: 110, require: true, align: 'left'},
        { field: 'roadwayNo', title: '巷道号', type: 'string', width: 110, require: true, align: 'left' },
        { field: 'row', title: '行', type: 'int', width: 70, align: 'left' },
        { field: 'column', title: '列', type: 'int', width: 70, align: 'left' },
        { field: 'layer', title: '层', type: 'int', width: 70, align: 'left' },
        { field: 'depth', title: '深度', type: 'string', width: 110, align: 'left' },
        { field: 'scNo', title: '对应堆垛机号', type: 'string', width: 110, align: 'left', hidden: true },
        { field: 'locationType', title: '货位类型', type: 'int', width: 110, align: 'left',bind: { key: "LocationType", data: [] } },
        { field: 'locationType', title: '货位类型', type: 'int', width: 110, align: 'left', bind: { key: "LocationType", data: [] } },
        { field: 'locationStatus', title: '货位状态', type: 'int', width: 110, align: 'left', bind: { key: "LocationState", data: [] } },
        { field: 'enalbeStatus', title: '是否禁用', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] }}, 
        { field: 'enalbeStatus', title: '是否禁用', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] } },
        // { field: 'isLocked', title: '是否锁定', type: 'bool', width: 110, align: 'left', bind: { key: "IsLocked", data: [] } },
        { field: 'locationDesc', title: '货位描述', type: 'string', width: 110, align: 'left', hidden: true },
        { field: 'remark', title: '备注', type: 'string', width: 110, align: 'left' ,bind: { key: "AllowStatus", data: [] }},
        { field: 'remark', title: '备注', type: 'string', width: 110, align: 'left', bind: { key: "AllowStatus", data: [] } },
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },
        { field: 'modifyDate', title: '修改时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
    ]);
        ]);
        const detail = ref({
            cnName: "#detailCnName",
            table: "#detailTable",

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_Traintype.vue

@@ -2,7 +2,7 @@
*Author：jxx
 *Contact：283591387@qq.com
 *代码由框架生成,任何更改都可能导致被代码生成器覆盖
 *业务请在@/extension/widesea_wms/basicinfo/Dt_AreaInfo.js此处编写
 *业务请在@/extension/widesea_wms/basicinfo/Dt_LocationInfo.js此处编写
 -->
<template>
    <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
@@ -16,7 +16,7 @@
export default defineComponent({
    setup() {
        const table = ref({
            key: 'Id',
            key: 'id',
            footer: "Foots",
            cnName: '车型管理',
            name: 'basicinfo/Dt_Traintype',
@@ -24,8 +24,8 @@
            sortName: "id"
        });
        const editFormFields = ref({
            "traintype_code": "",
            "traintype_name": ""
            traintype_code:"",
            traintype_name:""
        });
        const editFormOptions = ref([
            [
@@ -33,14 +33,17 @@
                { "title": "车型名称", "field": "traintype_name", type: "text" },
            ]
        ]);
        const searchFormFields = ref({});
        const searchFormFields = ref({
            "traintype_code": "",
            "traintype_name": ""
        });
        const searchFormOptions = ref([
            [
                { "title": "车型代码", "field": "traintype_code", type: "text" },
                { "title": "车型名称", "field": "traintype_name", type: "text" },
                { "title": "车型代码", "field": "traintype_code", type: "like" },
                { "title": "车型名称", "field": "traintype_name", type: "like" },
            ]
        ]);
        const columns = ref([{ field: 'ID', title: '主键', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
        const columns = ref([{ field: 'id', title: '主键', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
        { field: 'traintype_code', title: '车型代码', type: 'string', sort: true, width: 90, align: 'left',},
        { field: 'traintype_name', title: '车型名称', type: 'int', sort: true, width: 90, align: 'left' },
        { field: 'traintype_des', title: '描述', type: 'int', sort: true, width: 200,  align: 'left' },

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/LocationStatusChange.vue

@@ -28,7 +28,7 @@
        const searchFormFields = ref({});
        const searchFormOptions = ref([
            [
                { "title": "货位编号", "field": "locationCode", type: "text" },
                { "title": "货位编号", "field": "locationCode", type: "like" },
                { "title": "变动前货位状态", "field": "BeforeStatus", "type": "select", dataKey: "LocationState", data: [] },
                { "title": "变动后货位状态", "field": "AfterStatus", "type": "select", dataKey: "LocationState", data: [] },
                { "title": "变动类型", "field": "changeType", type: "select", dataKey: "StatusChangeType", data: []  },

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue

@@ -37,7 +37,7 @@
            wheels_mttype:"",
            wheelsProps:"",
            wheels_level:"",
            creater:"",
            createDate:"",
        });
        const searchFormOptions = ref([
            [
@@ -53,7 +53,7 @@
            ],
            [
                { "title": "等级", "field": "wheels_level", type: "text" },
                { "title": "创建时间", "field": "creater", type: "datetime" },
                { "title": "创建时间", "field": "createDate", type: "datetime" },
            ]
        ]);
        const columns = ref([

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue

@@ -50,7 +50,7 @@
            wheels_mttype:"",
            wheelsProps:"",
            wheels_level:"",
            creater:"",
            createDate:"",
        });
        const searchFormOptions = ref([
            [
@@ -66,7 +66,7 @@
            ],
            [
                { "title": "等级", "field": "wheels_level", type: "text" },
                { "title": "创建时间", "field": "creater", type: "datetime" },
                { "title": "创建时间", "field": "createDate", type: "datetime" },
            ]
        ]);
        const columns = ref([

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue

@@ -40,7 +40,7 @@
        });
        const searchFormOptions = ref([
            [
                { "title": "车轮条码", "field": "Wheels_code", type: "text" },
                { "title": "车轮条码", "field": "Wheels_code", type: "like" },
                { "title": "车型", "field": "Wheels_CarType", type: "select", dataKey: "traintype_names", data: [] },
                //{ "title": "库存类型", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
                { "title": "轮型", "field": "wheels_ldxh", type: "text" },
@@ -83,6 +83,8 @@
       
            { field: 'wheels_ljz', title: '轮径值', type: 'string', sort: true, width: 100, align: 'left' },
            { field: 'wheels_ygljz', title: '预估轮径值', type: 'string', sort: true, width: 100, align: 'left' },
            { field: 'wheels_Statue', title: '存期状态', type: 'int', sort: true, width: 100, align: 'left' },
            { field: 'wheels_DateDet', title: '当前库存天数', type: 'int', sort: true, width: 100, align: 'left' },
            { field: 'wheels_InDate', title: '入库日期', type: 'string',width: 100, align: 'left' },
            { field: 'creater', title: '创建人', type: 'string',  width: 100, align: 'left' },
            { field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 100, align: 'left' },

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs

@@ -73,7 +73,15 @@
                    LinqExpressionType expressionType = searchParametersList[i].DisplayType.GetLinqCondition();
                    if (expressionType == LinqExpressionType.Equal)
                    {
                        where += $"{searchParametersList[i].Name} {HtmlElementType.Equal} '{results[j].Item3}'";
                        if(searchParametersList[i].Name == "column")
                        {
                            where += $"[{searchParametersList[i].Name}] {HtmlElementType.Equal} '{results[j].Item3}'";
                        }
                        else
                        {
                            where += $"{searchParametersList[i].Name} {HtmlElementType.Equal} '{results[j].Item3}'";
                        }
                        
                    }
                    else if (expressionType == LinqExpressionType.ThanOrEqual)
                    {

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs

@@ -498,21 +498,30 @@
        /// <returns></returns>
        public virtual PageGridData<TEntity> QueryPage(string where, int pageIndex, int pageSize, Dictionary<string, OrderByType> orderBy)
        {
            List<OrderByModel> orderByModels = new List<OrderByModel>();
            foreach (var item in orderBy)
            try
            {
                OrderByModel orderByModel = new OrderByModel()
                List<OrderByModel> orderByModels = new List<OrderByModel>();
                foreach (var item in orderBy)
                {
                    FieldName = item.Key,
                    OrderByType = item.Value
                };
                orderByModels.Add(orderByModel);
            }
            int totalCount = 0;
            List<TEntity> list = _db.Queryable<TEntity>()
                .WhereIF(!string.IsNullOrEmpty(where), where).OrderBy(orderByModels).IncludesAllFirstLayer().ToPageList(pageIndex, pageSize, ref totalCount);
                    OrderByModel orderByModel = new OrderByModel()
                    {
                        FieldName = item.Key,
                        OrderByType = item.Value
                    };
                    orderByModels.Add(orderByModel);
                }
                int totalCount = 0;
                List<TEntity> list = _db.Queryable<TEntity>()
                    .WhereIF(!string.IsNullOrEmpty(where), where).OrderBy(orderByModels).IncludesAllFirstLayer().ToPageList(pageIndex, pageSize, ref totalCount);

            return new PageGridData<TEntity>(totalCount, list);

                return new PageGridData<TEntity>(totalCount, list);
            }
            catch (Exception ex)
            {

                throw;
            }
        }

        /// <summary>

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs

@@ -96,6 +96,8 @@

        public const string TempHour = "TempHour";

        public const string InventoryMarket = "InventoryMarket";

        /// <summary>
        /// è¯·æ±‚wcs，写入输送线反馈
        /// </summary>

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs

@@ -8,6 +8,7 @@
    Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld, string wheelsProps);

    WebResponseContent InventoryStatistics();
    WebResponseContent UpdateInventoryStatue();

    
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtLocationInfo.cs

@@ -46,7 +46,7 @@
    /// è´§ä½åˆ—
    /// </summary>
    [SugarColumn(IsNullable = false, ColumnDescription = "货位列")]
    public int Column { get; set; }
    public int Column{ get; set; }

    /// <summary>
    /// è´§ä½å±‚

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes.cs

@@ -1,4 +1,5 @@
using AngleSharp.Text;
using Magicodes.ExporterAndImporter.Core;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -16,24 +17,28 @@
        /// <summary>
        /// ä¸»é”®
        /// </summary>
        [ExporterHeader(DisplayName = "主键", IsIgnore = true)]
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]
        public int Wheels_ID { get; set; }

        /// <summary>
        /// è½¦è½®å·
        /// </summary>
        [ExporterHeader(DisplayName = "车轮条码")]
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "车轮条码")]
        public string Wheels_code { get; set; }

        /// <summary>
        /// ç±»åˆ«  (车轮/ åˆ¶åŠ¨ç›˜)
        /// </summary>
        [ExporterHeader(DisplayName = "车轮", IsIgnore = true)]
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "类别(车轮/制动盘)")]
        public string Wheels_Type { get; set; }

        /// <summary>
        /// çŠ¶æ€   1-创建  2-入库 3-完成 4-删除
        /// </summary>
        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "状态")]
        public string Wheels_CurrentStatue { get; set; }
        /// <summary>
@@ -44,112 +49,131 @@
        /// <summary>
        /// è½¦è½®æ¡ç 
        /// </summary>
        [ExporterHeader(DisplayName = "车轮条码",IsIgnore =true)]
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "车轮条码")]
        public string Wheels_Num { get; set; }

        /// <summary>
        /// è½®å¯¹æ¡ç 
        /// </summary>
        [ExporterHeader(DisplayName = "轮对条码")]
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "轮对条码")]
        public string Wheels_ldtm { get; set; }

        /// <summary>
        /// è½¦åž‹
        /// </summary>
        [ExporterHeader(DisplayName = "车型")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "车型")] 
        public string Wheels_CarType { get; set; }

        /// <summary>
        /// é…å±žå±€
        /// </summary>
        [ExporterHeader(DisplayName = "配属局")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "配属局")] 
        public string Wheels_psj { get; set; }

        /// <summary>
        /// è½¦ç»„号
        /// </summary>
        [ExporterHeader(DisplayName = "车组号")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "车组号")] 
        public string Wheels_CarNo { get; set; }

        /// <summary>
        /// è½®å¯¹å·
        /// </summary>
        [ExporterHeader(DisplayName = "轮对号")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "轮对号")]
        public string Wheels_ldh { get; set; }

        /// <summary>
        /// è½®å¯¹åž‹å·
        /// </summary>
        [ExporterHeader(DisplayName = "轮对型号")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "轮对型号")]
        public string Wheels_ldxh { get; set; }

        /// <summary>
        /// åŠ¨æ‹–属性M：动,T：拖  M/T：动拖通用
        /// </summary>
        [ExporterHeader(DisplayName = "动拖属性")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "动拖属性")]
        public string Wheels_mttype { get; set; }

        /// <summary>
        ///  æ–°æ—§å±žæ€§   1：旧  0 ï¼šæ–°
        /// </summary>
        [ExporterHeader(DisplayName = "新旧属性  0 : æ–°   /  1 : æ—§  ")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "新旧类型")]
        public string Wheels_NewOrOld { get; set; }

        /// <summary>
        /// å±žæ€§
        /// </summary>
        [ExporterHeader(DisplayName = "车轮属性")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "车轮属性")]
        public string WheelsProps { get; set; }

        /// <summary>
        /// ç­‰çº§
        /// </summary>
        [ExporterHeader(DisplayName = "等级")]
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "等级")]
        public string Wheels_level { get; set; }

        /// <summary>
        /// æ¯‚å­”a界面均值
        /// </summary>
        [ExporterHeader(DisplayName = "毂孔a界面均值")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "毂孔a界面均值")]
        public string Wheels_gkzja { get; set; }
        /// <summary>
        /// æ¯‚å­”b界面均值
        /// </summary>
        [ExporterHeader(DisplayName = "毂孔b界面均值")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "毂孔b界面均值")]
        public string Wheels_gkzjb { get; set; }
        /// <summary>
        /// æ¯‚å­”c界面均值
        /// </summary>
        [ExporterHeader(DisplayName = "毂孔c界面均值")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "毂孔c界面均值")]
        public string Wheels_gkzjc { get; set; }

        /// <summary>
        /// æ¯‚孔均值
        /// </summary>
        [ExporterHeader(DisplayName = "毂孔均值")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "毂孔均值")]
        public string Wheels_gkcc { get; set; }

        /// <summary>
        /// è½®å¾„值
        /// </summary>
        [ExporterHeader(DisplayName = "轮径值")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "轮径值")]
        public string Wheels_ljz { get; set; }

        /// <summary>
        /// é¢„估轮径值
        /// </summary>
        [ExporterHeader(DisplayName = "预估轮径值")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "预估轮径值")] 
        public string Wheels_ygljz { get; set; }

        /// <summary>
        /// å…¥åº“日期
        /// </summary>
        [ExporterHeader(DisplayName = "入库日期")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "入库日期")]
        public string Wheels_InDate { get; set; }

        /// <summary>
        /// è½®ç¼˜
        /// </summary>
        [ExporterHeader(DisplayName = "轮缘")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "轮缘")]
        public string Wheels_LYH { get; set; }
    }

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs

@@ -1,4 +1,5 @@
using SqlSugar;
using Magicodes.ExporterAndImporter.Core;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -8,19 +9,21 @@

namespace WIDESEA_Model.Models
{
    [SugarTable(nameof(Dt_InZdp_mes_hty), "MES制动盘历史信息")]
    [SugarTable(nameof(Dt_InWheels_mes_hty), "MES制动盘历史信息")]

    public class Dt_InZdp_mes_hty : Dt_InZdp_mes
    public class Dt_InWheels_mes_hty : Dt_InWheels_mes
    {
        /// <summary>
        /// å®Œæˆæ—¶é—´
        /// </summary>
        [ExporterHeader(DisplayName = "完成时间", IsIgnore = true)]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "完成时间")]
        public DateTime? FinishDate { get; set; } = DateTime.Now;

        /// <summary>
        /// å®Œæˆæ–¹å¼
        /// </summary>
        [ExporterHeader(DisplayName = "完成方式", IsIgnore =true)]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "完成方式")]
        public int OperateType { get; set; }
    }

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_WheelsStock.cs

@@ -212,5 +212,22 @@
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "轮缘")]
        public string Wheels_LYH { get; set; }


        /// <summary>
        /// å­˜æœŸçŠ¶æ€  ï¼ˆ0表示正常   1表示超期）
        /// </summary>
        [ImporterHeader(Name = "存期状态")]
        [ExporterHeader(DisplayName = "存期状态")]
        [SugarColumn(IsNullable = false, ColumnDescription = "存期状态")]
        public int Wheels_Statue { get; set; }

        /// <summary>
        /// å½“前库存天数
        /// </summary>
        [ImporterHeader(Name = "当前库存天数")]
        [ExporterHeader(DisplayName = "当前库存天数")]
        [SugarColumn(IsNullable = false, ColumnDescription = "当前库存天数")]
        public int Wheels_DateDet { get; set; } = 0;

    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs

@@ -26,11 +26,20 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                if (input.RequestType == "999")
                {
                    int CZInfotli = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "3").Count();
                    if (CZInfotli == 0)
                    {
                        return content.Error($"没有自动取轴任务，无自动任务");
                    }
                }

                if (string.IsNullOrEmpty(input.Position)) { return content.Error($"agv任务下发申请目标地址为空！！！请检查"); }

                //查找当前在车轴线末端需要agv搬运的车轴

                List<Dt_CZInfo_mes> CZInfotlist = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "3" || x.CurrentStatue == "4" || x.CurrentStatue == "5" || x.CurrentStatue == "13");
                List<Dt_CZInfo_mes> CZInfotlist = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "3" /*|| x.CurrentStatue == "4" || x.CurrentStatue == "5"*/ || x.CurrentStatue == "13");

                if (CZInfotlist.Count >= 2) { return content.Error($"已有agv任务正在进行中，下发失败！！！"); }

@@ -59,7 +68,7 @@
                //agv参数调取
                genAgvSchedulingTask schedulingTask = new genAgvSchedulingTask
                {
                    reqCode = Guid.NewGuid().ToString().Replace("-", ""),
                    reqCode = $"{DateTime.Now:yyyyMMddHHmmss}",
                    clientCode = "WMS",
                    taskTyp = "BY",
                    ctnrTyp = "1",
@@ -108,7 +117,7 @@
            catch (Exception ex)
            {
                LogFactory.GetLog("下发AGV任务").Error(true, ex.Message);
                return content.Error($"请求异常：{ex.Message}");
                return content.Error($"下发任务接口异常：{ex.Message}");
            }
        }
    }

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs

@@ -18,7 +18,7 @@
    public partial class ToAPPService
    {
        /// <summary>
        /// ä¿å­˜è½¦è½´æ•°æ®
        /// ä¿å­˜è½¦è½´æ•°æ®ï¼ˆè½¦è½®é€‰é…ï¼‰
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
@@ -165,7 +165,7 @@

                string wheelsProps = CheckTaskChangeHelper.CheckTaskwheelsProps(wxrw);

                Dt_SelectionStandards selectionStandards = _SelectionStandardsRepository.QueryFirst(x => x.CarType== Cartype && x.mttype == mttype && x.neworold == newOrOld && level.Contains(x.gkdj));
                Dt_SelectionStandards selectionStandards = _SelectionStandardsRepository.QueryFirst(x => x.CarType.Contains(Cartype) && x.mttype == mttype && x.neworold == newOrOld && level.Contains(x.gkdj));
                if (selectionStandards == null) throw new Exception($"此车型{Cartype}的选配标准异常,请核对选配标准信息!");

                Dt_CZInfo_mes CZInfo_Mes = new Dt_CZInfo_mes

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs

@@ -68,7 +68,7 @@

                

                inf2o.ZPH = "20231021-0019/25103295 0011";
                /*inf2o.ZPH = "20231021-0019/25103295 0011";
                inf2o.CHEXING = "CRH1A";
                inf2o.NEWOLD = "旧";
                inf2o.POS = "中间";
@@ -90,7 +90,7 @@
                inf2o.GKJZ = "0.22";
                inf2o.LSCSYMH = "0.42";
                inf2o.LMCSYMH = "0.031";
                inf2o.RKSJ = DateTime.Now.ToString();
                inf2o.RKSJ = DateTime.Now.ToString();*/
              



 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs

@@ -15,6 +15,9 @@
using Autofac.Core;
using NetTaste;
using AngleSharp.Io;
using WIDESEA_IRepository;
using WIDESEA_Core.Const;
using WIDESEA_IServices;

namespace WIDESEA_StorageBasicService;

@@ -23,11 +26,13 @@
    private readonly IDt_WheelsStock_htyRepository _WheelsStock_HtyRepository;
    private readonly IDt_SelectionStandardsRepository _SelectionStandardsRepository;
    private readonly IToZYService _toZYService;
    public Dt_WheelsStockService(IDt_WheelsStockRepository BaseDal, IDt_WheelsStock_htyRepository WheelsStock_HtyRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IToZYService toZYService) : base(BaseDal)
    private readonly ISys_ConfigService _sys_ConfigService;
    public Dt_WheelsStockService(IDt_WheelsStockRepository BaseDal, IDt_WheelsStock_htyRepository WheelsStock_HtyRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IToZYService toZYService, ISys_ConfigService ISys_ConfigService) : base(BaseDal)
    {
        _SelectionStandardsRepository = selectionStandardsRepository;
        _WheelsStock_HtyRepository = WheelsStock_HtyRepository;
        _toZYService = toZYService;
        _sys_ConfigService = ISys_ConfigService;
    }

    /// <summary>
@@ -259,21 +264,72 @@

        //获取车型
        List<string> Wheels_CarTypeList = stockInfos.Select(x => x.Wheels_CarType).Distinct().ToList();
        List<WheelGroupInfo> groupedData = new List<WheelGroupInfo>();

        foreach (var CarType in Wheels_CarTypeList)
        {
            content.Data = stockInfos.Where(x => x.Wheels_CarType == CarType).GroupBy(w => w.Wheels_ldxh)
           .Select(typeGroup => new
            var kd = stockInfos.Where(x => x.Wheels_CarType == CarType).GroupBy(w => w.Wheels_ldxh)
           .Select(typeGroup => new WheelGroupInfo
           {
               Wheels_CarType = CarType,    //车型
               Wheels_ldxh = typeGroup.Key,
               Count = typeGroup.Count(),

           }).ToList();

            groupedData.AddRange(kd);
        }
        content.Data = groupedData;
        return content;
    }


    public class WheelGroupInfo
    {
        public string Wheels_CarType { get; set; }
        public string Wheels_ldxh { get; set; }
        public int Count { get; set; }
        
    }


    public WebResponseContent UpdateInventoryStatue()
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            
            List<Dt_WheelsStock> groupedData = new List<Dt_WheelsStock>();

            var hourpara = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_Parameters, SysConfigConst.InventoryMarket);
            int hour = hourpara.ConfigValue.ObjToInt(); //获取设置的预期时间

            List<Dt_WheelsStock> WheelsList = BaseDal.QueryData();      //获取全部车轮信息

            foreach (var item in WheelsList)
            {
                TimeSpan timeDifference = DateTime.Today - item.CreateDate.Date;
                item.Wheels_DateDet = (int)timeDifference.TotalDays;

                if (item.Wheels_DateDet >= hour)
                {
                    item.Wheels_Statue = 1;
                }
                else
                {
                    item.Wheels_Statue = 0;
                }
                groupedData.Add(item);
            }

             BaseDal.UpdateData(groupedData);

            return content.OK();
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
            throw;
        }
    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -11,6 +11,7 @@
using WIDESEA_Core.Const;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_IStorageBasicRepository;
using WIDESEA_IStoragIntegrationServices;
using WIDESEA_Model.Models;
using WIDESEA_StorageBasicRepository;
@@ -38,10 +39,12 @@
    private readonly IDt_InWheels_mes_htyRepository _InWheels_Mes_HtyRepository;
    private readonly IDt_CacheInfoRepository _CacheInfoRepository;
    private readonly IDt_OutWheels_htyRepository _OutWheels_HtyRepository;
    private readonly IDt_OutZdp_htyRepository _Dt_OutZdp_htyRepository;
    private readonly IDt_InZdp_mesRepository _InZdp_MesRepository;
    private readonly IDt_InZdp_mes_htyRepository _InZdp_Mes_HtyRepository; 
    private readonly IDt_ZdpStockRepository _ZdpStockRepository;
    private readonly IDt_ZdpStock_htyRepository _ZdpStock_HtyRepository;
    

    public Dt_TaskService(IDt_TaskRepository BaseDal,
                                IUnitOfWorkManage unitOfWorkManage,
@@ -64,7 +67,8 @@
                                IDt_InZdp_mesRepository inZdp_MesRepository,
                                IDt_InZdp_mes_htyRepository inZdp_Mes_HtyRepository,
                                IDt_ZdpStockRepository zdpStockRepository,
                                IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository) : base(BaseDal)
                                IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository,
                                IDt_OutZdp_htyRepository dt_OutZdp_HtyRepository) : base(BaseDal)

    {
        _unitOfWorkManage = unitOfWorkManage;
@@ -85,6 +89,7 @@
        _InZdp_Mes_HtyRepository = inZdp_Mes_HtyRepository;
        _ZdpStockRepository = zdpStockRepository;
        _ZdpStock_HtyRepository = dt_ZdpStock_HtyRepository;
        _Dt_OutZdp_htyRepository = dt_OutZdp_HtyRepository;
    }

    #region å¤–部接口方法
@@ -429,6 +434,8 @@
                //var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId);                         //删除任务
                var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;                        //加入历史任务
                var isStockHtyAdd = await _ZdpStock_HtyRepository.AddDataAsync(stockInfo_Hty);           //加入历史库存

                var isoutZDPHtyAdd = await _Dt_OutZdp_htyRepository.AddDataAsync(Outwheels_hty);         //添加车轮出库信息
            });

            return content.OK("任务完成成功", task.Remark);

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln

@@ -74,9 +74,9 @@
        .editorconfig = .editorconfig
    EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_StoragIntegrationServices", "WIDESEA_StoragIntegrationServices\WIDESEA_StoragIntegrationServices.csproj", "{55326F38-372A-4606-B7FB-8C01BBAEC4FC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_StoragIntegrationServices", "WIDESEA_StoragIntegrationServices\WIDESEA_StoragIntegrationServices.csproj", "{55326F38-372A-4606-B7FB-8C01BBAEC4FC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IStoragIntegrationServices", "WIDESEA_IStoragIntegrationServices\WIDESEA_IStoragIntegrationServices.csproj", "{94D572FA-810E-4897-B673-AF988FD4019E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IStoragIntegrationServices", "WIDESEA_IStoragIntegrationServices\WIDESEA_IStoragIntegrationServices.csproj", "{94D572FA-810E-4897-B673-AF988FD4019E}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -20,4 +20,14 @@
    {
        return Service.InventoryStatistics();
    }

    /// <summary>
    /// æ›´æ–°åº“存入库时间
    /// </summary>
    /// <returns></returns>
    [HttpPost, AllowAnonymous, Route("UpdateInventoryStatue")]
    public WebResponseContent UpdateInventoryStatue()
    {
        return Service.UpdateInventoryStatue();
    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json

@@ -12,7 +12,7 @@
  //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
  //"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionStringWCS": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionStringWCS": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",