1

huanghongfeng

2025-09-22 a34059e688e947a2ea079a0646872f1a21089940

1

 ÏîÄ¿´úÂë/DP/pnpm-lock.yaml

@@ -26,9 +26,6 @@
      ejs:
        specifier: ^3.1.8
        version: 3.1.10
      element-plus:
        specifier: ^2.10.4
        version: 2.10.4(vue@2.7.16)
      element-ui:
        specifier: ^2.15.10
        version: 2.15.14(vue@2.7.16)
@@ -47,12 +44,18 @@
      screenfull:
        specifier: ^6.0.2
        version: 6.0.2
      swiper:
        specifier: ^6.8.4
        version: 6.8.4
      uglify-js:
        specifier: ^3.17.4
        version: 3.19.3
      vue:
        specifier: ^2.7.13
        version: 2.7.16
      vue-awesome-swiper:
        specifier: ^4.1.1
        version: 4.1.1(swiper@6.8.4)(vue@2.7.16)
      vue-easytable:
        specifier: ^2.21.5
        version: 2.27.1(lodash@4.17.21)(vue@2.7.16)
@@ -131,24 +134,6 @@
  '@babel/types@7.28.1':
    resolution: {integrity: sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==}
    engines: {node: '>=6.9.0'}

  '@ctrl/tinycolor@3.6.1':
    resolution: {integrity: sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==}
    engines: {node: '>=10'}

  '@element-plus/icons-vue@2.3.1':
    resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
    peerDependencies:
      vue: ^3.2.0

  '@floating-ui/core@1.7.2':
    resolution: {integrity: sha512-wNB5ooIKHQc+Kui96jE/n69rHFWAVoxn5CAzL1Xdd8FG03cgY3MLO+GF9U3W737fYDSgPWA6MReKhBQBop6Pcw==}

  '@floating-ui/dom@1.7.2':
    resolution: {integrity: sha512-7cfaOQuCS27HD7DX+6ib2OrnW+b4ZBwDNnCcT0uTyidcmyWb03FnQqJybDBoCnpdxwBSfA94UAYlRCt7mV+TbA==}

  '@floating-ui/utils@0.2.10':
    resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}

  '@hapi/address@2.1.4':
    resolution: {integrity: sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==}
@@ -322,9 +307,6 @@
  '@soda/get-current-script@1.0.2':
    resolution: {integrity: sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==}

  '@sxzz/popperjs-es@2.11.7':
    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==}

  '@types/body-parser@1.19.6':
    resolution: {integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==}

@@ -360,12 +342,6 @@

  '@types/json-schema@7.0.15':
    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}

  '@types/lodash-es@4.17.12':
    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}

  '@types/lodash@4.17.20':
    resolution: {integrity: sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==}

  '@types/mime@1.3.5':
    resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
@@ -418,9 +394,6 @@

  '@types/uglify-js@3.17.5':
    resolution: {integrity: sha512-TU+fZFBTBcXj/GpDpDaBmgWk/gn96kMZ+uocaFUlV2f8a6WdMzzI44QBCmGcCiYR0Y6ZlNRiyUyKKt5nl/lbzQ==}

  '@types/web-bluetooth@0.0.16':
    resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}

  '@types/webpack-dev-server@3.11.6':
    resolution: {integrity: sha512-XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ==}
@@ -496,15 +469,6 @@

  '@vue/web-component-wrapper@1.3.0':
    resolution: {integrity: sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==}

  '@vueuse/core@9.13.0':
    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}

  '@vueuse/metadata@9.13.0':
    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}

  '@vueuse/shared@9.13.0':
    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}

  '@webassemblyjs/ast@1.9.0':
    resolution: {integrity: sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==}
@@ -1468,9 +1432,6 @@
    resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
    engines: {node: '>= 0.4'}

  dayjs@1.11.13:
    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}

  de-indent@1.0.2:
    resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}

@@ -1614,6 +1575,9 @@
  dom-serializer@1.4.1:
    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}

  dom7@3.0.0:
    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}

  domain-browser@1.2.0:
    resolution: {integrity: sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==}
    engines: {node: '>=0.4', npm: '>=1.2'}
@@ -1679,11 +1643,6 @@

  electron-to-chromium@1.5.189:
    resolution: {integrity: sha512-y9D1ntS1ruO/pZ/V2FtLE+JXLQe28XoRpZ7QCCo0T8LdQladzdcOVQZH/IWLVJvCw12OGMb6hYOeOAjntCmJRQ==}

  element-plus@2.10.4:
    resolution: {integrity: sha512-UD4elWHrCnp1xlPhbXmVcaKFLCRaRAY6WWRwemGfGW3ceIjXm9fSYc9RNH3AiOEA6Ds1p9ZvhCs76CR9J8Vd+A==}
    peerDependencies:
      vue: ^3.2.0

  element-ui@2.15.14:
    resolution: {integrity: sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==}
@@ -2717,16 +2676,6 @@
    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
    engines: {node: '>=8'}

  lodash-es@4.17.21:
    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}

  lodash-unified@1.0.3:
    resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==}
    peerDependencies:
      '@types/lodash-es': '*'
      lodash: '*'
      lodash-es: '*'

  lodash.defaultsdeep@4.6.1:
    resolution: {integrity: sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==}

@@ -2806,9 +2755,6 @@
  memfs@3.5.3:
    resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==}
    engines: {node: '>= 4.0.0'}

  memoize-one@6.0.0:
    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}

  memory-fs@0.4.1:
    resolution: {integrity: sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==}
@@ -3023,9 +2969,6 @@
  normalize-url@3.3.0:
    resolution: {integrity: sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==}
    engines: {node: '>=6'}

  normalize-wheel-es@1.2.0:
    resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==}

  normalize-wheel@1.0.1:
    resolution: {integrity: sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==}
@@ -3986,6 +3929,9 @@
    engines: {node: '>=0.10.0'}
    hasBin: true

  ssr-window@3.0.0:
    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}

  ssri@6.0.2:
    resolution: {integrity: sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==}

@@ -4103,6 +4049,10 @@
    engines: {node: '>=4.0.0'}
    deprecated: This SVGO version is no longer supported. Upgrade to v2.x.x.
    hasBin: true

  swiper@6.8.4:
    resolution: {integrity: sha512-O+buF9Q+sMA0H7luMS8R59hCaJKlpo8PXhQ6ZYu6Rn2v9OsFd4d1jmrv14QvxtQpKAvL/ZiovEeANI/uDGet7g==}
    engines: {node: '>= 4.7.0'}

  tapable@1.1.3:
    resolution: {integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==}
@@ -4378,16 +4328,12 @@
  vm-browserify@1.1.2:
    resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}

  vue-demi@0.14.10:
    resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
    engines: {node: '>=12'}
    hasBin: true
  vue-awesome-swiper@4.1.1:
    resolution: {integrity: sha512-50um10t6N+lJaORkpwSi1wWuMmBI1sgFc9Znsi5oUykw2cO5DzLaBHcO2JNX21R+Ue4TGoIJDhhxjBHtkFrTEQ==}
    engines: {node: '>=8'}
    peerDependencies:
      '@vue/composition-api': ^1.0.0-rc.1
      vue: ^3.0.0-0 || ^2.6.0
    peerDependenciesMeta:
      '@vue/composition-api':
        optional: true
      swiper: ^5.2.0
      vue: 2.x

  vue-easytable@2.27.1:
    resolution: {integrity: sha512-Rs2cqaPYamH8zXQo/f90AyM/ROGMsB5Njb74GpooWacAKEXbHU0wXYvEjSBZ7CcS6TVqliA/ZbgVqOoA/o9bHQ==}
@@ -4702,23 +4648,6 @@
      '@babel/helper-string-parser': 7.27.1
      '@babel/helper-validator-identifier': 7.27.1

  '@ctrl/tinycolor@3.6.1': {}

  '@element-plus/icons-vue@2.3.1(vue@2.7.16)':
    dependencies:
      vue: 2.7.16

  '@floating-ui/core@1.7.2':
    dependencies:
      '@floating-ui/utils': 0.2.10

  '@floating-ui/dom@1.7.2':
    dependencies:
      '@floating-ui/core': 1.7.2
      '@floating-ui/utils': 0.2.10

  '@floating-ui/utils@0.2.10': {}

  '@hapi/address@2.1.4': {}

  '@hapi/bourne@1.3.2': {}
@@ -4874,8 +4803,6 @@

  '@soda/get-current-script@1.0.2': {}

  '@sxzz/popperjs-es@2.11.7': {}

  '@types/body-parser@1.19.6':
    dependencies:
      '@types/connect': 3.4.38
@@ -4934,12 +4861,6 @@

  '@types/json-schema@7.0.15': {}

  '@types/lodash-es@4.17.12':
    dependencies:
      '@types/lodash': 4.17.20

  '@types/lodash@4.17.20': {}

  '@types/mime@1.3.5': {}

  '@types/minimatch@6.0.0':
@@ -4992,8 +4913,6 @@
  '@types/uglify-js@3.17.5':
    dependencies:
      source-map: 0.6.1

  '@types/web-bluetooth@0.0.16': {}

  '@types/webpack-dev-server@3.11.6(debug@4.4.1)':
    dependencies:
@@ -5272,25 +5191,6 @@
      webpack: 4.47.0

  '@vue/web-component-wrapper@1.3.0': {}

  '@vueuse/core@9.13.0(vue@2.7.16)':
    dependencies:
      '@types/web-bluetooth': 0.0.16
      '@vueuse/metadata': 9.13.0
      '@vueuse/shared': 9.13.0(vue@2.7.16)
      vue-demi: 0.14.10(vue@2.7.16)
    transitivePeerDependencies:
      - '@vue/composition-api'
      - vue

  '@vueuse/metadata@9.13.0': {}

  '@vueuse/shared@9.13.0(vue@2.7.16)':
    dependencies:
      vue-demi: 0.14.10(vue@2.7.16)
    transitivePeerDependencies:
      - '@vue/composition-api'
      - vue

  '@webassemblyjs/ast@1.9.0':
    dependencies:
@@ -6331,8 +6231,6 @@
      es-errors: 1.3.0
      is-data-view: 1.0.2

  dayjs@1.11.13: {}

  de-indent@1.0.2: {}

  debug@2.6.9(supports-color@6.1.0):
