PDA

dengjunjie

2025-01-03 38b3f8182e21a9114ee78ae5d5c550179ff628ca

PDA

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -278,7 +278,7 @@
        /// <returns></returns>
        public string? RequestAssignLocation(int taskNum, string roadwayNo)
        {
            string responseStr = HttpHelper.Get($"http://127.0.0.1:9293/api/Task/AssignInboundTaskLocation?taskNum={taskNum}&roadwayNo={roadwayNo}");
            string responseStr = HttpHelper.Get($"http://127.0.0.1:9283/api/Task/AssignInboundTaskLocation?taskNum={taskNum}&roadwayNo={roadwayNo}");

            WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(responseStr);
            if (responseContent != null && responseContent.Status && responseContent.Data != null)

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/config/buttons.js

@@ -153,6 +153,15 @@
    onClick: function () {
    }
},
{
    name: "创 å»º å…¥ åº“ å•",
    icon: '',
    class: '',
    value: 'CreateInOrder',
    type: 'success',
    onClick: function () {
    }
},
]

export default buttons

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/package-lock.json

@@ -3887,7 +3887,6 @@
      "version": "6.0.0",
      "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1604880017635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz",
      "integrity": "sha1-UR1wLAxOQcoVbX0OlgIfI+EyJbE=",
      "dev": true,
      "requires": {
        "string-width": "^4.2.0",
        "strip-ansi": "^6.0.0",
@@ -3897,20 +3896,17 @@
        "ansi-regex": {
          "version": "5.0.0",
          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-5.0.0.tgz?cache=0&sync_timestamp=1618552978881&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.0.tgz",
          "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=",
          "dev": true
          "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U="
        },
        "is-fullwidth-code-point": {
          "version": "3.0.0",
          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz?cache=0&sync_timestamp=1618552469710&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-3.0.0.tgz",
          "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=",
          "dev": true
          "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0="
        },
        "string-width": {
          "version": "4.2.2",
          "resolved": "https://registry.nlark.com/string-width/download/string-width-4.2.2.tgz",
          "integrity": "sha1-2v1PlVmnWFz7pSnGoKT3NIjr1MU=",
          "dev": true,
          "requires": {
            "emoji-regex": "^8.0.0",
            "is-fullwidth-code-point": "^3.0.0",
@@ -3921,7 +3917,6 @@
          "version": "6.0.0",
          "resolved": "https://registry.nlark.com/strip-ansi/download/strip-ansi-6.0.0.tgz",
          "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=",
          "dev": true,
          "requires": {
            "ansi-regex": "^5.0.0"
          }
@@ -4721,8 +4716,7 @@
    "decamelize": {
      "version": "1.2.0",
      "resolved": "https://registry.nlark.com/decamelize/download/decamelize-1.2.0.tgz",
      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
      "dev": true
      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
    },
    "decode-uri-component": {
      "version": "0.2.0",
@@ -4979,6 +4973,11 @@
        "utility": "^1.17.0"
      }
    },
    "dijkstrajs": {
      "version": "1.0.3",
      "resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
    },
    "dir-glob": {
      "version": "2.2.2",
      "resolved": "https://registry.nlark.com/dir-glob/download/dir-glob-2.2.2.tgz",
@@ -5210,8 +5209,7 @@
    "emoji-regex": {
      "version": "8.0.0",
      "resolved": "https://registry.nlark.com/emoji-regex/download/emoji-regex-8.0.0.tgz",
      "integrity": "sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc=",
      "dev": true
      "integrity": "sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc="
    },
    "emojis-list": {
      "version": "3.0.0",
@@ -6139,8 +6137,7 @@
    "get-caller-file": {
      "version": "2.0.5",
      "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz",
      "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=",
      "dev": true
      "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34="
    },
    "get-func-name": {
      "version": "2.0.0",
@@ -9240,7 +9237,6 @@
      "version": "2.3.0",
      "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz",
      "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
      "dev": true,
      "requires": {
        "p-try": "^2.0.0"
      }
@@ -9272,8 +9268,7 @@
    "p-try": {
      "version": "2.2.0",
      "resolved": "https://registry.nlark.com/p-try/download/p-try-2.2.0.tgz",
      "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=",
      "dev": true
      "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
    },
    "pac-proxy-agent": {
      "version": "5.0.0",
@@ -9568,6 +9563,11 @@
      "resolved": "https://registry.npm.taobao.org/pn/download/pn-1.1.0.tgz",
      "integrity": "sha1-4vTO8OIZ9GPBeas3Rj5OHs3Muvs=",
      "dev": true
    },
    "pngjs": {
      "version": "5.0.0",
      "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
    },
    "pnp-webpack-plugin": {
      "version": "1.6.4",
@@ -10356,6 +10356,108 @@
      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
      "dev": true
    },
    "qrcode": {
      "version": "1.5.4",
      "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.4.tgz",
      "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
      "requires": {
        "dijkstrajs": "^1.0.1",
        "pngjs": "^5.0.0",
        "yargs": "^15.3.1"
      },
      "dependencies": {
        "ansi-regex": {
          "version": "5.0.1",
          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
        },
        "camelcase": {
          "version": "5.3.1",
          "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
        },
        "find-up": {
          "version": "4.1.0",
          "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
          "requires": {
            "locate-path": "^5.0.0",
            "path-exists": "^4.0.0"
          }
        },
        "is-fullwidth-code-point": {
          "version": "3.0.0",
          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
        },
        "locate-path": {
          "version": "5.0.0",
          "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
          "requires": {
            "p-locate": "^4.1.0"
          }
        },
        "p-locate": {
          "version": "4.1.0",
          "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
          "requires": {
            "p-limit": "^2.2.0"
          }
        },
        "path-exists": {
          "version": "4.0.0",
          "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
        },
        "string-width": {
          "version": "4.2.3",
          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
          "requires": {
            "emoji-regex": "^8.0.0",
            "is-fullwidth-code-point": "^3.0.0",
            "strip-ansi": "^6.0.1"
          }
        },
        "strip-ansi": {
          "version": "6.0.1",
          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
          "requires": {
            "ansi-regex": "^5.0.1"
          }
        },
        "yargs": {
          "version": "15.4.1",
          "resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
          "requires": {
            "cliui": "^6.0.0",
            "decamelize": "^1.2.0",
            "find-up": "^4.1.0",
            "get-caller-file": "^2.0.1",
            "require-directory": "^2.1.1",
            "require-main-filename": "^2.0.0",
            "set-blocking": "^2.0.0",
            "string-width": "^4.2.0",
            "which-module": "^2.0.0",
            "y18n": "^4.0.0",
            "yargs-parser": "^18.1.2"
          }
        },
        "yargs-parser": {
          "version": "18.1.3",
          "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
          "requires": {
            "camelcase": "^5.0.0",
            "decamelize": "^1.2.0"
          }
        }
      }
    },
    "qs": {
      "version": "6.5.2",
      "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
@@ -10679,14 +10781,12 @@
    "require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.nlark.com/require-directory/download/require-directory-2.1.1.tgz",
      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
      "dev": true
      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
    },
    "require-main-filename": {
      "version": "2.0.0",
      "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz",
      "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=",
      "dev": true
      "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs="
    },
    "requires-port": {
      "version": "1.0.0",
@@ -11066,8 +11166,7 @@
    "set-blocking": {
      "version": "2.0.0",
      "resolved": "https://registry.nlark.com/set-blocking/download/set-blocking-2.0.0.tgz",
      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
      "dev": true
      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
    },
    "set-value": {
      "version": "2.0.1",
@@ -12820,6 +12919,21 @@
        }
      }
    },
    "vue-qrcode": {
      "version": "2.2.2",
      "resolved": "https://registry.npmmirror.com/vue-qrcode/-/vue-qrcode-2.2.2.tgz",
      "integrity": "sha512-SbrXq/mSb1g2tbDyXPe9gy9KiMYsvxWKRErlpij1BqiFoHwQckheZV63CTw6yRLLUVG2RXAVlX+APkpdCK7SQQ==",
      "requires": {
        "tslib": "^2.6.2"
      },
      "dependencies": {
        "tslib": {
          "version": "2.8.1",
          "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz",
          "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
        }
      }
    },
    "vue-router": {
      "version": "4.0.10",
      "resolved": "https://registry.nlark.com/vue-router/download/vue-router-4.0.10.tgz?cache=0&sync_timestamp=1624286995690&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-router%2Fdownload%2Fvue-router-4.0.10.tgz",
@@ -13471,8 +13585,7 @@
    "which-module": {
      "version": "2.0.0",
      "resolved": "https://registry.nlark.com/which-module/download/which-module-2.0.0.tgz",
      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
      "dev": true
      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
    },
    "wide-align": {
      "version": "1.1.3",
@@ -13516,7 +13629,6 @@
      "version": "6.2.0",
      "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz",
      "integrity": "sha1-6Tk7oHEC5skaOyIUePAlfNKFblM=",
      "dev": true,
      "requires": {
        "ansi-styles": "^4.0.0",
        "string-width": "^4.1.0",
@@ -13526,14 +13638,12 @@
        "ansi-regex": {
          "version": "5.0.0",
          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-5.0.0.tgz?cache=0&sync_timestamp=1618552978881&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.0.tgz",
          "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=",
          "dev": true
          "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U="
        },
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995547052&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
          "dev": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
@@ -13542,7 +13652,6 @@
          "version": "2.0.1",
          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
          "dev": true,
          "requires": {
            "color-name": "~1.1.4"
          }
@@ -13550,20 +13659,17 @@
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
          "dev": true
          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI="
        },
        "is-fullwidth-code-point": {
          "version": "3.0.0",
          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz?cache=0&sync_timestamp=1618552469710&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-3.0.0.tgz",
          "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=",
          "dev": true
          "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0="
        },
        "string-width": {
          "version": "4.2.2",
          "resolved": "https://registry.nlark.com/string-width/download/string-width-4.2.2.tgz",
          "integrity": "sha1-2v1PlVmnWFz7pSnGoKT3NIjr1MU=",
          "dev": true,
          "requires": {
            "emoji-regex": "^8.0.0",
            "is-fullwidth-code-point": "^3.0.0",
@@ -13574,7 +13680,6 @@
          "version": "6.0.0",
          "resolved": "https://registry.nlark.com/strip-ansi/download/strip-ansi-6.0.0.tgz",
          "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=",
          "dev": true,
          "requires": {
            "ansi-regex": "^5.0.0"
          }
@@ -13630,8 +13735,7 @@
    "y18n": {
      "version": "4.0.3",
      "resolved": "https://registry.nlark.com/y18n/download/y18n-4.0.3.tgz",
      "integrity": "sha1-tfJZyCzW4zaSHv17/Yv1YN6e7t8=",
      "dev": true
      "integrity": "sha1-tfJZyCzW4zaSHv17/Yv1YN6e7t8="
    },
    "yallist": {
      "version": "3.1.1",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/inbound/receiveOrder.js

@@ -17,6 +17,22 @@
    methods: {
       //下面这些方法可以保留也可以删除
      onInit() {  
        let InOrder = this.buttons.find(x => x.value == 'CreateInOrder');
        if (InOrder) {
          InOrder.onClick = function () {
            let rows = this.$refs.table.getSelected();
            if (rows.length == 0) return this.$error("请选择数据!");
            if (rows.length > 1) return this.$error("请选择单条数据!");
            var keys = rows.map(x => { return x.receiveOrderId });
            this.http
              .post("api/ReceiveOrder/CreateInboundOrder?receiveOrderId="+keys[0], null, "数据处理中")
              .then((x) => {
                if (!x.status) return this.$message.error(x.message);
                this.$message.success("操作成功");
                this.refresh();
              });
          }
        }
      },
      onInited() {
        //框架初始化配置后

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue

@@ -32,6 +32,7 @@
      upperOrderNo: "",
      orderStatus: "",
      remark: "",
      warehouseId:""
    });
    const editFormOptions = ref([
      [
@@ -62,6 +63,14 @@
          readonly: true,
        },
        {
          title: "仓库",
          field: "warehouseId",
          type: "select",
          dataKey: "warehouses",
          data: [],
          required: true,
        },
        {
          title: "备注",
          field: "remark",
          type: "textarea",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/PalletCodeInfoService.cs

@@ -4,6 +4,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
@@ -15,8 +16,10 @@
{
    public class PalletCodeInfoService : ServiceBase<Dt_PalletCodeInfo, IPalletCodeInfoRepository>, IPalletCodeInfoService
    {
        public PalletCodeInfoService(IPalletCodeInfoRepository BaseDal) : base(BaseDal)
        private readonly IWarehouseRepository _warehouseRepository;
        public PalletCodeInfoService(IPalletCodeInfoRepository BaseDal, IWarehouseRepository warehouseRepository) : base(BaseDal)
        {
            _warehouseRepository = warehouseRepository;
        }

        static object locker = new object();
@@ -47,12 +50,24 @@
                {
                    serialNo = 1;
                }
                Dt_Warehouse _Warehouse = _warehouseRepository.QueryFirst(x=>x.WarehouseId== warehouseId);
                string uplen = "";
                switch (_Warehouse.WarehouseCode)
                {
                    case "HA153":
                        uplen = "Y";
                        break;
                    default:
                        uplen = "N";
                        break;
                }
                for (int i = 0; i < count; i++)
                {
                    
                    palletCodeInfos.Add(new Dt_PalletCodeInfo
                    {
                        SerialNo = serialNo,
                        PalletCode = now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
                        PalletCode = uplen+now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
                        PalletType = 1,
                        PalletTypeId = 0,
                        WarehouseId = warehouseId,

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs

@@ -34,14 +34,16 @@
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly ICacheService _cacheService;
        private readonly IBasicRepository _basicRepository;
        private readonly ISupplierInfoRepository _supplierInfoRepository;
        private readonly ISys_RoleDataPermissionRepository _roleDataPermissionRepository;

        public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, IBasicRepository basicRepository, ISys_RoleDataPermissionRepository roleDataPermissionRepository) : base(BaseDal)
        public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, IBasicRepository basicRepository, ISys_RoleDataPermissionRepository roleDataPermissionRepository, ISupplierInfoRepository supplierInfoRepository) : base(BaseDal)
        {
            _unitOfWorkManage = unitOfWorkManage;
            _cacheService = cacheService;
            _basicRepository = basicRepository;
            _roleDataPermissionRepository = roleDataPermissionRepository;
            _supplierInfoRepository = supplierInfoRepository;
        }

        public ISys_DictionaryRepository Repository => BaseDal;
@@ -174,6 +176,40 @@
            {
                switch (key)
                {
                    case "warehouses":
                        {
                            List<object> data = new List<object>();

                            {
                                List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData();
                                int index = 0;
                                foreach (var item in warehouses)
                                {
                                    data.Add(new { key = item.WarehouseId, value = item.WarehouseName });
                                    index++;
                                }
                            }

                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                    case "suppliers":
                        {
                            List<object> data = new List<object>();

                            {
                                List<Dt_SupplierInfo> supplierInfos = _supplierInfoRepository.QueryData();
                                int index = 0;
                                foreach (var item in supplierInfos)
                                {
                                    data.Add(new { key = item.SupplierCode, value = item.SupplierCode });
                                    index++;
                                }
                            }

                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                    case "inboundState":
                        {
                            List<object> data = new List<object>();

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -108,7 +108,7 @@
                {
                    x.AGVArea = agvDescription;
                });
                string response = HttpHelper.Post("http://127.0.0.1:9291/api/Task/ReceiveTask", taskDTOs.Serialize());
                string response = HttpHelper.Post("http://127.0.0.1:9281/api/Task/ReceiveTask", taskDTOs.Serialize());

                return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("返回错误");
            }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Completed.cs

@@ -69,7 +69,7 @@
                {
                    x.AGVArea = agvDescription;
                });
                string response = HttpHelper.Post("http://127.0.0.1:9291/api/Task/ReceiveTask", taskDTOs.Serialize());
                string response = HttpHelper.Post("http://127.0.0.1:9281/api/Task/ReceiveTask", taskDTOs.Serialize());

                return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("返回错误");
            }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs

@@ -88,7 +88,7 @@
        /// <param name="keys"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
        public WebResponseContent GenerateOutboundTask(int[] keys)
        public WebResponseContent GenerateOutboundTask([FromBody] int[] keys)
        {
            return Service.GenerateOutboundTask(keys);
        }

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/boxing.vue

@@ -348,7 +348,7 @@
            },
            snInput() {
                this.$nextTick(() => {
                    if (this.warehouseId == 6) {
                    if (this.warehouseId == 6 || this.warehouseId == 2) {
                        if (this.sns.length > 0) {
                            this.sns = [];
                        }
@@ -363,7 +363,7 @@
                            this.Testcheck = false;
                            if (res.status) {
                                this.sns.push(res.data.serialNumber);
                                if (this.warehouseId == 6) {
                                if (this.warehouseId == 6 || this.warehouseId == 2) {
                                    if (this.matInfos.length > 0) {
                                        this.matInfos = [];
                                    }