diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/0/b/0b7d19b44eabe0d51a7ebb8a0badcbec8bf1236c b/wms_pro/hd/.idea/sonarlint/issuestore/0/b/0b7d19b44eabe0d51a7ebb8a0badcbec8bf1236c deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/1/3/13dcb74adf880fa445de696c0054cd586cf8b27a b/wms_pro/hd/.idea/sonarlint/issuestore/1/3/13dcb74adf880fa445de696c0054cd586cf8b27a deleted file mode 100644 index b3b3d3cd..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/1/3/13dcb74adf880fa445de696c0054cd586cf8b27a +++ /dev/null @@ -1,28 +0,0 @@ - -q java:S116"WRename this field "product_area" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116 "VRename this field "material_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ä -r java:S116$"XRename this field "material_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -r java:S116("XRename this field "material_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -m java:S116,"XRename this field "material_spec" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -n java:S1160"YRename this field "material_model" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ղ -q java:S1164"WRename this field "english_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -q java:S1168"WRename this field "base_unit_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -n java:S116<"YRename this field "assist_unit_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -s java:S116@"YRename this field "approve_fileno" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -m java:S116D"SRename this field "print_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116H"[Rename this field "material_type_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(縂 -p java:S116L"VRename this field "len_unit_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -n java:S116\"YRename this field "weight_unit_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(С -q java:S116`"WRename this field "gross_weight" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -o java:S116d"URename this field "net_weight" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -n java:S116h"YRename this field "cubage_unit_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -i java:S116p"TRename this field "create_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116t"VRename this field "create_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116x"VRename this field "create_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ه -n java:S116|"TRename this field "update_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -q java:S116"VRename this field "update_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S116"VRename this field "update_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -m java:S116"WRename this field "is_used_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -m java:S116"RRename this field "is_used" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -j java:S116"TRename this field "is_delete" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -g java:S116"QRename this field "ext_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(񐽕 \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/9/6/962216bab28ad31a04e330ae84fc8491b73be9eb b/wms_pro/hd/.idea/sonarlint/issuestore/9/6/962216bab28ad31a04e330ae84fc8491b73be9eb deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/a/4/a47ce58066d26fa89d378900d3c7057e934eea66 b/wms_pro/hd/.idea/sonarlint/issuestore/a/4/a47ce58066d26fa89d378900d3c7057e934eea66 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/a/7/a7241c86cb8a37ed0ceeb0177d553b8d09139e0f b/wms_pro/hd/.idea/sonarlint/issuestore/a/7/a7241c86cb8a37ed0ceeb0177d553b8d09139e0f deleted file mode 100644 index dcaf95fb..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/a/7/a7241c86cb8a37ed0ceeb0177d553b8d09139e0f +++ /dev/null @@ -1,3 +0,0 @@ - - -java:S11864"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb index 8c0acc15..f3d465f0 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -35,18 +35,8 @@ w Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 _ /nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378 - -\nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java,9/6/962216bab28ad31a04e330ae84fc8491b73be9eb - -dnladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/BmMaterialServiceImpl.java,a/7/a7241c86cb8a37ed0ceeb0177d553b8d09139e0f - -Xnladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMaterial.java,1/3/13dcb74adf880fa445de696c0054cd586cf8b27a  [nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java,4/0/400fbf00a1743bc1972994d7dffce150f50044f7 - -hnladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/BmMaterialMapper.xml,0/b/0b7d19b44eabe0d51a7ebb8a0badcbec8bf1236c - -enladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/BmMaterialMapper.java,a/4/a47ce58066d26fa89d378900d3c7057e934eea66  anladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java,8/9/89eeb13258719f34694cb541337f127c3bcaeda1  @@ -133,11 +123,15 @@ fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/Act ^nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java,8/e/8e8e6084896058ef5d6e32aeaa325a4d807bd299  fnladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java,0/4/04a9b66d50a0df59977636c2584c0b33c3c80690 - -Xnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/enums/TaskTypeEnum.java,9/a/9a80ba3c6d691004cb168b6bef614f1678af32d6  Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java,3/e/3eca87912d8f4d89cb48ed4d3a065400c26eb414 + +cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854  fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818 - -cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854 \ No newline at end of file + +Xnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/enums/TaskTypeEnum.java,9/a/9a80ba3c6d691004cb168b6bef614f1678af32d6 + +bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java,1/d/1d97c53dde4069e95a2a9b5e87f1839ef118d3b2 + +wnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java,6/2/62bba69557651d0ef8689854cf0192b608958ca8 \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 11ee79f3..6fe761a9 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -9,7 +9,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} - password: ${DB_PWD:123456} + password: ${DB_PWD:password} # 初始连接数 initial-size: 5 diff --git a/wms_pro/qd/.env.development b/wms_pro/qd/.env.development index 412e6523..4a64b0ab 100644 --- a/wms_pro/qd/.env.development +++ b/wms_pro/qd/.env.development @@ -1,8 +1,8 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://localhost:8012' -VUE_APP_WS_API = 'ws://localhost:8012' +VUE_APP_BASE_API = 'http://192.168.10.24:8012' +VUE_APP_WS_API = 'ws://192.168.10.24:8012' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/wms_pro/qd/lf-dnd-panel/.gitignore b/wms_pro/qd/lf-dnd-panel/.gitignore new file mode 100644 index 00000000..a547bf36 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/.gitignore @@ -0,0 +1,24 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/wms_pro/qd/lf-dnd-panel/README.md b/wms_pro/qd/lf-dnd-panel/README.md new file mode 100644 index 00000000..0bfecb08 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/README.md @@ -0,0 +1,9 @@ +# Vue 3 + TypeScript + Vite + +This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 ` + + diff --git a/wms_pro/qd/lf-dnd-panel/package.json b/wms_pro/qd/lf-dnd-panel/package.json new file mode 100644 index 00000000..8501bb77 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/package.json @@ -0,0 +1,20 @@ +{ + "name": "lf-dnd-panel", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "vue-tsc && vite build", + "preview": "vite preview" + }, + "dependencies": { + "vue": "^3.4.21" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^5.0.4", + "typescript": "^5.2.2", + "vite": "^5.2.0", + "vue-tsc": "^2.0.6" + } +} diff --git a/wms_pro/qd/lf-dnd-panel/public/vite.svg b/wms_pro/qd/lf-dnd-panel/public/vite.svg new file mode 100644 index 00000000..e7b8dfb1 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/public/vite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/wms_pro/qd/lf-dnd-panel/src/App.vue b/wms_pro/qd/lf-dnd-panel/src/App.vue new file mode 100644 index 00000000..bb666a8d --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/src/App.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/wms_pro/qd/lf-dnd-panel/src/assets/vue.svg b/wms_pro/qd/lf-dnd-panel/src/assets/vue.svg new file mode 100644 index 00000000..770e9d33 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/src/assets/vue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/wms_pro/qd/lf-dnd-panel/src/components/HelloWorld.vue b/wms_pro/qd/lf-dnd-panel/src/components/HelloWorld.vue new file mode 100644 index 00000000..7b25f3f2 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/src/components/HelloWorld.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/wms_pro/qd/lf-dnd-panel/src/main.ts b/wms_pro/qd/lf-dnd-panel/src/main.ts new file mode 100644 index 00000000..2425c0f7 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/src/main.ts @@ -0,0 +1,5 @@ +import { createApp } from 'vue' +import './style.css' +import App from './App.vue' + +createApp(App).mount('#app') diff --git a/wms_pro/qd/lf-dnd-panel/src/style.css b/wms_pro/qd/lf-dnd-panel/src/style.css new file mode 100644 index 00000000..bb131d6b --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/src/style.css @@ -0,0 +1,79 @@ +:root { + font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; + line-height: 1.5; + font-weight: 400; + + color-scheme: light dark; + color: rgba(255, 255, 255, 0.87); + background-color: #242424; + + font-synthesis: none; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +a { + font-weight: 500; + color: #646cff; + text-decoration: inherit; +} +a:hover { + color: #535bf2; +} + +body { + margin: 0; + display: flex; + place-items: center; + min-width: 320px; + min-height: 100vh; +} + +h1 { + font-size: 3.2em; + line-height: 1.1; +} + +button { + border-radius: 8px; + border: 1px solid transparent; + padding: 0.6em 1.2em; + font-size: 1em; + font-weight: 500; + font-family: inherit; + background-color: #1a1a1a; + cursor: pointer; + transition: border-color 0.25s; +} +button:hover { + border-color: #646cff; +} +button:focus, +button:focus-visible { + outline: 4px auto -webkit-focus-ring-color; +} + +.card { + padding: 2em; +} + +#app { + max-width: 1280px; + margin: 0 auto; + padding: 2rem; + text-align: center; +} + +@media (prefers-color-scheme: light) { + :root { + color: #213547; + background-color: #ffffff; + } + a:hover { + color: #747bff; + } + button { + background-color: #f9f9f9; + } +} diff --git a/wms_pro/qd/lf-dnd-panel/src/vite-env.d.ts b/wms_pro/qd/lf-dnd-panel/src/vite-env.d.ts new file mode 100644 index 00000000..11f02fe2 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/src/vite-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/wms_pro/qd/lf-dnd-panel/tsconfig.json b/wms_pro/qd/lf-dnd-panel/tsconfig.json new file mode 100644 index 00000000..9e03e604 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "target": "ES2020", + "useDefineForClassFields": true, + "module": "ESNext", + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "skipLibCheck": true, + + /* Bundler mode */ + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "preserve", + + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true + }, + "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"], + "references": [{ "path": "./tsconfig.node.json" }] +} diff --git a/wms_pro/qd/lf-dnd-panel/tsconfig.node.json b/wms_pro/qd/lf-dnd-panel/tsconfig.node.json new file mode 100644 index 00000000..97ede7ee --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/tsconfig.node.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "composite": true, + "skipLibCheck": true, + "module": "ESNext", + "moduleResolution": "bundler", + "allowSyntheticDefaultImports": true, + "strict": true + }, + "include": ["vite.config.ts"] +} diff --git a/wms_pro/qd/lf-dnd-panel/vite.config.ts b/wms_pro/qd/lf-dnd-panel/vite.config.ts new file mode 100644 index 00000000..05c17402 --- /dev/null +++ b/wms_pro/qd/lf-dnd-panel/vite.config.ts @@ -0,0 +1,7 @@ +import { defineConfig } from 'vite' +import vue from '@vitejs/plugin-vue' + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [vue()], +}) diff --git a/wms_pro/qd/package.json b/wms_pro/qd/package.json index ab3da574..af7c8a59 100644 --- a/wms_pro/qd/package.json +++ b/wms_pro/qd/package.json @@ -34,8 +34,8 @@ "url": "https://github.com/elunez/eladmin/issues" }, "dependencies": { - "@logicflow/core": "^0.6.0", - "@logicflow/extension": "^0.6.0", + "@logicflow/core": "^1.2.10", + "@logicflow/extension": "^1.2.10", "@riophae/vue-treeselect": "0.4.0", "af-table-column": "^1.0.3", "axios": "0.18.1", diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/model/curdActDeModel.js b/wms_pro/qd/src/views/wms/flow_manage/act/model/curdActDeModel.js index 057e4e8e..54a97b77 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/model/curdActDeModel.js +++ b/wms_pro/qd/src/views/wms/flow_manage/act/model/curdActDeModel.js @@ -41,7 +41,7 @@ export function getTaskTypes() { export function getStrategyList() { return request({ - url: '/api/flow/getStrategyList', + url: '/api/strategy/decisionColumns', method: 'get' }) } diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue index 8158daef..29a0dc21 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue @@ -33,7 +33,7 @@ - + @@ -90,7 +90,7 @@ v-permission="['admin','actDeModel:edit','actDeModel:del']" fixed="right" label="操作" - width="150px" + width="300px" align="center" >