@@ -6480,6 +6378,10 @@
      domhandler: 4.3.1
      entities: 2.2.0

  dom7@3.0.0:
    dependencies:
      ssr-window: 3.0.0

  domain-browser@1.2.0: {}

  domelementtype@1.3.1: {}
@@ -6545,27 +6447,6 @@
      jake: 10.9.2

  electron-to-chromium@1.5.189: {}

  element-plus@2.10.4(vue@2.7.16):
    dependencies:
      '@ctrl/tinycolor': 3.6.1
      '@element-plus/icons-vue': 2.3.1(vue@2.7.16)
      '@floating-ui/dom': 1.7.2
      '@popperjs/core': '@sxzz/popperjs-es@2.11.7'
      '@types/lodash': 4.17.20
      '@types/lodash-es': 4.17.12
      '@vueuse/core': 9.13.0(vue@2.7.16)
      async-validator: 4.2.5
      dayjs: 1.11.13
      escape-html: 1.0.3
      lodash: 4.17.21
      lodash-es: 4.17.21
      lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21)
      memoize-one: 6.0.0
      normalize-wheel-es: 1.2.0
      vue: 2.7.16
    transitivePeerDependencies:
      - '@vue/composition-api'

  element-ui@2.15.14(vue@2.7.16):
    dependencies:
@@ -7736,14 +7617,6 @@
    dependencies:
      p-locate: 4.1.0

  lodash-es@4.17.21: {}

  lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21):
    dependencies:
      '@types/lodash-es': 4.17.12
      lodash: 4.17.21
      lodash-es: 4.17.21

  lodash.defaultsdeep@4.6.1: {}

  lodash.mapvalues@4.6.0: {}
@@ -7814,8 +7687,6 @@
  memfs@3.5.3:
    dependencies:
      fs-monkey: 1.1.0

  memoize-one@6.0.0: {}

  memory-fs@0.4.1:
    dependencies:
@@ -8065,8 +7936,6 @@
      sort-keys: 1.1.2

  normalize-url@3.3.0: {}

  normalize-wheel-es@1.2.0: {}

  normalize-wheel@1.0.1: {}

@@ -9201,6 +9070,8 @@
      safer-buffer: 2.1.2
      tweetnacl: 0.14.5

  ssr-window@3.0.0: {}

  ssri@6.0.2:
    dependencies:
      figgy-pudding: 3.5.2
@@ -9343,6 +9214,11 @@
      stable: 0.1.8
      unquote: 1.1.1
      util.promisify: 1.0.1

  swiper@6.8.4:
    dependencies:
      dom7: 3.0.0
      ssr-window: 3.0.0

  tapable@1.1.3: {}

@@ -9623,8 +9499,9 @@

  vm-browserify@1.1.2: {}

  vue-demi@0.14.10(vue@2.7.16):
  vue-awesome-swiper@4.1.1(swiper@6.8.4)(vue@2.7.16):
    dependencies:
      swiper: 6.8.4
      vue: 2.7.16

  vue-easytable@2.27.1(lodash@4.17.21)(vue@2.7.16):

 ÏîÄ¿´úÂë/DP/src/assets/img/2.mp4

Binary files differ

 ÏîÄ¿´úÂë/DP/src/assets/img/21.png

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

@@ -23,14 +23,14 @@
              <span class="title-text">轮对压装智能选配系统</span>
            </div>
          </div>
          <div class="timers">
          <!-- <div class="timers">
            {{ dateYear }} {{ dateWeek }} {{ dateDay }}
            <i
              class="blq-icon-shezhi02"
              style="margin-left: 10px"
              @click="showSetting"
            ></i>
          </div>
          </div> -->
        </div>
        <!-- å¤´éƒ¨ e-->
        <!-- å†…容  s-->
@@ -67,7 +67,7 @@
  computed: {},
  created() {},
  mounted() {
    this.timeFn();
    //this.timeFn();
    this.cancelLoading();
    
    // ç›‘听全屏变化
@@ -81,13 +81,13 @@
    showSetting() {
      this.$refs.setting.init();
    },
    timeFn() {
      this.timing = setInterval(() => {
        this.dateDay = formatTime(new Date(), "HH: mm: ss");
        this.dateYear = formatTime(new Date(), "yyyy-MM-dd");
        this.dateWeek = this.weekday[new Date().getDay()];
      }, 1000);
    },
    // timeFn() {
    //   this.timing = setInterval(() => {
    //     this.dateDay = formatTime(new Date(), "HH: mm: ss");
    //     this.dateYear = formatTime(new Date(), "yyyy-MM-dd");
    //     this.dateWeek = this.weekday[new Date().getDay()];
    //   }, 1000);
    // },
    cancelLoading() {
      let timer = setTimeout(() => {
        this.loading = false;

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

@@ -1,12 +1,12 @@
<template>
  <div class="centermap">
    <div class="mapwrap">
      <ItemWrap title="视频监控">
      <ItemWrap title="车轮打磨视频监控">
        <video id="video_left" autoplay muted controls playsinline width="100%" height="100%"></video>
      </ItemWrap>
    </div>
    <div class="mapwrap">
      <ItemWrap title="视频监控">
      <ItemWrap title="车轮测量视频监控">
        <video id="video_right" autoplay muted controls playsinline width="100%" height="100%"></video>
      </ItemWrap>
    </div>
@@ -21,8 +21,8 @@
const webRtcServer_right = ref(null)

// RTSP åœ°å€ï¼Œæ³¨æ„ URL ç¼–码特殊字符
const rtspLeft = 'rtsp://admin:Mx202513@172.21.7.244:554/Streaming/Channels/102?rtsp_transport=tcp'
const rtspRight = 'rtsp://admin:Mx202513@172.21.7.244:554/Streaming/Channels/202?rtsp_transport=tcp'
const rtspLeft = 'rtsp://admin:Mx202513@172.21.7.244:554/Streaming/Channels/101?rtsp_transport=tcp&codecType=h264';
const rtspRight = 'rtsp://admin:Mx202513@172.21.7.244:554/Streaming/Channels/201?rtsp_transport=tcp&codecType=h264';

// WebRtcStreamer æœåŠ¡åœ°å€
const serverUrl = 'http://172.21.1.139:8000' // â† æ”¹ä¸ºä½ è¿è¡Œ webrtcstreamer çš„电脑 IP
@@ -85,11 +85,10 @@

<style scoped>
.centermap {
  width: 100%;
  height: 100%;
  display: flex;
}
.mapwrap {
  height: 470px;
  width: 100%;
  box-sizing: border-box;
  position: relative;

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

@@ -3,7 +3,9 @@
    <!-- æ·»åŠ  transform æ ·å¼ç»‘定 -->
    <div class="carousel" :style="{ transform: `translateX(-${currentIndex * 100}%)` }">
      <div class="carousel-item">
        
        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="轮对压装智能选配系统工艺流程图">
            <img src="http://172.21.1.139:8083/tp/1.png" style="width: 100%;"></img>
        </ItemWrap>
      </div>


@@ -12,7 +14,7 @@
      <div class="contetn_center" >
        <CenterMap class="contetn_center_top" />
      </div>
      <div class="contetn_left">
      <!-- <div class="contetn_left">
        <div class="pagetab">
        </div>

@@ -23,7 +25,7 @@
        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="测量状态">
         
        </ItemWrap>
      </div>
      </div> -->
    </div>

      </div>
@@ -159,7 +161,7 @@
  }

  .contetn_center {
    width: 1400px;
    width: 100%;
  }

  //左右两侧 ä¸‰ä¸ªå—

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

@@ -50,7 +50,7 @@
  methods: {
    fetchData() {
      this.loading = true;
      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.data.data.slice(25, 36).forEach(item => {

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

@@ -27,8 +27,8 @@
export default {
  data() {
    return {
      statusTypes: ['有货', '空货位', '有货禁用', '锁定'], // è¡¨å¤´çŠ¶æ€ç±»åž‹
      statusCounts: [0, 0, 0,0] // å¯¹åº”状态的数量
      statusTypes: ['有货', '空货位'], // è¡¨å¤´çŠ¶æ€ç±»åž‹
      statusCounts: [0, 0] // å¯¹åº”状态的数量
    };
  },
  created() {
@@ -36,15 +36,16 @@
  },
  methods: {
    fetchData() {
      axios.post("http://127.0.0.1:5000/api/LocationInfo/LocationStatus", null)
      axios.post("http://172.21.1.139:5000/api/LocationInfo/LocationStatuskt", null)
        .then((response) => {
          // å‡è®¾API返回的数据格式为：[{status: '有货', count: 9}, {status: '空货位', count: 2}, ...]
          const newCounts = [0, 0, 0,0];
          const newCounts = [0, 0];
          console.log(response.data)
          
          newCounts[0] = response.data.data[0].count;
          newCounts[1] = response.data.data[1].count;
          newCounts[2] = response.data.data[2].count;
          newCounts[3] = response.data.data[3].count;
          newCounts[1] = response.data.data[1].count+response.data.data[2].count+response.data.data[3].count;
          // newCounts[2] = response.data.data[2].count;
          // newCounts[3] = response.data.data[3].count;

          this.statusCounts = newCounts;
        })

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

@@ -50,7 +50,7 @@
  methods: {
    fetchData() {
      this.loading = true;
      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.data.data.slice(13, 24).forEach(item => {

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

@@ -50,7 +50,7 @@
  methods: {
    fetchData() {
      this.loading = true;
      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.data.data.slice(0, 12).forEach(item => {

 ÏîÄ¿´úÂë/PDA/pages/Inbound/ClboundInfo.vue

@@ -115,9 +115,9 @@
                                    TargetAddress: _this.machine,
                                },
                            };
                            _this.$AjaxRequest.Params('post', 'Task/UpWheelsFlow',
                            _this.$AjaxRequestWcs.Params('post', 'Task/UpWheelsFlow',
                                data, _user.token);
                            _this.$AjaxRequest.Request().then(function(result) {
                            _this.$AjaxRequestWcs.Request().then(function(result) {
                                if (result.data.status) {
                                    uni.showToast({
                                        title: "操作成功!",

 ÏîÄ¿´úÂë/PDA/pages/Outbound/OutboundCall.vue

@@ -227,6 +227,13 @@
                        </xfl-select>
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">预估轮径范围</u-td>
                    <u-td>
                        <p style="display: flex;"><label style="line-height: 30px;">最小值：</label><u-input v-model="zuixiaoz" :focus="qrcodeFocus" :border="true" placeholder="请输入预估轮径最小值" style="width: 80%;" /></p>
                        <p style="display: flex;margin-top: 5px;"><label style="line-height: 30px;">最大值：</label><u-input v-model="zuidaz" :focus="qrcodeFocus" :border="true" placeholder="请输入预估轮径最大值" style="width: 80%;" /></p>
                    </u-td>
                </u-tr>
                <!--     <u-tr>
                    <u-td width="30%">轴承类别:</u-td>
                    <u-td>
@@ -308,6 +315,8 @@
                ylzb: '',
                zlzc: '',
                ylzc: '',
                zuixiaoz:"",
                zuidaz:'',
                // zzjAVG: '',
                // yzjAVG: '',
                // zfcbAVG: '',
@@ -601,6 +610,8 @@
                                    zlzc: _this.zlzc,
                                    ylzc: _this.ylzc,
                                    mttype: _this.mttype,
                                    zuixiaoz:_this.zuixiaoz,
                                    zuidaz:_this.zuidaz,
                                    //targetStation: _this.targetStation,
                                    wheelsPosition: _this.wheelsPosition,
                                    NOdirection: _this.NOdirection,

 ÏîÄ¿´úÂë/PDA/pages/Outbound/OutboundCallYC.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,699 @@
<template>
    <view>
        <view>
            <u-table font-size="25">
                <u-tr>
                    <u-td>
                        <xfl-select :list="UserArray" :initValue="this.$UserTool.UserInfo.userName" :clearable="false"
                            :disabled="true">
                        </xfl-select>
                    </u-td>
                    <u-td width="25%">现在时间:</u-td>
                    <u-td width="25%">{{date}}</u-td>
                </u-tr>
            </u-table>
        </view>

        <view style="padding: 0rpx 0rpx">
            <u-table>
                <u-tr>
                    <u-td width="30%">车轴条码</u-td>
                    <u-td>
                        <u-input v-model="cztm" :focus="qrcodeFocus" :border="true" placeholder="请扫描车轴条码"
                            @input="cztmChange" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">车轴号</u-td>
                    <u-td>
                        <u-input v-model="czh" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">轮对条码</u-td>
                    <u-td>
                        <u-input v-model="ldtm" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">车型</u-td>
                    <u-td>
                        <u-input v-model="chexing" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">动拖属性</u-td>
                    <u-td>
                        <u-input v-model="mttype" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">车轴型号</u-td>
                    <u-td>
                        <u-input v-model="czxh" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">选配轮型(*)</u-td>
                    <u-td>
                        <u-input v-model="clxh" :border="false" :focus="clxhFocus" placeholder="请输入选配轮型" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座等级</u-td>
                    <u-td>
                        <u-input v-model="zlzdj" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">右轮座等级</u-td>
                    <u-td>
                        <u-input v-model="ylzdj" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">维修任务</u-td>
                    <u-td>
                        <u-input v-model="wxrw" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径</u-td>
                    <u-td>
                        <u-input v-model="zlzzj" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径</u-td>
                    <u-td>
                        <u-input v-model="ylzzj" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径A1</u-td>
                    <u-td>
                        <u-input v-model="zlzA1" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径A1</u-td>
                    <u-td>
                        <u-input v-model="ylzA1" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径A2</u-td>
                    <u-td>
                        <u-input v-model="zlzA2" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径A2</u-td>
                    <u-td>
                        <u-input v-model="ylzA2" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径A3</u-td>
                    <u-td>
                        <u-input v-model="zlzA3" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径A3</u-td>
                    <u-td>
                        <u-input v-model="ylzA3" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径A</u-td>
                    <u-td>
                        <u-input v-model="zlza" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径A</u-td>
                    <u-td>
                        <u-input v-model="ylza" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径B1</u-td>
                    <u-td>
                        <u-input v-model="zlzB1" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径B1</u-td>
                    <u-td>
                        <u-input v-model="ylzB1" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径B2</u-td>
                    <u-td>
                        <u-input v-model="zlzB2" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径B2</u-td>
                    <u-td>
                        <u-input v-model="ylzB2" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径B3</u-td>
                    <u-td>
                        <u-input v-model="zlzB3" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径B3</u-td>
                    <u-td>
                        <u-input v-model="ylzB3" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径B</u-td>
                    <u-td>
                        <u-input v-model="zlzb" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径B</u-td>
                    <u-td>
                        <u-input v-model="ylzb" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径C1</u-td>
                    <u-td>
                        <u-input v-model="zlzC1" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径C1</u-td>
                    <u-td>
                        <u-input v-model="ylzC1" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径C2</u-td>
                    <u-td>
                        <u-input v-model="zlzC2" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径C2</u-td>
                    <u-td>
                        <u-input v-model="ylzC2" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径C3</u-td>
                    <u-td>
                        <u-input v-model="zlzC3" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径C3</u-td>
                    <u-td>
                        <u-input v-model="ylzC3" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">左轮座直径C</u-td>
                    <u-td>
                        <u-input v-model="zlzc" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                    <u-td width="30%">右轮座直径C</u-td>
                    <u-td>
                        <u-input v-model="ylzc" :border="false" :disabled="true" placeholder="" />
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">车轮方向:</u-td>
                    <u-td>
                        <xfl-select :list="wheelsPositionArray" :initValue="'请选择'" :clearable="false"
                            @change="wheelsPositionChange">
                        </xfl-select>
                    </u-td>
                </u-tr>
                <!-- <u-tr>
                    <u-td width="30%">车轮轮型</u-td>
                    <u-td>
                        <u-input v-model="x" :border="true" placeholder="请输入车轮轮型" />
                    </u-td>
                </u-tr> -->
                <u-tr>
                    <u-td width="30%">新旧类别:</u-td>
                    <u-td>
                        <xfl-select :list="NOdirectionArray" :initValue="'请选择'" :clearable="false"
                            @change="NOdirectionChange">
                        </xfl-select>
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">预估轮径范围</u-td>
                    <u-td>
                        <p style="display: flex;"><label style="line-height: 30px;">最小值：</label><u-input v-model="zuixiaoz" :focus="qrcodeFocus" :border="true" placeholder="请输入预估轮径最小值" style="width: 80%;" /></p>
                        <p style="display: flex;margin-top: 5px;"><label style="line-height: 30px;">最大值：</label><u-input v-model="zuidaz" :focus="qrcodeFocus" :border="true" placeholder="请输入预估轮径最大值" style="width: 80%;" /></p>
                    </u-td>
                </u-tr>
                <!--     <u-tr>
                    <u-td width="30%">轴承类别:</u-td>
                    <u-td>
                        <xfl-select :list="StateArray" :initValue="'请选择'" :clearable="false" @change="StateChange"
                            ref="StateSelect">
                        </xfl-select>
                    </u-td>
                </u-tr> -->
                <!--     <u-tr>
                    <u-td width="30%">厂家:</u-td>
                    <u-td>
                        <xfl-select :list="ManufacturerArray" :initValue="'请选择'" :clearable="false"
                            @change="ManufacturerChange" ref="ManufacturerSelect">
                        </xfl-select>
                    </u-td>
                </u-tr> -->
                <!-- <u-tr>
                    <u-td width="30%">工位:</u-td>
                    <u-td>
                        <xfl-select :list="StationArray" :initValue="'请选择'" :clearable="false" @change="StationChange">
                        </xfl-select>
                    </u-td>
                </u-tr> -->
            </u-table>
        </view>
        <view style="padding: 0rpx 0rpx;">
            <u-table>
                <u-tr>
                    <u-td>
                        <u-button style="width:100px" type="primary" @click="SaveInfomation">预存上架</u-button>
                    </u-td>
                </u-tr>
            </u-table>
        </view>
    </view>
</template>

<script>
    var _this;
    var _user;
    export default {
        data() {
            return {
                date: '',
                CurrentUser: '', //当前用户
                cztm: '',
                czh: '',
                chexing: '',
                czxh: '',
                clxh: '',
                zlzdj: '',
                ylzdj: '',
                wxrw:'',
                ldtm: '',
                mttype: '',
                zlzzj: '',
                ylzzj: '',
                zlzA1: '',
                ylzA1: '',
                zlzA2: '',
                ylzA2: '',
                zlzA3: '',
                ylzA3: '',
                zlzB1: '',
                ylzB1: '',
                zlzB2: '',
                ylzB2: '',
                zlzB3: '',
                ylzB3: '',
                zlzC1: '',
                ylzC1: '',
                zlzC2: '',
                ylzC2: '',
                zlzC3: '',
                ylzC3: '',
                zlza: '',
                ylza: '',
                zlzb: '',
                ylzb: '',
                zlzc: '',
                ylzc: '',
                zuixiaoz:"",
                zuidaz:'',
                // zzjAVG: '',
                // yzjAVG: '',
                // zfcbAVG: '',
                // yfcbAVG: '',
                // zydAVG: '',
                // yydAVG: '',
                //StateArray: [],
                //ManufacturerArray: [],
                StationArray: [{
                        label: '左侧压装位',
                        value: '1左侧压装位'
                    },
                    {
                        label: '右侧压装位',
                        value: '2右侧压装位'
                    }
                ],
                wheelsPositionArray: [{
                        label: 'all',
                        value: '两侧'
                    }, {
                        label: 'left',
                        value: '左侧'
                    },
                    {
                        label: 'right',
                        value: '右侧'
                    }
                ],
                NOdirectionArray: [{
                    label: '0',
                    value: '新造'
                }, {
                    label: '1',
                    value: '检修'
                }, ],
                //zcState: '',
                //Manufacturer: '',
                //targetStation: '',

                //轴承方向
                wheelsPosition: '',
                //轴承号
                //ldCode: '',
                //ortherData: '',
                qrcodeFocus: false,
                clxhFocus: false
            }
        },
        methods: {
            setTimer() {
                if (this.timer == null) {
                    this.timer = setInterval(() => {
                        this.date = this.$DateTool.getDate();
                    }, 1000)
                }
            },
            // ManufacturerChange(value) {
            //     this.Manufacturer = value.orignItem.label;
            // },
            // StateChange(value) {
            //     this.zcState = value.orignItem.label;
            // },
            // StationChange(value) {
            //     this.targetStation = value.orignItem.label;
            // },
            wheelsPositionChange(value) {
                this.wheelsPosition = value.orignItem.label;
            },
            NOdirectionChange(value) {
                this.NOdirection = value.orignItem.label;
            },
            cztmChange() {
                if (_this.cztm == '' || _this.cztm == null) {
                    return;
                }
                let data = {
                    MainData: {
                        cztm: _this.cztm
                    },
                };
                _this.$AjaxRequest.Params('post', 'ToZY/getCZInfo',
                    data, _user.token);
                _this.$AjaxRequest.Request().then(function(result) {
                    //console.log(result);
                    if (result.data.status) {
                        let obj = JSON.parse(JSON.stringify(result.data.data));
                        // _this.yfcbAVG = obj.yfcbAVG;
                        // _this.zfcbAVG = obj.zfcbAVG;
                        // _this.zydAVG = obj.zydAVG;
                        // _this.yydAVG = obj.yydAVG;
                        // _this.zzjAVG = obj.zzjAVG;
                        // _this.yzjAVG = obj.yzjAVG;
                        _this.chexing = obj.chexing;
                        _this.czh = obj.czh;
                        _this.czxh = obj.czxh;
                        _this.clxhFocus = true;
                        _this.zlzdj = obj.zlzdj;
                        _this.ylzdj = obj.ylzdj;
                        _this.wxrw=obj.wxrw;
                        _this.ldtm = obj.ldtm;
                        _this.zlzzj = obj.zlzzj;
                        _this.ylzzj = obj.ylzzj;
                        _this.zlzA1 = obj.zlzA1;
                        _this.ylzA1 = obj.ylzA1;
                        _this.zlzA2 = obj.zlzA2;
                        _this.ylzA2 = obj.ylzA2;
                        _this.zlzA3 = obj.zlzA3;
                        _this.ylzA3 = obj.ylzA3;
                        _this.zlzB1 = obj.zlzB1;
                        _this.ylzB1 = obj.ylzB1;
                        _this.zlzB2 = obj.zlzB2;
                        _this.ylzB2 = obj.ylzB2;
                        _this.zlzB3 = obj.zlzB3;
                        _this.ylzB3 = obj.ylzB3;
                        _this.zlzC1 = obj.zlzC1;
                        _this.ylzC1 = obj.ylzC1;
                        _this.zlzC2 = obj.zlzC2;
                        _this.ylzC2 = obj.ylzC2;
                        _this.zlzC3 = obj.zlzC3;
                        _this.ylzC3 = obj.ylzC3;
                        _this.zlza = obj.zlza;
                        _this.ylza = obj.ylza;
                        _this.zlzb = obj.zlzb;
                        _this.ylzb = obj.ylzb;
                        _this.zlzc = obj.zlzc;
                        _this.ylzc = obj.ylzc;
                        _this.mttype = obj.mttype;
                        //_this.ldCode = obj.ldCode;
                        //_this.ortherData = obj.ortherData;
                        // if (null != obj.manufacturerArray)
                        //     obj.manufacturerArray.forEach(function(item, index, arr) {
                        //         _this.ManufacturerArray.push({
                        //             label: item,
                        //             value: item
                        //         })
                        //     });
                        // if (null != obj.neworold)
                        //     obj.neworold.forEach(function(item, index, arr) {
                        //         let name = '检修';
                        //         if (item.indexOf('0') > -1) {
                        //             name = '新品';
                        //         }

                        //         if (null == _this.StateArray.find(r => r.value == name)) {
                        //             _this.StateArray.push({
                        //                 label: item,
                        //                 value: name
                        //             })
                        //         }
                        //     });
                        //console.log(obj);
                    } else {
                        uni.showToast({
                            icon: 'none',
                            title: "请求错误:" + result.data.message,
                            duration: 5000
                        });
                        _this.initInfo();
                    }
                }).catch(function(err) {
                    uni.showToast({
                        icon: 'none',
                        title: "请求后台异常,错误信息." + err.errMsg,
                        duration: 5000
                    });
                    _this.initInfo();
                });
            },
            initInfo() {
                // _this.yfcbAVG = '';
                // _this.zfcbAVG = '';
                // _this.zydAVG = '';
                // _this.yydAVG = '';
                // _this.zzjAVG = '';
                // _this.yzjAVG = '';
                _this.cztm = '';
                _this.czh = '';
                _this.chexing = '';
                _this.czxh = '';
                _this.clxh = '';
                _this.zlzdj = '';
                _this.ylzdj = '';
                _this.wxrw='';
                _this.ldtm = '';
                _this.zlzzj = '';
                _this.ylzzj = '';
                _this.zlzA1 = '';
                _this.ylzA1 = '';
                _this.zlzA2 = '';
                _this.ylzA2 = '';
                _this.zlzA3 = '';
                _this.ylzA3 = '';
                _this.zlzB1 = '';
                _this.ylzB1 = '';
                _this.zlzB2 = '';
                _this.ylzB2 = '';
                _this.zlzB3 = '';
                _this.ylzB3 = '';
                _this.zlzC1 = '';
                _this.ylzC1 = '';
                _this.zlzC2 = '';
                _this.ylzC2 = '';
                _this.zlzC3 = '';
                _this.ylzC3 = '';
                _this.zlza = '';
                _this.ylza = '';
                _this.zlzb = '';
                _this.ylzb = '';
                _this.zlzc = '';
                _this.ylzc = '';
                _this.mttype = '';
                //_this.wheelsPosition = '';
                //_this.NOdirection = ''
                //_this.Manufacturer = '';
                //_this.zcState = '';
                //_this.StateArray = [];
                //_this.ldCode = '';
                //_this.ortherData = '';
                //_this.ManufacturerArray = [];
                //_this.$refs.StateSelect.setInput("请选择");
                //_this.$refs.StateSelect.clearItemActive();
                //_this.$refs.ManufacturerSelect.setInput("请选择");
                //_this.$refs.ManufacturerSelect.clearItemActive();
            },
            SaveInfomation() {
                if (_this.cztm == '') {
                    uni.showToast({
                        title: "请扫描车轴信息.",
                        duration: 5000
                    });
                    return;
                }
                if (_this.clxh == '') {
                    uni.showToast({
                        title: "请输入选配轮型.",
                        duration: 5000
                    });
                    return;
                }
                // if (_this.yfcbAVG == '' && _this.zfcbAVG == '' &&
                //     _this.zydAVG == '' && _this.yydAVG == '' && _this.zzjAVG == '' &&
                //     _this.yzjAVG == '') {
                //     uni.showToast({
                //         title: "请重新获取轮对选配信息.",
                //         duration: 5000
                //     });
                //     return;
                // }

                uni.showModal({
                    title: '提示',
                    content: '请核对车轴条码是否正确?',
                    success: function(res) {
                        if (res.confirm) {
                            let data = {
                                MainData: {
                                    czh: _this.czh,
                                    chexing: _this.chexing,
                                    cztm: _this.cztm,
                                    czxh: _this.czxh,
                                    clxh: _this.clxh,
                                    zlzdj: _this.zlzdj,
                                    ylzdj: _this.ylzdj,
                                    wxrw:_this.wxrw,
                                    ldtm: _this.ldtm,
                                    zlzzj: _this.zlzzj,
                                    ylzzj: _this.ylzzj,
                                    zlzA1: _this.zlzA1,
                                    ylzA1: _this.ylzA1,
                                    zlzA2: _this.zlzA2,
                                    ylzA2: _this.ylzA2,
                                    zlzA3: _this.zlzA3,
                                    ylzA3: _this.ylzA3,
                                    zlzB1: _this.zlzB1,
                                    ylzB1: _this.ylzB1,
                                    zlzB2: _this.zlzB2,
                                    ylzB2: _this.ylzB2,
                                    zlzB3: _this.zlzB3,
                                    ylzB3: _this.ylzB3,
                                    zlzC1: _this.zlzC1,
                                    ylzC1: _this.ylzC1,
                                    zlzC2: _this.zlzC2,
                                    ylzC2: _this.ylzC2,
                                    zlzC3: _this.zlzC3,
                                    ylzC3: _this.ylzC3,
                                    zlza: _this.zlza,
                                    ylza: _this.ylza,
                                    zlzb: _this.zlzb,
                                    ylzb: _this.ylzb,
                                    zlzc: _this.zlzc,
                                    ylzc: _this.ylzc,
                                    mttype: _this.mttype,
                                    zuixiaoz:_this.zuixiaoz,
                                    zuidaz:_this.zuidaz,
                                    //targetStation: _this.targetStation,
                                    wheelsPosition: _this.wheelsPosition,
                                    NOdirection: _this.NOdirection,
                                    //ldCode: _this.ldCode,
                                    //ortherData: _this.ortherData
                                },
                            };
                            _this.$AjaxRequest.Params('post', 'ToAPP/SaveCZInfoTemporarystorage',
                                data, _user.token);
                            _this.$AjaxRequest.Request().then(function(result) {
                                if (result.data.status) {
                                    uni.showToast({
                                        title: "车轴上架成功!",
                                        duration: 5000
                                    });
                                    _this.initInfo();
                                    _this.qrcodeFocus = true;
                                    _this.clxhFocus = false;
                                } else {
                                    uni.showToast({
                                        icon: 'none',
                                        title: "请求错误:" + result.data.message,
                                        duration: 5000
                                    });
                                }
                            }).catch(function(err) {
                                uni.showToast({
                                    icon: 'none',
                                    title: "请求后台异常,错误信息." + err.errMsg,
                                    duration: 5000
                                });
                            });
                        } else if (res.cancel) {}
                    }
                });
            },
        },
        created: function() {
            // æ¯æ¬¡è¿›å…¥ç•Œé¢æ—¶ï¼Œå…ˆæ¸…除之前的所有定时器，然后启动新的定时器
            clearInterval(this.timer)
            this.timer = null;
            this.setTimer();
            _user = this.$UserTool.UserInfo;
            this.CurrentUser = _user.userName;
            this.UserArray = [this.$UserTool.AllUserInfo];
        },
        destroyed: function() {
            // æ¯æ¬¡ç¦»å¼€å½“前界面时，清除定时器
            clearInterval(this.timer);
            this.timer = null;
        },
        mounted() {
            _this = this;
            _this.qrcodeFocus = true;
            //_this.queryOrder();
        },


    }
</script>

<style scoped lang="scss">
    .tdHeight {
        height: 80rpx;
    }

    .loopView {
        height: 160px;
        background-color: #f0f0f0;
        margin-top: 10px;
    }

    .loopItem {
        margin-top: 5px;
        margin-left: 15px;

    }

    .deleteBtn {
        margin-top: 25px;
        margin-left: 10px;
        width: 120px;
        background-color: orangered;
    }
</style>

 ÏîÄ¿´úÂë/PDA/pages/Outbound/YxOutboundCall.vue

@@ -227,6 +227,13 @@
                        </xfl-select>
                    </u-td>
                </u-tr>
                <u-tr>
                    <u-td width="30%">预估轮径范围</u-td>
                    <u-td>
                        <p style="display: flex;"><label style="line-height: 30px;">最小值：</label><u-input v-model="zuixiaoz" :focus="qrcodeFocus" :border="true" placeholder="请输入预估轮径最小值" style="width: 80%;" /></p>
                        <p style="display: flex;margin-top: 5px;"><label style="line-height: 30px;">最大值：</label><u-input v-model="zuidaz" :focus="qrcodeFocus" :border="true" placeholder="请输入预估轮径最大值" style="width: 80%;" /></p>
                    </u-td>
                </u-tr>
                <!--     <u-tr>
                    <u-td width="30%">轴承类别:</u-td>
                    <u-td>
@@ -308,6 +315,8 @@
                ylzb: '',
                zlzc: '',
                ylzc: '',
                zuixiaoz:"",
                zuidaz:'',
                // zzjAVG: '',
                // yzjAVG: '',
                // zfcbAVG: '',
@@ -601,6 +610,8 @@
                                    zlzc: _this.zlzc,
                                    ylzc: _this.ylzc,
                                    mttype: _this.mttype,
                                    zuixiaoz:_this.zuixiaoz,
                                    zuidaz:_this.zuidaz,
                                    //targetStation: _this.targetStation,
                                    wheelsPosition: _this.wheelsPosition,
                                    NOdirection: _this.NOdirection,

 ÏîÄ¿´úÂë/PDA/unpackage/cache/apk/apkurl

@@ -1 +1 @@
https://app.liuyingyong.cn/build/download/19d6de30-2e33-11f0-87be-e330f97cc722
https://app.liuyingyong.cn/build/download/e0b57db0-939f-11f0-acee-6fd5015d15c0

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Client/src/views/Index.vue

@@ -14,7 +14,7 @@
    </div>
    <div class="vol-container" :style="{ left: menuWidth - 1 + 'px' }">
      <div class="vol-header">
        <div class="project-name">WCS</div>
        <div class="project-name">高铁轮对智能仓储调度系统</div>
        <div class="header-text">
          <!-- <div class="h-link">
            <a

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Client/src/views/Login.vue

@@ -1,6 +1,6 @@
<template>
  <div class="login-container">
    <div class="project-name">WIDESEA_WMS</div>
    <div class="project-name">高铁轮对智能仓储调度系统</div>
    <div class="login-form">
      <div class="form-user" @keypress="loginPress">
        <div class="login-text">

 ÏîÄ¿´úÂë/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_DTO/TaskInfo/WMSTaskDTO.cs

@@ -82,5 +82,10 @@
        /// è½®åž‹
        /// </summary>
        public string WheelsLX { get;set; }

        /// <summary>
        /// è½¦è½´å·
        /// </summary>
        public string axle_czh { get; set; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -305,8 +305,12 @@
        /// <param name="deviceNo"></param>
        /// <returns></returns>
        Dt_Task QueryExcutingTask(string deviceNo);


        /// <summary>
        /// ä¿®æ”¹å¯¹åº”车轴出库的车轮去向
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        WebResponseContent UpWheelsFlow(SaveModel saveModel);
        /// <summary>
        /// è½¦è½´ä¸Šæ–™ç”³è¯·ï¼Œåé¦ˆæ¡ç è‡³è¾“送线
        /// </summary>

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs

@@ -205,5 +205,14 @@
        ///</summary>
        [SugarColumn(ColumnName = "Towhereabouts", Length = 20, ColumnDescription = "车轮去向地址")]
        public string Towhereabouts { get; set; }


        /// <summary>
        /// è½¦è½´å·
        /// </summary>
        [ImporterHeader(Name = "车轴号")]
        [ExporterHeader(DisplayName = "车轴号")]
        [SugarColumn(ColumnName = "axle_czh", Length = 50, ColumnDescription = "车轴号")]
        public string axle_czh { get; set; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs

@@ -193,5 +193,13 @@
        ///</summary>
        [SugarColumn(ColumnName = "Towhereabouts", Length = 20, ColumnDescription = "车轮去向地址")]
        public string Towhereabouts { get; set; }

        /// <summary>
        /// è½¦è½´å·
        /// </summary>
        [ImporterHeader(Name = "车轴号")]
        [ExporterHeader(DisplayName = "车轴号")]
        [SugarColumn(ColumnName = "axle_czh", Length = 50, ColumnDescription = "车轴号")]
        public string axle_czh { get; set; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs

@@ -83,5 +83,8 @@
        {
            return Service.SetPlcPalletCode(saveModel);
        }



    }
}

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

@@ -3,6 +3,7 @@
using MoYu.Localization;
using Newtonsoft.Json;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
@@ -50,6 +51,14 @@
                var task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());

                Dt_Task? Relocationtask = null;

                //如查询移库任务时存在内侧出库任务则直接执行内侧出库任务
                var currentExistOutTask = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup);
                if (currentExistOutTask != null )
                {
                    return currentExistOutTask;
                }

                if (task.TaskNum != taskNum)
                {

@@ -224,9 +233,21 @@
            WebResponseContent content = new WebResponseContent();
            Dt_Task_Hty dt_Task_Hty = _taskHtyRepository.QueryFirst(x => x.task_CZInfo == czCode && x.CreateDate >= DateTime.Now.AddMinutes(-30));
            if (dt_Task_Hty == null) return null;
            if (dt_Task_Hty.Towhereabouts == null && dt_Task_Hty.Towhereabouts == "") return null;

            return dt_Task_Hty.Towhereabouts;
            if (dt_Task_Hty.Towhereabouts == "2032" || dt_Task_Hty.Towhereabouts == "2042")
            {
                return dt_Task_Hty.Towhereabouts;

            }else if(dt_Task_Hty.TargetAddress == "2032" || dt_Task_Hty.TargetAddress == "2042")
            {
                return dt_Task_Hty.TargetAddress;
            }
            else
            {
                return null;
            }

                
        }

        // æ£€æŸ¥å½“前托盘是否存在任务
@@ -285,6 +306,10 @@
                task.wheels_mttype = taskDTO.wheels_mttype;
                task.WheelsNewOrOld = taskDTO.WheelsNewOrOld;
                task.WheelsLX = taskDTO.WheelsLX;
                if(taskDTO.axle_czh !=null && taskDTO.axle_czh != "")
                {
                    task.axle_czh = taskDTO.axle_czh;
                }

                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {

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

@@ -843,7 +843,32 @@

        #endregion é‡å†™æ–¹æ³•


        #region
        public WebResponseContent UpWheelsFlow(SaveModel saveModel)
        {
            WebResponseContent webResponse = new WebResponseContent();
            try
            {
                string CZTM = saveModel.MainData["CZTM"].ToString();
                string TargetAddress = saveModel.MainData["TargetAddress"].ToString();
                List<Dt_Task> taskt = BaseDal.QueryData(x => x.task_CZInfo == CZTM).ToList();
                if (taskt.Count() == 0)
                    return webResponse.Error($"未找到对应车轴：{CZTM}的车轮出库信息");
                foreach (var item in taskt)
                {
                    item.Towhereabouts = TargetAddress;
                }
                BaseDal.UpdateData(taskt);
                return webResponse.OK("修改成功！");
            }
            catch (Exception ex)
            {
                // å¦‚果发生异常，则调用content.Error方法，记录错误信息，并输出错误信息
                webResponse.Error(ex.Message);
                return webResponse;
            }
        }
        #endregion




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

@@ -358,30 +358,21 @@
                    bool k3 = conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
                    WebResponseContent k4 = _taskService.UpdateTaskStatusToNext(task);

                    Console.Out.WriteLine($"读取到输送线申请,申请条码：{command.Number}，反馈至输送线信息====起始地址：{k1},目标地址“{k2},反馈信号：{k3},任务修改状态：{k4.Status}）)");
                    Console.Out.WriteLine($"读取到输送线申请,申请条码：{command.Number}，反馈至输送线信息====起始地址：{k1},目标地址“{k2},反馈信号：{k3},任务修改状态：{k4.Status},,写入去向：{task.TargetAddress}）)");

                }
                else
                {
                    WebResponseContent content = _taskService.RequestWheelsFlow(task.PalletCode).Result;
                    if (content.Status)
                    if (task.Towhereabouts == "2032" || task.Towhereabouts == "2042")
                    {
                        string taraddress = content.Data.ToString(); // "2032";SourceAddress

                        bool k1 = conveyorLine.SetValue(ConveyorLineDBName.SourceAddress, "2021", stationInfo.stationChildCode);

                        bool k2 = conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, task.TargetAddress, stationInfo.stationChildCode);
                        bool k2 = conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, task.Towhereabouts, stationInfo.stationChildCode);
                        bool k3 = conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
                        WebResponseContent k4 = _taskService.UpdateTaskStatusToNext(task);

                        Console.Out.WriteLine($"读取到输送线申请,申请条码：{command.Number}，反馈至输送线信息====起始地址：{k1},目标地址“{k2},反馈信号：{k3},任务修改状态：{k4.Status}）)");
                    }
                    else
                    {
                        conveyorLine.SetValue(ConveyorLineDBName.ResponState, 2, stationInfo.stationChildCode);

                        Console.Out.WriteLine($"读取到输送线申请,申请条码：{command.Number}，向WMS申请去向失败，原因：{content.Message},写入申诉信故障：2");
                    }
                        Console.Out.WriteLine($"读取到输送线申请,申请条码：{command.Number}，反馈至输送线信息====起始地址：{k1},目标地址“{k2},反馈信号：{k3},任务修改状态：{k4.Status},,写入去向：{task.Towhereabouts}）)");
                    }  
                }

            }

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

@@ -34,7 +34,8 @@
            "isCantainGK": "",
            "lowerValue_gk": "",
            "upperValue_gk": "",
            "postContainer":""
            "postContainer":"",
            "estimatedvalue":""
        });
        const editFormOptions = ref([
            [
@@ -59,6 +60,9 @@
            ],
            [
                { "title": "制动盘方向", "field": "postContainer", "type": "select", dataKey: "", data: [{key:"中",value:"中"},{key:"侧",value:"侧"}] },
            ],
            [
                { "title": "预估值", "field": "estimatedvalue", "type": "decimal" },
            ]
        ]);
        const searchFormFields = ref({
@@ -92,7 +96,8 @@
        //{ field: 'modifier', title: '修改人', type: 'string', sort: true, width: 90, align: 'left' },
        //{ field: 'modifyDate', title: '修改时间', type: 'datetime', sort: true, width: 90, align: 'left', sort: true },
        { field: 'postContainer', title: '制动盘方向', type: 'bool', width: 120, align: 'left', bind: { key: "", data: [{key:"中",value:"中"},{key:"侧",value:"侧"}]} },
        ]);
        { field: 'estimatedvalue', title: '预估轮径值', type: 'decimal', width: 110, align: 'left' },
    ]);
        const detail = ref({
            cnName: "#detailCnName",
            table: "#detailTable",

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

@@ -37,7 +37,8 @@
        ]);
        const columns = ref([
            { field: 'iD', title: '主键ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
            { field: 'cLTM', title: '车轮条码', type: 'string', width: 150, align: 'left' },
            { field: 'equipNo', title: '编号', type: 'string', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
            { field: 'cltm', title: '车轮条码', type: 'string', width: 150, align: 'left' },
            { field: 'checkType', title: '类型(è½®/盘)', type: 'string', width: 80, align: 'left', bind: { key: "IscheckType", data: [{key:"1",value:'è½®'},{key:"2",value:'盘'}] }  },
            { field: 'gkzjI1', title: '毂孔A1', type: 'string', width: 75, align: 'left' },
            { field: 'gkzjI2', title: '毂孔A2', type: 'string', width: 75, align: 'left' },
@@ -54,7 +55,7 @@
            { field: 'gkzjAVG', title: '毂孔平均值', type: 'string', width: 80, align: 'left' },
            { field: 'result', title: '是否合格', type: 'string', width: 70, align: 'left', bind: { key: "IsQuan", data: [] } },
            { field: 'inDate', title: '测量时间', type: 'dateTime', width: 100, align: 'left' },
            { field: 'isUploadMES', title: '是否已上传智粤', type: 'string', width: 110, align: 'left', bind: { key: "Cantain", data: [] } },
             { field: 'isUploadMES', title: '是否已上传智粤', type: 'string', width: 110, align: 'left'},  //, bind: { key: "Cantain", data: [] } 
        ]);

        const detail = ref({

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,168 @@
<template>
  <view-grid
    ref="grid"
    :columns="columns"
    :detail="detail"
    :editFormFields="editFormFields"
    :editFormOptions="editFormOptions"
    :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions"
    :table="table"
    :extend="extend"
  >
  </view-grid>
</template>

<script>
import extend from "@/extension/widesea_wms/stock/Dt_PreOutbound.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
  setup() {
    const table = ref({
      key: "Id",
      footer: "Foots",
      cnName: "库存暂存出库历史",
      name: "Dt_PreOutbound",
      url: "/Dt_PreOutbound/",
      sortName: "Id",
    });
    const editFormFields = ref({
      palletCode: "",
      remark: "",
      creater: "",
      createDate: "",
      modifier: "",
      modifyDate: "",
      stockStatus: "",
      wheels_Type: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "托盘编号",
          field: "palletCode",
          type: "string",
        },
        
      ],
      [
        {
          title: "状态",
          field: "stockStatus",
          type: "int",
        },
        {
          title: "类型",
          field: "wheels_Type",
          type: "int",
        },
      ],
    ]);
    const searchFormFields = ref({
      palletCode: "",
      remark: "",
      creater: "",
      createDate: "",
      stockStatus: "",
      wheels_Type: "",
    });
    const searchFormOptions = ref([
      [
        { title: "托盘编号", field: "palletCode", type: "like" },
        { title: "状态", field: "stockStatus", type: "int" },
        //{ title: "类型", field: "wheels_Type", type: "int" },
        { title: "备注", field: "remark", type: "like" },
         { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);
    const columns = ref([
      {
        field: "Id",
        title: "主键",
        type: "int",
        width: 90,
        hidden: true,
        readonly: true,
        require: true,
        align: "left",
        sort: true,
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 100,
        align: "left",
        sort: true,
      },{
        field: "czh",
        title: "车轴号",
        type: "string",
        width: 100,
        align: "left",
        sort: true,
      },
      { field: 'stockStatus', title: '状态', type: 'int', width: 110, align: 'left', bind: { key: "", data: [{key:"1",value:"待出库"}] } },
      // {
      //   field: "wheels_Type",
      //   title: "类型",
      //   type: "int",
      //   width: 120,
      //   align: "left",
      //   sort: true,
      // },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 150,
        align: "left",
        sort: true,
      },
      {
        field: "creater",
        title: "创建者",
        type: "string",
        width: 150,
        align: "left",
        sort: true,
      },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 120,
        align: "left",
        sort: true,
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 120,
        align: "left",
        sort: true,
      },
      {
        field: "modifyDate",
        title: "修改日期",
        type: "datetime",
        width: 120,
        align: "left",
        sort: true,
      },
      
    ]);
    return {
      table,
      extend,
      editFormFields,
      editFormOptions,
      searchFormFields,
      searchFormOptions,
      columns,
    };
  },
});
</script>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,168 @@
<template>
  <view-grid
    ref="grid"
    :columns="columns"
    :detail="detail"
    :editFormFields="editFormFields"
    :editFormOptions="editFormOptions"
    :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions"
    :table="table"
    :extend="extend"
  >
  </view-grid>
</template>

<script>
import extend from "@/extension/widesea_wms/stock/Dt_PreOutbound_hty.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
  setup() {
    const table = ref({
      key: "Id",
      footer: "Foots",
      cnName: "库存暂存出库历史",
      name: "Dt_PreOutbound_hty",
      url: "/Dt_PreOutbound_hty/",
      sortName: "Id",
    });
    const editFormFields = ref({
      palletCode: "",
      remark: "",
      creater: "",
      createDate: "",
      modifier: "",
      modifyDate: "",
      stockStatus: "",
      wheels_Type: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "托盘编号",
          field: "palletCode",
          type: "string",
        },
        
      ],
      [
        {
          title: "状态",
          field: "stockStatus",
          type: "int",
        },
        {
          title: "类型",
          field: "wheels_Type",
          type: "int",
        },
      ],
    ]);
    const searchFormFields = ref({
      palletCode: "",
      remark: "",
      creater: "",
      createDate: "",
      stockStatus: "",
      wheels_Type: "",
    });
    const searchFormOptions = ref([
      [
        { title: "托盘编号", field: "palletCode", type: "like" },
        { title: "状态", field: "stockStatus", type: "int" },
        //{ title: "类型", field: "wheels_Type", type: "int" },
        { title: "备注", field: "remark", type: "like" },
         { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);
    const columns = ref([
      {
        field: "Id",
        title: "主键",
        type: "int",
        width: 90,
        hidden: true,
        readonly: true,
        require: true,
        align: "left",
        sort: true,
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 100,
        align: "left",
        sort: true,
      },{
        field: "czh",
        title: "车轴号",
        type: "string",
        width: 100,
        align: "left",
        sort: true,
      },
      { field: 'stockStatus', title: '状态', type: 'int', width: 110, align: 'left', bind: { key: "", data: [{key:"1",value:"待出库"}] } },
      // {
      //   field: "wheels_Type",
      //   title: "类型",
      //   type: "int",
      //   width: 120,
      //   align: "left",
      //   sort: true,
      // },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 150,
        align: "left",
        sort: true,
      },
      {
        field: "creater",
        title: "创建者",
        type: "string",
        width: 150,
        align: "left",
        sort: true,
      },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 120,
        align: "left",
        sort: true,
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 120,
        align: "left",
        sort: true,
      },
      {
        field: "modifyDate",
        title: "修改日期",
        type: "datetime",
        width: 120,
        align: "left",
        sort: true,
      },
      
    ]);
    return {
      table,
      extend,
      editFormFields,
      editFormOptions,
      searchFormFields,
      searchFormOptions,
      columns,
    };
  },
});
</script>

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

@@ -64,6 +64,7 @@
            { field: 'wheels_Num', title: '车轮号', type: 'string', width: 110, align: 'left' },
            //{ field: 'wheels_Type', title: '类型(è½®/盘)', type: 'string', width: 110, align: 'left' },
            { field: 'wheels_ldxh', title: '轮型', type: 'string', width: 110, align: 'left' },
            { field: 'remark', title: '备注', type: 'string', width: 60, align: 'left' },
            { field: 'wheels_CurrentStatue', title: '状态', type: 'int', width: 110, align: 'left', bind: { key: "CurrentStatue", data: [] } },
            { field: 'wheels_gkcc', title: '毂孔均值', type: 'string', sort: true, width: 100, align: 'left' },
            { field: 'wheels_Num', title: '车轮条码', type: 'string', width: 120, align: 'left' },

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

@@ -65,6 +65,7 @@
            { field: 'wheels_Num', title: '车轮号', type: 'string', width: 110, align: 'left' },
            { field: 'wheels_Location', title: '库位号', type: 'string', width: 110, align: 'left' },
            { field: 'stockType', title: '库存类型', type: 'string', width: 80, align: 'left' },
            { field: 'remark', title: '备注', type: 'string', width: 60, align: 'left' },
            // { field: 'wheels_CurrentStatue', title: '状态', type: 'int', width: 110, align: 'left', bind: { key: "InboundState", data: [] } },
            { field: 'wheels_Type', title: '类型', type: 'string', width: 50, align: 'left' },
            { field: 'wheels_CarType', title: '车型', type: 'string', width: 70, align: 'left'  },

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

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.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_Common/LevelChange/CheckTaskChangeHelper.cs

@@ -44,6 +44,7 @@
        public static string CheckTaskwheelsProps(string wxrw)
        {
            string wheelsNewOld = string.Empty;

            if (wxrw.Contains("换轮盘(旧)"))
            {
                wheelsNewOld = "新轮旧盘";

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_DTO/WMS/WMSTaskDTO.cs

@@ -78,10 +78,16 @@
        /// åŠ¨æ‹–属性
        /// </summary>
        public string wheels_mttype { get; set; }

        
        /// <summary>
        /// è½®åž‹
        /// </summary>
        public string WheelsLX { get; set; }


        /// <summary>
        /// è½¦è½´å·
        /// </summary>
        public string axle_czh { get; set; }
    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/ToAPP/IToAPPService.cs

@@ -13,6 +13,11 @@
        WebResponseContent SaveCLinfo(SaveModel saveModel);

        WebResponseContent SaveCZInfo(SaveModel saveModel);

        
        WebResponseContent SaveCZInfoTemporarystorage(SaveModel saveModel);


        
        WebResponseContent SaveCZStraight(SaveModel saveModel);
        WebResponseContent SaveCZInfo2(SaveModel saveModel);
@@ -25,5 +30,8 @@
        WebResponseContent SaveZDPXPInfo(SaveModel saveModel);


        WebResponseContent SaveTemporaryissued();


    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Location/ILocationInfoService.cs

@@ -22,7 +22,7 @@
    WebResponseContent CreateLocation(int x, int y, int z, int locType, int areaId);

    WebResponseContent LocationEnable(SaveModel saveModel);
    WebResponseContent LocationStatus();
    WebResponseContent LocationStatuskt();

    /// <summary>
    /// æŸ¥æ‰¾è´§ä½

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

@@ -3,7 +3,7 @@
public interface IDt_WheelsStockService : IService<Dt_WheelsStock>
{

    Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes,string wheelsPosition,string newOrOld);
    Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes,string wheelsPosition,string newOrOld,int xuanpeicount);

    Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld, string wheelsProps);


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

@@ -180,5 +180,13 @@
        [ExporterHeader(DisplayName = "是否已上传智粤系统")]
        [SugarColumn(ColumnName = "IsUploadMES", Length = 50, ColumnDescription = "是否已上传智粤系统")]
        public bool IsUploadMES { get; set; } //= false;

        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        [ImporterHeader(Name = "创建时间")]
        [ExporterHeader(DisplayName = "创建时间")]
        [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "创建时间")]
        public DateTime CreateDate { get; set; } = DateTime.Now;
    }
}

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

@@ -68,5 +68,11 @@
        /// </summary>
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "制动盘方向")]
        public string PostContainer { get; set; }

        /// <summary>
        /// é¢„估轮径值
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "预估轮径值")]
        public decimal Estimatedvalue { get; set; }
    }
}

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

@@ -229,5 +229,13 @@
        [SugarColumn(IsNullable = false, ColumnDescription = "当前库存天数")]
        public int Wheels_DateDet { get; set; } = 0;

        /// <summary>
        /// å¤‡æ³¨ 
        /// </summary>
        [ImporterHeader(Name = "备注")]
        [ExporterHeader(DisplayName = "备注")]
        [SugarColumn(IsNullable = true, ColumnDescription = "备注")]
        public string Remark { get; set; }

    }
}

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

@@ -37,8 +37,8 @@
                if (clinfo != null) throw new Exception("车轮录入信息已存在");

                //检测库存是否已存在
                _WheelsStockRepository.QueryFirst(x => x.Wheels_code == clCode || x.Wheels_Num == clh);
                if (clinfo != null) throw new Exception("库内已存在,请检查库存");
                Dt_WheelsStock dt_WheelsStock= _WheelsStockRepository.QueryFirst(x => x.Wheels_code == clCode || x.Wheels_Num == clh);
                if (dt_WheelsStock != null) throw new Exception("库内已存在,请检查库存");

                //序列号
                //string madeUnit = saveModel.MainData["xlh"].ToString();

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

@@ -138,6 +138,19 @@
                string wxrw = saveModel.MainData["wxrw"].ToString();
                if (string.IsNullOrEmpty(wxrw)) throw new Exception("选配失败：维修任务参数为空");

                int zuixiaoz = 0;
                int zuidaz = 0;
                if (newOrOld == "1")
                {
                    //最小值
                     zuixiaoz = int.Parse(saveModel.MainData["zuixiaoz"].ToString());

                    //最大值
                     zuidaz = int.Parse(saveModel.MainData["zuidaz"].ToString());
                   
                }
                

                string level = string.Empty;
                //string rightlevel = string.Empty;
                if ("all".Equals(wheelsPosition))
@@ -241,9 +254,31 @@
                }
                else
                {
                    //找出所有符合条件的库存车轮
                    WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && x.Wheels_Statue == 0);

                    if (CZInfo_Mes.MTTYPE == "T")
                    {
                        //去掉了属性对比
                        WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now  && x.Wheels_Statue == 0);
                    }
                    else
                    {
                        WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && x.Wheels_Statue == 0);
                    }

                    
                }


                if(newOrOld=="1")
                {
                    foreach (var item in WheelsList)
                    {
                        decimal ygrjz = decimal.Parse(item.Wheels_ygljz);
                        if (ygrjz < zuixiaoz || ygrjz > zuidaz)
                        WheelsList.Remove(item);
                    }
                }
                

                //x.Wheels_CarType  == CZInfo_Mes.CHEXING && x.Wheels_ldtm == CZInfo_Mes.LDTM && selectionStandards.CarType.Contains(x.Wheels_CarType)
                if (null != WheelsList && WheelsList.Count > 0)
@@ -252,37 +287,47 @@
                    {
                        if (null == leftContainer)
                        {
                            leftContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "left", newOrOld);
                            leftContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "left", newOrOld, 2);
                            if (null != leftContainer)
                                WheelsList.Remove(leftContainer);
                        }
                        if (null == rightContainer)
                        {
                            rightContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "right", newOrOld);
                            rightContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "right", newOrOld, 2);
                            if (null != rightContainer)
                                WheelsList.Remove(rightContainer);
                        }
                        //if (null == leftContainer || null == rightContainer)


                        if (null == leftContainer || null == rightContainer)
                            return content.Error("未找到两侧可匹配的出库车轮,车型：" + Cartype);

                        if(newOrOld == "1")
                        {
                            //此处判断两个预估值相减，是否在范围内
                            decimal difference = decimal.Parse(leftContainer.Wheels_ygljz) - decimal.Parse(rightContainer.Wheels_ygljz);
                            decimal absoluteDifference = Math.Abs(difference);
                            if (absoluteDifference > selectionStandards.Estimatedvalue)
                            {
                                return content.Error("未找到两侧可匹配的出库车轮，预估值不在范围内,车型：" + Cartype);
                            }
                        }
                        

                    }
                    else if ("left".Equals(wheelsPosition))
                    {
                        leftContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "left", newOrOld);
                        leftContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "left", newOrOld , 1);
                        //if (null == leftContainer)
                    }
                    else if ("right".Equals(wheelsPosition))
                    {
                        rightContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "right", newOrOld);
                        rightContainer = _WheelsStockService.GetSelectionWheelsStock(WheelsList, selectionStandards, CZInfo_Mes, "right", newOrOld ,1);
                        //if (null == rightContainer)
                    }
                }

                if ("all".Equals(wheelsPosition))
                {
                    if (null == leftContainer || null == rightContainer)
                        return content.Error("未找到两侧可匹配的出库车轮,车型：" + Cartype);


                }
                

                if (null != leftContainer || null != rightContainer)
                {
@@ -332,7 +377,8 @@
                            WheelsNewOrOld = leftContainer.Wheels_NewOrOld,
                            wheels_gkcc = leftContainer.Wheels_gkcc,
                            wheels_mttype = leftContainer.Wheels_mttype,
                            WheelsLX = leftContainer.Wheels_ldxh
                            WheelsLX = leftContainer.Wheels_ldxh,
                            axle_czh= czCode,
                        };

                        listTask.Add(leftTask);

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

@@ -35,8 +35,10 @@
        private readonly IDt_InZdp_mesRepository _InZdp_MesRepository;

        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly IDt_PreOutboundRepository _PreOutboundRepository;
        private readonly IDt_PreOutbound_htyRepository _PreOutbound_htyRepository;

        public ToAPPService(ILocationInfoRepository locationRepository, IDt_TaskRepository taskRepository, ISys_ConfigService configService, IDt_InWheels_mesRepository inWheels_MesRepository, IDt_WheelsStockRepository wheelsStockRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IDt_WheelsStockService wheelsStockService, IDt_CZInfo_mesRepository cZInfo_MesRepository,  IUnitOfWorkManage unitOfWorkManage, IDt_WheelsStock_OldRepository dt_WheelsStock_OldRepository, ISelectionWheelsRepository selectionWheelsRepository, IDt_AxleshelfService axleshelfService, IDt_ZdpStockRepository zdpStockRepository, IDt_InZdp_mesRepository inZdp_MesRepository, IDt_ZdpStockService zdpStockService)
        public ToAPPService(ILocationInfoRepository locationRepository, IDt_TaskRepository taskRepository, ISys_ConfigService configService, IDt_InWheels_mesRepository inWheels_MesRepository, IDt_WheelsStockRepository wheelsStockRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IDt_WheelsStockService wheelsStockService, IDt_CZInfo_mesRepository cZInfo_MesRepository,  IUnitOfWorkManage unitOfWorkManage, IDt_WheelsStock_OldRepository dt_WheelsStock_OldRepository, ISelectionWheelsRepository selectionWheelsRepository, IDt_AxleshelfService axleshelfService, IDt_ZdpStockRepository zdpStockRepository, IDt_InZdp_mesRepository inZdp_MesRepository, IDt_ZdpStockService zdpStockService, IDt_PreOutboundRepository preOutboundRepository, IDt_PreOutbound_htyRepository preOutbound_htyRepository)
        {
            _InWheels_MesRepository = inWheels_MesRepository;
            _locationRepository = locationRepository;
@@ -53,6 +55,8 @@
            _ZdpStockRepository = zdpStockRepository;
            _InZdp_MesRepository = inZdp_MesRepository;
            _ZdpStockService = zdpStockService;
            _PreOutboundRepository = preOutboundRepository;
            _PreOutbound_htyRepository = preOutbound_htyRepository;
        }
    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToCheckEquip/Partial/UploadCheckResult.cs

@@ -59,6 +59,7 @@
                }

                result.InDate = DateTime.Now;
                result.CreateDate = DateTime.Now;


                LogFactory.GetLog("测量设备上传测量结果数据").Info(true, $"\r\r--------------------------------------");

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/BasicInfo/Dt_SelectionStandardsService.cs

@@ -27,6 +27,7 @@
                decimal upperValue = Convert.ToDecimal(saveModel.MainData["upperValue"]);
                int isCantainGK = saveModel.MainData["isCantainGK"].ObjToInt();
                string PostContainer = saveModel.MainData["postContainer"].ToString();
                decimal Estimatedvalue = Convert.ToDecimal(saveModel.MainData["estimatedvalue"]);


                if (lowerValue < 0 || upperValue < 0) throw new Exception("过盈量值异常");
@@ -61,6 +62,7 @@
                    upperValue_gk = upperValue_gk,
                    upperValue = upperValue,
                    PostContainer = PostContainer,
                    Estimatedvalue = Estimatedvalue,
                };

                if (BaseDal.AddData(selectionStandards) > 0)
@@ -94,13 +96,15 @@
                string gkdj = saveModel.MainData["gkdj"].ToString();
                decimal lowerValue = Convert.ToDecimal(saveModel.MainData["lowerValue"]);
                decimal upperValue = Convert.ToDecimal(saveModel.MainData["upperValue"]);

                decimal Estimatedvalue = Convert.ToDecimal(saveModel.MainData["estimatedvalue"]);
                string PostContainer = saveModel.MainData["postContainer"].ToString();
                int isCantainGK = saveModel.MainData["isCantainGK"].ObjToInt();

                Dt_SelectionStandards dt_Selection = BaseDal.QueryFirst(x => x.ID == id);

                

                dt_Selection.Estimatedvalue = Estimatedvalue;
                dt_Selection.CarType = carType;
                dt_Selection.mttype = mttype;
                dt_Selection.neworold = neworold;

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs

@@ -315,21 +315,32 @@
    #endregion å¯ç”¨ç¦ç”¨è´§ä½

    #region å¤§å±åº“位状态获取
    public WebResponseContent LocationStatus()
    public WebResponseContent LocationStatuskt()
    {
        WebResponseContent content = new WebResponseContent();
        
        // èŽ·å–所有库位数据
        List<DtLocationInfo> locations = BaseDal.QueryData();

        // å®šä¹‰æ‰€æœ‰å¯èƒ½çš„状态及其对应的显示文本
        var allStatuses = new Dictionary<int, string>
{
    { 0, "空货位" },
    { 1, "锁定" },
    { 2, "有货" },
    { 3, "有货禁用" }
};

        // æŒ‰LocationStatus分组统计
        var statusGroups = locations
            .GroupBy(l => l.LocationStatus)
            .Select(g => new
            {
                Status = g.Key==0?"空货位": g.Key == 1 ? "锁定": g.Key == 2 ? "有货": "有货禁用",
                Count = g.Count(),
            })
        var statusGroups = allStatuses
            .GroupJoin(locations.GroupBy(l => l.LocationStatus),
                status => status.Key,
                group => group.Key,
                (status, groups) => new
                {
                    Status = status.Value,
                    Count = groups.SelectMany(g => g).Any() ? groups.First().Count() : 0
                })
            .ToList();

        // å°†ç»Ÿè®¡ç»“果放入响应内容

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

@@ -69,12 +69,13 @@
        }
    }

    public Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> WheelsList, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld)
    public Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> WheelsList, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld,int xuanpeicount)
    {
        //过盈量上限
        decimal selectionUpperValue = selectionStandards.upperValue;
        //过盈量下限
        decimal selectionLowerValue = selectionStandards.lowerValue;


        string level = string.Empty;
        if ("left".Equals(wheelsPosition))  //匹配左轮座轮子
@@ -130,7 +131,16 @@
                    ).ToList();
            }
        }
        return WheelsList.OrderBy(x => x.CreateDate).FirstOrDefault();

        if (newOrOld == "1" && xuanpeicount==2)
        {
            return WheelsList.OrderBy(x => decimal.Parse(x.Wheels_ygljz)).FirstOrDefault();
        }
        else
        {
            return WheelsList.OrderBy(x => x.CreateDate).FirstOrDefault();

        }
    }



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

@@ -46,6 +46,7 @@
    private readonly IDt_InZdp_mes_htyRepository _InZdp_Mes_HtyRepository; 
    private readonly IDt_ZdpStockRepository _ZdpStockRepository;
    private readonly IDt_ZdpStock_htyRepository _ZdpStock_HtyRepository;
    private readonly IDt_PreOutboundRepository _PreOutboundRepository;
    

    public Dt_TaskService(IDt_TaskRepository BaseDal,
@@ -70,7 +71,8 @@
                                IDt_InZdp_mes_htyRepository inZdp_Mes_HtyRepository,
                                IDt_ZdpStockRepository zdpStockRepository,
                                IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository,
                                IDt_OutZdp_htyRepository dt_OutZdp_HtyRepository) : base(BaseDal)
                                IDt_OutZdp_htyRepository dt_OutZdp_HtyRepository,
                                IDt_PreOutboundRepository dt_PreOutboundRepository) : base(BaseDal)

    {
        _unitOfWorkManage = unitOfWorkManage;
@@ -92,6 +94,7 @@
        _ZdpStockRepository = zdpStockRepository;
        _ZdpStock_HtyRepository = dt_ZdpStock_HtyRepository;
        _Dt_OutZdp_htyRepository = dt_OutZdp_HtyRepository;
        _PreOutboundRepository = dt_PreOutboundRepository;
    }

    #region å¤–部接口方法
@@ -714,7 +717,7 @@
                        SourceAddress = zdpInfo.Zdp_Location,
                        CurrentAddress =zdpInfo.Zdp_Location,
                        TaskState = (int)TaskOutStatusEnum.OutNew,
                        TaskType = outtype == "2" ? (int)TaskOutboundTypeEnum.OutBrake : (int)TaskOutboundTypeEnum.OutWheels,
                        TaskType = (int)TaskOutboundTypeEnum.OutBrake,
                        TaskNum = BaseDal.GetTaskNo().Result,
                        Creater = "System",
                        CreateDate = DateTime.Now,
@@ -739,6 +742,14 @@
                {
                    Dt_WheelsStock stockInfo = _WheelsStockRepository.QueryFirst(x => x.Wheels_code == item);
                    if (stockInfo == null) return content.Error("未查询到对应的库存信息");

                    Dt_PreOutbound dt_Pre=_PreOutboundRepository.QueryFirst(x => x.PalletCode == stockInfo.Wheels_code);
                    if (dt_Pre != null)
                    {
                        return content.Error($"当前车轮号已在暂存出库中，不可直接出库！！！，车轮条码：{dt_Pre.PalletCode}");
                    }


                    stockInfo.Wheels_CurrentStatue = 4;
                    string Location = stockInfo.Wheels_Location;
                    var locationst = locationinfoData.Where(x => x.LocationCode== stockInfo.Wheels_Location).FirstOrDefault();

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

@@ -231,6 +231,13 @@
                return content.Error($"未知条码{input.PalletCode}任务");
            }

            List<Dt_Task> taskcl =  BaseDal.QueryData(x => x.TaskState == (int)TaskOutStatusEnum.Lien_Check);
            if (taskcl.Count > 0)
            {
                return content.Error($"已有在测量中的车轮，请查看是否申请正确");
            }


            task.TaskState = (int)TaskOutStatusEnum.Lien_Check;
            task.CurrentAddress = input.Position;
            task.NextAddress = "2021";
@@ -296,7 +303,7 @@
        try
        {
            string CZTM = saveModel.MainData["CZTM"].ToString();
            string TargetAddress = saveModel.MainData["TargetAddress"].ToString();
            string TargetAddress = saveModel.MainData["TargetAddress"].ToString();  
            List<Dt_Task> taskt = BaseDal.QueryData(x => x.task_CZInfo == CZTM).ToList();
            if (taskt.Count() == 0)
                return webResponse.Error($"未找到对应车轴：{CZTM}的车轮出库信息");

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/APP/ToAPPController.cs

@@ -54,6 +54,17 @@
    }

    /// <summary>
    /// æš‚存车轮出库
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost, Route("SaveCZInfoTemporarystorage"), AllowAnonymous]
    public WebResponseContent SaveCZInfoTemporarystorage([FromBody] SaveModel input)
    {
        return _AppService.SaveCZInfoTemporarystorage(input);
    }

    /// <summary>
    /// ä¿å­˜è½¦è½´ä¿¡æ¯
    /// </summary>
    /// <param name="input"></param>
@@ -106,4 +117,15 @@
    {
        return _AppService.SaveZDPStraight(saveModel);
    }


    /// <summary>
    /// æš‚存库下发任务
    /// </summary>
    /// <returns></returns>
    [HttpGet, Route("SaveTemporaryissued"), AllowAnonymous]
    public WebResponseContent SaveTemporaryissued()
    {
        return _AppService.SaveTemporaryissued();
    }
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs

@@ -39,10 +39,10 @@


    //获取货位状态信息
    [HttpPost, AllowAnonymous, Route("LocationStatus")]
    public WebResponseContent LocationStatus()
    [HttpPost, AllowAnonymous, Route("LocationStatuskt")]
    public WebResponseContent LocationStatuskt()
    {
        return Service.LocationStatus();
        return Service.LocationStatuskt();
    }

    [HttpPost, AllowAnonymous, Route("RequestLocation")]

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

@@ -153,4 +153,6 @@
    {
        return Service.GetStockStatue();
    }

    
}

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish.zip

Binary files differ

 ÏîÄ¿´úÂë/´óÆÁ×îаæ/н¨Îļþ¼Ð.zip

Binary files differ