From 7248e9a20635e8c61176531bde570f577aa35e5b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 09 5月 2025 15:02:51 +0800
Subject: [PATCH] 添加组盘入库
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs | 2
HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/WmsMaterialContainer.tsx | 2
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 84
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceTypeEnum.cs | 17
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs | 17
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRoot.cs | 136 +
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsOrderOperateAppService.cs | 20
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensions.cs | 114 +
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509054804_InitialCreate10.Designer.cs | 1723 +++++++++++++++++++
HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.tsx | 371 ---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsBindInStockAssService.cs | 33
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs | 15
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainerPlace.cs | 3
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensionsForRecord.cs | 96 +
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509065902_InitialCreate11.Designer.cs | 1781 ++++++++++++++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509054804_InitialCreate10.cs | 27
HIAWms/hiawms_web/src/config/menu.ts | 4
HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.module.scss | 44
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/BindInstockDto/BindInstockInput.cs | 50
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlace.cs | 5
HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx | 27
HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx | 13
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs | 5
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs | 5
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRootForRecord.cs | 94 +
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx | 39
HIAWms/project/Wms.cmsproj | 0
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509065902_InitialCreate11.cs | 372 ++++
HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/index.ts | 28
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs | 7
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts | 6
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsPlace.cs | 1
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialModelOutput.cs | 24
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/Dialog/WmsPlaceDrawer/WmsPlaceDrawer.tsx | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs | 5
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs | 112 +
HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx | 19
39 files changed, 4,935 insertions(+), 376 deletions(-)
diff --git a/HIAWms/hiawms_web/src/config/menu.ts b/HIAWms/hiawms_web/src/config/menu.ts
index d37ebda..39d0d71 100644
--- a/HIAWms/hiawms_web/src/config/menu.ts
+++ b/HIAWms/hiawms_web/src/config/menu.ts
@@ -21,7 +21,7 @@
"notPage": false
},
{
- "name": "鐗╂枡瀹瑰櫒鍏崇郴",
+ "name": "缁勭洏鍏ュ簱",
"path": "/information-base/WmsMaterialContainer",
"patchName": "WmsMaterialContainer",
"icon": "p",
@@ -93,7 +93,7 @@
"notPage": false
},
"WmsMaterialContainer": {
- "name": "鐗╂枡瀹瑰櫒鍏崇郴",
+ "name": "缁勭洏鍏ュ簱",
"path": "/information-base/WmsMaterialContainer",
"patchName": "WmsMaterialContainer",
"icon": "p",
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
index c606d18..957d251 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrder/Views/Pages/WmsInOutStockOrder/WmsInOutStockOrder.tsx
@@ -282,9 +282,16 @@
娣诲姞
</IconButton>
<el-divider direction="vertical" />
-
+ <IconButton
+ v-permission="wmsInOutStockOrder-add"
+ icon="add-p"
+ onClick={onAddWmsInOutStockOrder}
+ type="primary"
+ >
+ 鍙枡
+ </IconButton>
<el-divider direction="vertical" />
- <el-upload
+ {/* <el-upload
v-permission="wmsInOutStockOrder-import"
name="file"
accept=".xlsx,.xls,.csv"
@@ -304,7 +311,7 @@
onClick={handleExport}
>
瀵煎嚭
- </IconButton>
+ </IconButton> */}
</div>
<ElFormItem style={{ marginTop: '15px' }}>
<ElFormItem label="鍏抽敭瀛�">
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.module.scss b/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.module.scss
index 389d9a1..88fc51b 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.module.scss
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.module.scss
@@ -111,3 +111,47 @@
width: 100%;
}
}
+
+.wmsMaterialContainerContent {
+ padding: 16px;
+ background: #fff;
+ border-radius: 4px;
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+ max-width: 500px; // 闄愬埗鏈�澶у搴�
+ margin: 0 auto; // 姘村钩灞呬腑
+ width: 90%; // 鍝嶅簲寮忓搴�
+
+ .h5Form {
+ display: flex;
+ flex-direction: column;
+ gap: 20px; // 琛ㄥ崟椤逛箣闂寸殑闂磋窛
+
+ .el-form-item {
+ margin-bottom: 0; // 绉婚櫎榛樿鐨勫簳閮ㄨ竟璺�
+ width: 100%; // 鍗犳弧鐖跺鍣ㄥ搴�
+ }
+
+ .el-form-item__label {
+ display: block;
+ text-align: left;
+ margin-bottom: 8px;
+ font-weight: 500;
+ }
+ }
+
+ .formInput {
+ width: 100%; // 杈撳叆妗嗗崰婊＄埗瀹瑰櫒瀹藉害
+ }
+
+ .buttonGroup {
+ display: flex;
+ justify-content: center;
+ gap: 16px; // 鎸夐挳闂磋窛
+ margin-top: 16px;
+
+ .actionButton {
+ flex: 1; // 鎸夐挳骞冲潎鍒嗛厤绌洪棿
+ max-width: 150px; // 闄愬埗鎸夐挳鏈�澶у搴�
+ }
+ }
+}
\ No newline at end of file
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.tsx
index 1888740..196ace4 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/Pages/WmsMaterialContainer/WmsMaterialContainer.tsx
@@ -1,333 +1,84 @@
-import { computed, defineComponent, onMounted, reactive, ref } from 'vue'
+import { defineComponent, ref } from 'vue'
import type { Ref } from 'vue'
-import BaseTable from '@/components/Table/Table'
import styles from './WmsMaterialContainer.module.scss'
-import { useWmsMaterialContainer } from '../../../Controllers/WmsMaterialContainer'
-import IconButton from '@/components/IconButton/IconButton'
-import WmsMaterialContainerDrawer from '../Dialog/WmsMaterialContainerDrawer/WmsMaterialContainerDrawer'
-import WmsMaterialContainerQueryDrawer from '../Dialog/WmsMaterialContainerQueryDrawer/WmsMaterialContainerQueryDrawer'
-import Search from '@/components/Search/Search'
-import { columns } from './Config'
-import TdButton from '@/components/TdButton/TdButton'
-import { vPermission } from '@/libs/Permission/Permission'
-import { getWmsEnumData } from '@/widgets/WmsMaterialContainer/Models/Service/WmsMaterialContainerDrawer'
-import {
- ElInput,
- ElSelect,
- ElOption,
- ElDatePicker,
- ElForm,
- ElFormItem,
-} from 'element-plus'
-import { injectModel } from '@/libs/Provider/Provider'
-
-interface RenderTableType {
- url?: string
- dataSource: Ref<any[]>
- isDrag?: boolean
- isChecked?: boolean
- isHidePagination?: boolean
- params?: Record<string, any>
- autoHeight?: boolean
-}
+import { ElInput, ElForm, ElFormItem, ElButton } from 'element-plus'
export default defineComponent({
name: 'WmsMaterialContainer',
- directives: {
- permission: vPermission,
- },
- setup(props, ctx) {
- const {
- dataSource,
- contextMenu,
- dialogConfig,
- dialogConfigForQuery,
- tableRef,
- current,
- search,
- sort,
- headers,
- onError,
- onSearch,
- onRowClick,
- onConfirmWmsMaterialContainer,
- onCheck,
- onAddWmsMaterialContainer,
- onAdvancedQuery,
- onExport,
- openDetail,
- onSuccess,
- onBeforeUpload,
- } = useWmsMaterialContainer(props, ctx)
-
- //瀹氫箟楂樼骇鏌ヨ寮曠敤
- const wmsMaterialContainerQueryDrawerRef = ref(null)
- // 鏂板鐨勬煡璇㈡潯浠�
+ setup() {
+ // 鏌ヨ琛ㄥ崟鏁版嵁
const queryForm = ref({
- searchVal: '',
- str_searchFormInputAttrs: [],
- })
- //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
- const _searchFormInputAttrs = ref(['MaterialId'])
- const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ョ墿鏂橧d')
-
- // 鍔ㄦ�佹灇涓鹃�夐」
- const enumOptions = reactive({})
-
- // 鑾峰彇鏋氫妇鏁版嵁
- const fetchEnumData = async () => {
- try {
- } catch (error) {
- console.error('鑾峰彇鏋氫妇鏁版嵁澶辫触:', error)
- }
- }
-
- // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
- onMounted(() => {
- fetchEnumData()
+ materialNo: '',
+ placeNo: '',
+ materialBatch: '',
+ quantity: '',
})
- // 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
- const _curHighQueryData = ref({
- searchVal: '',
- str_searchFormInputAttrs: [],
- })
- // 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
- const handleQueryForMain = async () => {
- _curHighQueryData.value.searchVal = queryForm.value.searchVal
- _curHighQueryData.value.str_searchFormInputAttrs =
- _searchFormInputAttrs.value
- tableRef.value.getList(_curHighQueryData.value)
- }
- // 鏂扮増鐨勬煡璇㈡柟娉曪紙楂樼骇鏌ヨ涓殑鎸夐挳銆愭煡璇€�戯級
- const handleQuery = async (extraParams = {}) => {
- let filteredData = commonGetHighQueryForm(extraParams)
- commonSaveCurHighQueryData(filteredData)
- tableRef.value.getList(filteredData)
- }
- // 鏂扮増鐨勬煡璇㈤噸缃�
- const resetQuery = () => {
- queryForm.value.searchVal = ''
- queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
- }
- //鏂扮増鐨勫鍑烘柟娉�
- const handleExport = () => {
- onExport(_curHighQueryData.value)
- }
- // 鏂扮増鐨勬煡璇㈠脊鍑烘鍏抽棴鏂规硶
- const closeQuery = (extraParams = {}) => {
- let filteredData = commonGetHighQueryForm(extraParams)
- console.log('closeQuery鏂规硶')
- console.log(filteredData)
- commonSaveCurHighQueryData(filteredData)
- }
- //淇濆瓨鏌ヨ鍊�
- const commonSaveCurHighQueryData = (filteredData = {}) => {
- _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
- _curHighQueryData.value.searchVal = queryForm.value.searchVal
- _curHighQueryData.value.str_searchFormInputAttrs =
- _searchFormInputAttrs.value
- }
- //鑾峰彇楂樼骇鏌ヨ寮瑰嚭妗嗙殑鏌ヨ鍊�
- const commonGetHighQueryForm = (extraParams = {}) => {
- // 杩囨护鎺� undefined 鐨勫��
- let filteredData = Object.assign(
- {},
- ...Object.entries(extraParams).map(([key, value]) =>
- value !== undefined ? { [key]: value } : {}
- )
- )
- //缁勫悎妯＄硦鏌ヨ
- filteredData.searchVal = queryForm.value.searchVal
- filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
- return filteredData
+ // 缁勭洏鎿嶄綔
+ const handlePalletize = () => {
+ console.log('缁勭洏鎿嶄綔', queryForm.value)
+ // 杩欓噷娣诲姞缁勭洏閫昏緫
}
- /**
- * @returns 琛ㄦ牸
- */
- const RenderBaseTable = (props: RenderTableType) => {
- const {
- url,
- dataSource,
- isDrag,
- isChecked,
- isHidePagination,
- params,
- autoHeight,
- } = props
-
- return (
- <div
- class={{
- [styles.wmsMaterialContainerList]: true,
- }}
- >
- {/* <BaseTable
- ref={tableRef}
- url={url}
- sortUrlTpl="/api/v1/HIAWms/wmsMaterialContainer/{id}/adjustsort/{sort}"
- v-model:dataSource={dataSource.value}
- columns={columns}
- contextMenu={contextMenu}
- params={params}
- isDrag={isDrag}
- isChecked={isChecked}
- autoHeight={autoHeight}
- onCheck={onCheck}
- onRowClick={onRowClick}
- isHidePagination={isHidePagination}
- pageSize={20}
- v-slots={{
- name: ({ row }: any) => {
- return row?.name ? (
- <TdButton
- onClick={() => openDetail(row)}
- text={<span style="color:#5a84ff">璇︽儏</span>}
- icon="scale"
- tip={row?.name}
- hover
- >
- {row?.name}
- </TdButton>
- ) : (
- '-'
- )
- },
- }}
- ></BaseTable> */}
- <ElForm>
- <ElFormItem label="鐗╂枡鐮�">
- <ElInput
- v-model={queryForm.value.searchVal}
- placeholder="璇疯緭鍏�"
- clearable
- class={styles.formItem}
- />
- </ElFormItem>
- <ElFormItem label="搴撲綅鍙�">
- <ElInput
- v-model={queryForm.value.searchVal}
- placeholder="璇疯緭鍏�"
- clearable
- class={styles.formItem}
- />
- </ElFormItem>
- <ElFormItem label="鏁伴噺">
- <ElInput
- v-model={queryForm.value.searchVal}
- placeholder="璇疯緭鍏�"
- clearable
- class={styles.formItem}
- />
- </ElFormItem>
- </ElForm>
- </div>
- )
+ // 缁勭洏鍏ュ簱鎿嶄綔
+ const handlePalletizeStorage = () => {
+ console.log('缁勭洏鍏ュ簱鎿嶄綔', queryForm.value)
+ // 杩欓噷娣诲姞缁勭洏鍏ュ簱閫昏緫
}
return () => {
return (
<div class={styles.wmsMaterialContainerContent}>
- <ElForm>
- <ElFormItem label="鍏抽敭瀛�">
+ <ElForm label-position="top" class={styles.h5Form}>
+ <ElFormItem label="鐗╂枡鐮�">
<ElInput
- v-model={queryForm.value.searchVal}
- placeholder="璇疯緭鍏�"
+ v-model={queryForm.value.materialNo}
+ placeholder="璇疯緭鍏ョ墿鏂欑爜"
clearable
- class={styles.formItem}
+ class={styles.formInput}
/>
</ElFormItem>
- </ElForm>
- {/* 娣诲姞/缂栬緫 */}
- {/* <WmsMaterialContainerDrawer
- v-model={dialogConfig.visible}
- title={dialogConfig.title}
- row={current.value}
- sort={sort.value}
- onConfirm={onConfirmWmsMaterialContainer}
- /> */}
- {/* 楂樼骇鏌ヨ */}
- {/* <WmsMaterialContainerQueryDrawer
- ref="wmsMaterialContainerQueryDrawerRef"
- v-model={dialogConfigForQuery.visible}
- title={dialogConfigForQuery.title}
- row={current.value}
- sort={sort.value}
- onConfirmQuery={handleQuery}
- onRestQuery={resetQuery}
- onClose={closeQuery}
- /> */}
-
- {/* <div class={styles.headerContent}>
- <div class={styles.header}>
- <IconButton
- v-permission="wmsMaterialContainer-add"
- icon="add-p"
- onClick={onAddWmsMaterialContainer}
- type="primary"
- >
- 娣诲姞
- </IconButton>
- <el-divider direction="vertical" />
-
- <el-divider direction="vertical" />
- <el-upload
- v-permission="wmsMaterialContainer-import"
- name="file"
- accept=".xlsx,.xls,.csv"
- show-file-list={false}
- onError={onError}
- onSuccess={onSuccess}
- before-upload={onBeforeUpload}
- headers={headers.value}
- action="/api/v1/HIAWms/wmsMaterialContainer/import"
- >
- <IconButton icon="in">瀵煎叆</IconButton>
- </el-upload>
-
- <IconButton
- v-permission="wmsMaterialContainer-output"
- icon="out"
- onClick={handleExport}
- >
- 瀵煎嚭
- </IconButton>
- </div>
- <ElFormItem style={{ marginTop: '15px' }}>
- <ElFormItem label="鍏抽敭瀛�">
- <ElInput
- v-model={queryForm.value.searchVal}
- placeholder={searchFormInputAttrs_Placeholder.value}
- clearable
- class={styles.formItem}
- />
- </ElFormItem>
- <IconButton
- type="primary"
- icon="search"
- onClick={handleQueryForMain}
- >
- 鏌ヨ
- </IconButton>
-
- <IconButton
- v-permission="wmsMaterialContainer-add"
- icon="search"
- onClick={onAdvancedQuery}
- type="primary"
- >
- 楂樼骇鏌ヨ
- </IconButton>
+ <ElFormItem label="搴撲綅鍙�">
+ <ElInput
+ v-model={queryForm.value.placeNo}
+ placeholder="璇疯緭鍏ュ簱浣嶅彿"
+ clearable
+ class={styles.formInput}
+ />
</ElFormItem>
- </div>
-
- <RenderBaseTable
- url="/api/v1/HIAWms/wmsMaterialContainer/page"
- dataSource={dataSource}
- isChecked={true}
- isDrag={true}
- /> */}
+ <ElFormItem label="鎵规鍙�">
+ <ElInput
+ v-model={queryForm.value.materialBatch}
+ placeholder="璇疯緭鍏ユ暟閲�"
+ clearable
+ class={styles.formInput}
+ />
+ </ElFormItem>
+ <ElFormItem label="鏁伴噺">
+ <ElInput
+ v-model={queryForm.value.quantity}
+ placeholder="璇疯緭鍏ユ暟閲�"
+ clearable
+ class={styles.formInput}
+ />
+ </ElFormItem>
+ <div class={styles.buttonGroup}>
+ <ElButton
+ type="primary"
+ onClick={handlePalletize}
+ class={styles.actionButton}
+ >
+ 缁勭洏
+ </ElButton>
+ <ElButton
+ type="success"
+ onClick={handlePalletizeStorage}
+ class={styles.actionButton}
+ >
+ 缁勭洏鍏ュ簱
+ </ElButton>
+ </div>
+ </ElForm>
</div>
)
}
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/WmsMaterialContainer.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/WmsMaterialContainer.tsx
index a8fbaff..4a81b2f 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/WmsMaterialContainer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/Views/WmsMaterialContainer.tsx
@@ -22,7 +22,7 @@
const entityNames = getEntityNames(Models)
-const nameToLabelMap = [{ name: 'WmsMaterialContainer', label: '鐗╂枡瀹瑰櫒鍏崇郴' }]
+const nameToLabelMap = [{ name: 'WmsMaterialContainer', label: '缁勭洏鍏ュ簱' }]
export default defineComponent({
name: 'WmsMaterialContainer',
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/index.ts b/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/index.ts
index 9dec4e4..e794a1c 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/index.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialContainer/index.ts
@@ -1,14 +1,14 @@
-import WmsMaterialContainer from './Views/WmsMaterialContainer'
-import Setting from '@/components/Setting/Setting'
-import { provider } from '@/provider/index'
-import p from '../../assets/svg/p.svg'
-
-export default {
- is: 'WmsMaterialContainer',
- name: '鐗╂枡瀹瑰櫒鍏崇郴',
- category: 'run',
- icon: p,
- authorizationRequired: false,
- canvasView: provider(WmsMaterialContainer),
- settingsView: Setting,
-}
+import WmsMaterialContainer from './Views/WmsMaterialContainer'
+import Setting from '@/components/Setting/Setting'
+import { provider } from '@/provider/index'
+import p from '../../assets/svg/p.svg'
+
+export default {
+ is: 'WmsMaterialContainer',
+ name: '缁勭洏鍏ュ簱',
+ category: 'run',
+ icon: p,
+ authorizationRequired: false,
+ canvasView: provider(WmsMaterialContainer),
+ settingsView: Setting,
+}
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
similarity index 89%
rename from HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts
rename to HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
index e8acdca..c3b230a 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
@@ -1,4 +1,13 @@
-import { ref, onMounted, reactive, computed, Ref, watch } from 'vue'
+import {
+ ref,
+ onMounted,
+ reactive,
+ computed,
+ Ref,
+ watch,
+ SetupContext,
+ h,
+} from 'vue'
import { injectModel } from '@/libs/Provider/Provider'
import { WmsPlaceDrawer } from '../Models/WmsPlaceDrawer'
import { ElMessage } from 'element-plus'
@@ -31,6 +40,17 @@
ctx.emit('update:modelValue', val)
},
})
+
+ const inputNumber = (attrs) => {
+ return (
+ <el-input-number
+ min="1"
+ step="1"
+ precision="0"
+ {...attrs}
+ ></el-input-number>
+ )
+ }
/**
* 娣诲姞鐨刦orm瀛楁
*/
@@ -117,6 +137,21 @@
],
},
{
+ label: '鏈�澶у簱瀛樻暟',
+ prop: 'maxStockNumber',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(inputNumber, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ placeholder: '鏈�澶у簱瀛樻暟',
+ rules: [
+ { required: true, message: '鏄惁绌烘墭涓嶈兘涓虹┖', trigger: 'change' },
+ ],
+ },
+ {
label: '澶囨敞',
el: 'input',
placeholder: '璇疯緭鍏ュ娉�',
@@ -166,6 +201,7 @@
layerNo: formData.value.layerNo, // 灞�
islock: formData.value.islock, // 鏄惁閿佸畾
emptyContainer: formData.value.emptyContainer, // 鏄惁绌烘墭
+ maxStockNumber: formData.value.maxStockNumber, // 鏈�澶у簱瀛樻暟
remark: formData.value.remark, // 澶囨敞
}
if (!current.value) {
@@ -242,6 +278,7 @@
islock: res.islock, // 鏄惁閿佸畾
emptyContainer: res.emptyContainer, // 鏄惁绌烘墭
remark: res.remark, // 澶囨敞
+ maxStockNumber: res.maxStockNumber, // 鏈�澶у簱瀛樻暟
id: res.id, // 涓婚敭ID
}
updateCheckData()
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/Dialog/WmsPlaceDrawer/WmsPlaceDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/Dialog/WmsPlaceDrawer/WmsPlaceDrawer.tsx
index f343aec..ca02987 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/Dialog/WmsPlaceDrawer/WmsPlaceDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/Dialog/WmsPlaceDrawer/WmsPlaceDrawer.tsx
@@ -1,7 +1,7 @@
import { SetupContext, defineComponent } from 'vue'
import BaseDrawer from '@/components/BaseDrawer/BaseDrawer'
import styles from './WmsPlaceDrawer.module.scss'
-import { useWmsPlaceDrawer } from '../../../../Controllers/WmsPlaceDrawer'
+import { useWmsPlaceDrawer } from '../../../../Controllers/WmsPlaceDrawer.tsx'
import DyForm from '@/components/DyForm/DyForm'
// @ts-ignore
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
index 0f95bf8..1a331aa 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
@@ -1,3 +1,5 @@
+import { title } from 'process'
+
export const columns = [
{
type: 'seq',
@@ -37,6 +39,10 @@
title: '灞�',
},
{
+ field: 'maxStockNumber',
+ title: '鏈�澶у簱瀛樻暟',
+ },
+ {
field: 'islockDesc',
title: '鏄惁閿佸畾',
},
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
index 1ad174e..6160398 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx
@@ -77,7 +77,7 @@
label: '浠诲姟鍙�',
prop: 'taskNo',
el: 'input',
- disabled: true,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔″彿',
rules: [{ required: true, message: '浠诲姟鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
},
@@ -85,7 +85,7 @@
label: '浠诲姟绫诲瀷',
prop: 'taskType',
el: 'select',
- disabled: true,
+ disabled: disabled,
placeholder: '璇疯緭鍏ヤ换鍔＄被鍨�',
rules: [{ required: true, message: '浠诲姟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
},
@@ -93,7 +93,7 @@
label: '瀛愪换鍔＄被鍨�',
prop: 'sonTaskType',
el: 'select',
- disabled: true,
+ disabled: disabled,
rules: [
{ required: true, message: '瀛愪换鍔＄被鍨嬩笉鑳戒负绌�', trigger: 'blur' },
],
@@ -229,18 +229,23 @@
{
label: '涓嬩釜浠诲姟鏄惁鐢熸垚',
prop: 'isNextTask',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(inputNumber, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ el: 'select',
+ options: [
+ { label: '鏄�', value: 1 },
+ { label: '鍚�', value: 0 },
+ ],
width: '100%',
step: 1,
precision: 0,
disabled: disabled,
- placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴愭垚鍔�',
+ placeholder: '璇疯緭鍏ヤ笅涓换鍔℃槸鍚︾敓鎴�',
},
// {
// label: '鍙彉鍙橀噺1',
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
index 033f41a..ba0127f 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Controllers/WmsTaskQueryDrawer.tsx
@@ -228,13 +228,18 @@
{
label: '涓嬩釜浠诲姟鏄惁鐢熸垚',
prop: 'isNextTask',
- el: (props: any, { attrs }: SetupContext) => {
- return h(inputNumber, {
- ...props,
- clearable: true,
- ...attrs,
- })
- },
+ // el: (props: any, { attrs }: SetupContext) => {
+ // return h(inputNumber, {
+ // ...props,
+ // clearable: true,
+ // ...attrs,
+ // })
+ // },
+ el: 'select',
+ options: [
+ { label: '鏄�', value: 1 },
+ { label: '鍚�', value: 0 },
+ ],
width: '100%',
step: 1,
precision: 0,
diff --git a/HIAWms/project/Wms.cmsproj b/HIAWms/project/Wms.cmsproj
index ef5ad2d..3c7c244 100644
--- a/HIAWms/project/Wms.cmsproj
+++ b/HIAWms/project/Wms.cmsproj
Binary files differ
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/BindInstockDto/BindInstockInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/BindInstockDto/BindInstockInput.cs
new file mode 100644
index 0000000..2efb842
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/BindInstockDto/BindInstockInput.cs
@@ -0,0 +1,50 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.BindInstockDto
+{
+ /// <summary>
+ /// 缁勭洏鍙傛暟
+ /// </summary>
+ public class BindInstockInput : BindMaterialInput
+ {
+ /// <summary>
+ /// 搴撲綅鍙�
+ /// </summary>
+ public string PlaceNo { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string ContainerNo { get; set; }
+ }
+
+ /// <summary>
+ /// 缁勭洏鍙傛暟
+ /// </summary>
+ public class BindMaterialInput
+ {
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ public string MaterialNo { get; set; }
+
+ /// <summary>
+ /// 鍨嬪彿
+ /// </summary>
+ public string MaterialModel { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ public string MaterialBatch { get; set; }
+
+ /// <summary>
+ /// 缁戝畾鏁伴噺
+ /// </summary>
+ public int MaterialStockNumber { get; set; }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialModelOutput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialModelOutput.cs
new file mode 100644
index 0000000..d4711ac
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialModelOutput.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto
+{
+ /// <summary>
+ /// 鏈哄瀷杈撳嚭
+ /// </summary>
+ public class MaterialModelOutput
+ {
+ /// <summary>
+ /// 鏈哄瀷
+ /// </summary>
+ public string MaterialModel { get; set; }
+
+ /// <summary>
+ /// 鏈哄瀷鎻忚堪
+ /// </summary>
+ public string MaterialModelDesc { get; set; }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs
index 64fea4b..ca13608 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs
@@ -67,4 +67,9 @@
/// 鏄惁绌烘墭
/// </summary>
public YesNoEnum? EmptyContainer { get; set; }
+
+ /// <summary>
+ /// 鏈�澶у簱瀛橀噺
+ /// </summary>
+ public int MaxStockNumber { get; set; }
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs
index 1753092..de706b4 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs
@@ -59,6 +59,11 @@
public YesNoEnum EmptyContainer { get; set; }
/// <summary>
+ /// 鏈�澶у簱瀛橀噺
+ /// </summary>
+ public int MaxStockNumber { get; set; }
+
+ /// <summary>
/// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
/// </summary>
public string RedundantField1 { get; set; }
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
index 53210fd..3ae551f 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
@@ -105,6 +105,11 @@
}
/// <summary>
+ /// 鏈�澶у簱瀛橀噺
+ /// </summary>
+ public int MaxStockNumber { get; set; }
+
+ /// <summary>
/// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
/// </summary>
public string RedundantField1 { get; set; }
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs
index c4a8975..10f3285 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs
@@ -84,6 +84,12 @@
public YesNoEnum EmptyContainer { get; set; }
/// <summary>
+ /// 鏈�澶у簱瀛橀噺
+ /// </summary>
+ [ExcelColumn(Name = "鏈�澶у簱瀛橀噺", Width = 12)]
+ public int MaxStockNumber { get; set; }
+
+ /// <summary>
/// 鑾峰彇鎴栬缃鐣欐墿灞曞瓧娈�1
/// </summary>
[ExcelColumn(Name = "鎵╁睍瀛楁1", Width = 20)]
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsBindInStockAssService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsBindInStockAssService.cs
new file mode 100644
index 0000000..5be0b4f
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsBindInStockAssService.cs
@@ -0,0 +1,33 @@
+锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.BindInstockDto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp;
+
+namespace CMS.Plugin.HIAWms.Application.Implements
+{
+ /// <summary>
+ /// 缁勭洏鍏ュ簱
+ /// </summary>
+ public class WmsBindInStockAssService : CMSPluginAppService
+ {
+ public async Task BindMaterialContaienrAsync(BindMaterialInput input)
+ {
+ if (string.IsNullOrEmpty(input.MaterialModel)) { throw new UserFriendlyException("璇烽�夋嫨搴撲綅缂栧彿"); }
+ if (string.IsNullOrEmpty(input.MaterialBatch)) { throw new UserFriendlyException("璇疯緭鍏ユ壒娆″彿"); }
+ if (input.MaterialStockNumber<=0) { throw new UserFriendlyException("鍏ュ簱鏁伴噺蹇呴』澶т簬0"); }
+
+
+ }
+
+ public async Task BindInStockAsync(BindInstockInput input)
+ {
+ if(string.IsNullOrEmpty(input.PlaceNo)) { throw new UserFriendlyException("璇烽�夋嫨搴撲綅缂栧彿"); }
+
+ var bindInput = ObjectMapper.Map<BindInstockInput, BindMaterialInput>(input);
+ await BindMaterialContaienrAsync(bindInput);
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs
new file mode 100644
index 0000000..e8ef141
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs
@@ -0,0 +1,112 @@
+锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
+using CMS.Plugin.HIAWms.Domain.WmsMaterials;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
+using CMS.Plugin.HIAWms.Domain.WmsPlaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp;
+
+namespace CMS.Plugin.HIAWms.Application.Implements
+{
+ /// <summary>
+ /// 鍏叡鎿嶄綔鏈嶅姟
+ /// </summary>
+ public class WmsCommonAppService : CMSPluginAppService
+ {
+ private readonly IWmsMaterialRepository _wmsMaterialRepository;
+ private readonly IWmsPlaceRepository _wmsPlaceRepository;
+ private readonly IWmsMaterialStockRepository _wmsMaterialStockRepository;
+
+ public WmsCommonAppService(IWmsMaterialRepository wmsMaterialRepository,
+ IWmsPlaceRepository wmsPlaceRepository,
+ IWmsMaterialStockRepository wmsMaterialStockRepository
+ )
+ {
+ _wmsMaterialRepository = wmsMaterialRepository;
+ _wmsPlaceRepository = wmsPlaceRepository;
+ _wmsMaterialStockRepository = wmsMaterialStockRepository;
+ }
+
+ public async Task<List<MaterialModelOutput>> GetMaterialModeListAsync()
+ {
+ var materialList = await _wmsMaterialRepository.GetMaterialListAsync(new WmsMaterial());
+ if (materialList == null || materialList.Count <= 0) return new List<MaterialModelOutput>(); ;
+
+ return materialList.Select(material => new MaterialModelOutput
+ {
+ MaterialModel = material.MaterialModel,
+ MaterialModelDesc = material.MaterialModel
+ }).ToList();
+ }
+
+ /// <summary>
+ /// 鏌ユ壘绌哄簱浣�
+ /// </summary>
+ /// <param name="materialModel"></param>
+ /// <param name="materialNo"></param>
+ /// <param name="requiredNum"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
+ public async Task<Dictionary<WmsPlace, int>> FindAvailablePlacesAsync(string materialModel, string materialNo, int requiredNum)
+ {
+ // 1. 鑾峰彇鎵�鏈夊簱瀛樺拰搴撲綅淇℃伅
+ var stockList = await _wmsMaterialStockRepository.GetListAsync(new WmsMaterialStock());
+ var allPlaceList = await _wmsPlaceRepository.GetListAsync(new WmsPlace());
+
+ // 2. 鏌ユ壘鐩稿悓鐗╂枡鍨嬪彿鍜岀紪鍙风殑搴撳瓨锛堟寜搴撳瓨閲忛檷搴忥級
+ var sameModelStocks = stockList
+ .Where(x => x.MaterialModel == materialModel)
+ .WhereIf(!string.IsNullOrEmpty(materialNo), x => x.MaterialNo == materialNo)
+ .OrderByDescending(x => x.StockNumber)
+ .ToList();
+
+ var availablePlaces = new Dictionary<WmsPlace, int>();
+ int remainingNum = requiredNum;
+
+ // 3. 浼樺厛妫�鏌ュ凡鏈夊簱瀛樼殑搴撲綅鏄惁鑳藉瓨鏀撅紙鐩稿悓 MaterialNo锛�
+ foreach (var stock in sameModelStocks)
+ {
+ if (remainingNum <= 0) break; // 鏁伴噺宸插垎閰嶅畬
+
+ var placeInfo = allPlaceList.FirstOrDefault(x => x.PlaceNo == stock.PlaceNo);
+ if (placeInfo == null) continue;
+
+ int availableSpace = placeInfo.MaxStockNumber - stock.StockNumber;
+ if (availableSpace <= 0) continue;
+
+ int allocatedNum = Math.Min(availableSpace, remainingNum);
+ availablePlaces.Add(placeInfo, allocatedNum);
+ remainingNum -= allocatedNum;
+ }
+
+ // 4. 濡傛灉浠嶆湁鍓╀綑锛屾煡鎵剧┖搴撲綅
+ if (remainingNum > 0)
+ {
+ var usedPlaceNos = stockList.Select(x => x.PlaceNo).Distinct().ToList();
+ var emptyPlaces = allPlaceList
+ .Where(x => !usedPlaceNos.Contains(x.PlaceNo))
+ .ToList();
+
+ foreach (var place in emptyPlaces)
+ {
+ if (remainingNum <= 0) break;
+
+ int allocatedNum = Math.Min(place.MaxStockNumber, remainingNum);
+ availablePlaces.Add(place, allocatedNum);
+ remainingNum -= allocatedNum;
+ }
+ }
+
+ // 5. 濡傛灉浠嶆湁鍓╀綑锛岃鏄庡簱浣嶄笉瓒�
+ if (remainingNum > 0)
+ {
+ throw new UserFriendlyException($"搴撲綅涓嶈冻锛岃繕宸� {remainingNum} 涓棤娉曞瓨鏀撅紒");
+ }
+
+ return availablePlaces;
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsOrderOperateAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsOrderOperateAppService.cs
new file mode 100644
index 0000000..40fe690
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsOrderOperateAppService.cs
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CMS.Plugin.HIAWms.Application.Implements
+{
+ public class WmsOrderOperateAppService : CMSPluginAppService
+ {
+ /// <summary>
+ /// 鍙枡
+ /// </summary>
+ /// <returns></returns>
+ public async Task CallMaterialAsync()
+ {
+
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
index 446240b..2615a9d 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
@@ -317,7 +317,7 @@
{
Check.NotNull(input, nameof(input));
Check.NotNullOrWhiteSpace(input.PlaceNo, "缂栧彿", WmsPlaceConsts.MaxCodeLength);
- string pattern = @"^\d-\d$";
+ string pattern = @"^\d+-\d+$";
if (input.StorageTypeNo == Domain.Shared.Enums.PlaceTypeEnum.YUANLIAOKUWEI && !Regex.IsMatch(input.PlaceNo, pattern))
{
throw new UserFriendlyException("搴撲綅缂栧彿鏍煎紡閿欒");
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceTypeEnum.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceTypeEnum.cs
index b6832db..72d1327 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceTypeEnum.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PlaceTypeEnum.cs
@@ -19,7 +19,22 @@
[Description("鍘熸枡搴撲綅")]
YUANLIAOKUWEI = 1,
+ /// <summary>
+ /// 鍏ュ簱鍙�
+ /// </summary>
+ [Description("鍏ュ簱鍙�")]
+ RUKUKOU = 2,
+
+ /// <summary>
+ /// 鍑哄簱鍙�
+ /// </summary>
+ [Description("鍑哄簱鍙�")]
+ CHUKUKOU = 3,
+
+ /// <summary>
+ /// 铏氭嫙搴撲綅
+ /// </summary>
[Description("铏氭嫙搴撲綅")]
- XUNIKUWEI = 2,
+ XUNIKUWEI = 4,
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensions.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensions.cs
new file mode 100644
index 0000000..60fee7b
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensions.cs
@@ -0,0 +1,114 @@
+锘縰sing Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CMS.Plugin.MyExtension.Domain
+{
+ /// <summary>
+ /// 鐢ㄤ簬鎵╁睍 EntityTypeBuilder 鐨勯潤鎬佺被锛屾彁渚涢拡瀵圭户鎵胯嚜 MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬬殑閰嶇疆鎵╁睍鏂规硶
+ /// </summary>
+ public static class EntityTypeBuilderExtensions
+ {
+ /// <summary>
+ /// 閽堝缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬶紝閰嶇疆鍏跺叕鍏卞睘鎬�
+ /// </summary>
+ /// <typeparam name="TEntity">缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨�</typeparam>
+ /// <param name="b">EntityTypeBuilder<TEntity> 瀹炰緥锛岀敤浜庨厤缃疄浣撶殑灞炴��</param>
+ public static void ConfigureMyCmsEntity<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid>
+ {
+ b.Property(x => x.CreatorId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property(x => x.CreatorName)
+ .HasMaxLength(64)
+ .IsRequired(false)
+ .HasComment("鍒涘缓浜�");
+
+ b.Property(x => x.CreationTime)
+ .IsRequired()
+ .HasComment("鍒涘缓鏃堕棿");
+
+ b.Property(x => x.LastModifierName)
+ .HasMaxLength(64)
+ .IsRequired(false)
+ .HasComment("淇敼浜�");
+
+ b.Property(x => x.LastModifierId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("淇敼浜篒D");
+
+ b.Property(x => x.LastModificationTime)
+ .IsRequired(false)
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property(x => x.IsDeleted)
+ .IsRequired()
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property(x => x.DeleterId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("鍒犻櫎浜篒D");
+
+ b.Property(x => x.DeletionTime)
+ .IsRequired(false)
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property(x => x.ExtraProperties)
+ .IsRequired(false)
+ .HasComment("鎵╁睍灞炴��");
+
+ b.Property(x => x.ConcurrencyStamp)
+ .IsRequired(false)
+ .HasMaxLength(40)
+ .HasComment("骞跺彂鎴�");
+
+ b.Property(x => x.Sort)
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property(x => x.Remark)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("澶囨敞");
+
+ b.Property(x => x.OperationRemark)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎿嶄綔澶囨敞");
+
+ b.Property(x => x.DeleteRemark)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鍒犻櫎澶囨敞");
+
+ b.Property(x => x.IsDisabled)
+ .IsRequired(false)
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property(x => x.ExtraField1)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁1");
+
+ b.Property(x => x.ExtraField2)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁2");
+
+ b.Property(x => x.ExtraField3)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁3");
+
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensionsForRecord.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensionsForRecord.cs
new file mode 100644
index 0000000..a856b77
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensionsForRecord.cs
@@ -0,0 +1,96 @@
+锘縰sing Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CMS.Plugin.MyExtension.Domain
+{
+ /// <summary>
+ /// 鐢ㄤ簬鎵╁睍 EntityTypeBuilder 鐨勯潤鎬佺被锛屾彁渚涢拡瀵圭户鎵胯嚜 MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬬殑閰嶇疆鎵╁睍鏂规硶(璁板綍琛ㄤ笓鐢�)
+ /// </summary>
+ public static class EntityTypeBuilderExtensionsForRecord
+ {
+ /// <summary>
+ /// 閽堝缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬶紝閰嶇疆鍏跺叕鍏卞睘鎬�
+ /// </summary>
+ /// <typeparam name="TEntity">缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨�</typeparam>
+ /// <param name="b">EntityTypeBuilder<TEntity> 瀹炰緥锛岀敤浜庨厤缃疄浣撶殑灞炴��</param>
+ public static void ConfigureMyCmsEntityForRecord<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRootForRecord<Guid>
+ {
+ b.Property(x => x.CreatorId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property(x => x.CreatorName)
+ .HasMaxLength(64)
+ .IsRequired(false)
+ .HasComment("鍒涘缓浜�");
+
+ b.Property(x => x.CreationTime)
+ .IsRequired()
+ .HasComment("鍒涘缓鏃堕棿");
+
+
+ b.Property(x => x.LastModifierId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("淇敼浜篒D");
+
+ b.Property(x => x.LastModificationTime)
+ .IsRequired(false)
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property(x => x.IsDeleted)
+ .IsRequired()
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property(x => x.DeleterId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("鍒犻櫎浜篒D");
+
+ b.Property(x => x.DeletionTime)
+ .IsRequired(false)
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property(x => x.ExtraProperties)
+ .IsRequired(false)
+ .HasComment("鎵╁睍灞炴��");
+
+ b.Property(x => x.ConcurrencyStamp)
+ .IsRequired(false)
+ .HasMaxLength(40)
+ .HasComment("骞跺彂鎴�");
+
+ b.Property(x => x.Sort)
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property(x => x.Remark)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("澶囨敞");
+
+
+ b.Property(x => x.ExtraField1)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁1");
+
+ b.Property(x => x.ExtraField2)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁2");
+
+ b.Property(x => x.ExtraField3)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁3");
+
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRoot.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRoot.cs
new file mode 100644
index 0000000..3808e5a
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRoot.cs
@@ -0,0 +1,136 @@
+锘縰sing System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CMS.Plugin.MyExtension.Domain;
+
+
+/// <summary>
+/// 鎴戞墿灞曠殑瀹炰綋绫诲熀绫�
+/// </summary>
+[Serializable]
+public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot
+{
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string? CreatorName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public virtual string? LastModifierName { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔澶囨敞
+ /// </summary>
+ public virtual string? OperationRemark { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎澶囨敞
+ /// </summary>
+ public virtual string? DeleteRemark { get; set; }
+
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string? Remark { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ public virtual string? ExtraField1 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ public virtual string? ExtraField2 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ public virtual string? ExtraField3 { get; set; }
+
+
+}
+
+/// <summary>
+/// 鎴戞墿灞曠殑瀹炰綋绫诲熀绫�
+/// </summary>
+/// <typeparam name="TKey"></typeparam>
+[Serializable]
+public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey>
+{
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string? CreatorName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public virtual string? LastModifierName { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔澶囨敞
+ /// </summary>
+ public virtual string? OperationRemark { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎澶囨敞
+ /// </summary>
+ public virtual string? DeleteRemark { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string? Remark { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ public virtual string? ExtraField1 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ public virtual string? ExtraField2 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ public virtual string? ExtraField3 { get; set; }
+
+ protected MyFullAuditedAggregateRoot()
+ {
+
+ }
+
+ protected MyFullAuditedAggregateRoot(TKey id)
+ : base(id)
+ {
+
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRootForRecord.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRootForRecord.cs
new file mode 100644
index 0000000..b12e924
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRootForRecord.cs
@@ -0,0 +1,94 @@
+锘縰sing System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CMS.Plugin.MyExtension.Domain;
+
+
+/// <summary>
+/// 鎴戞墿灞曠殑瀹炰綋绫诲熀绫�(璁板綍琛ㄤ笓鐢�)
+/// </summary>
+[Serializable]
+public abstract class MyFullAuditedAggregateRootForRecord : FullAuditedAggregateRoot
+{
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string? CreatorName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string? Remark { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ public virtual string? ExtraField1 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ public virtual string? ExtraField2 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ public virtual string? ExtraField3 { get; set; }
+
+
+}
+
+/// <summary>
+/// 鎴戞墿灞曠殑瀹炰綋绫诲熀绫�(璁板綍琛ㄤ笓鐢�)
+/// </summary>
+/// <typeparam name="TKey"></typeparam>
+[Serializable]
+public abstract class MyFullAuditedAggregateRootForRecord<TKey> : FullAuditedAggregateRoot<TKey>
+{
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string? CreatorName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string? Remark { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ public virtual string? ExtraField1 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ public virtual string? ExtraField2 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ public virtual string? ExtraField3 { get; set; }
+
+ protected MyFullAuditedAggregateRootForRecord()
+ {
+
+ }
+
+ protected MyFullAuditedAggregateRootForRecord(TKey id)
+ : base(id)
+ {
+
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs
index 31c2d13..65472bf 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.EntityFrameworkCore.Metadata.Internal;
+锘縰sing CMS.Plugin.MyExtension.Domain;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -12,7 +13,7 @@
/// <summary>
/// 搴撲綅瀹瑰櫒鍏崇郴
/// </summary>
- public class WmsContainerPlace : FullAuditedAggregateRoot<Guid>
+ public class WmsContainerPlace : MyFullAuditedAggregateRoot<Guid>
{
/// <summary>
/// 搴撲綅缂栫爜
@@ -23,16 +24,6 @@
/// 鎵樼洏缂栧彿
/// </summary>
public string ContainerNo { get; set; }
-
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
/// <summary>
/// Adjusts the sort.
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs
index e6b20f4..c6b09c9 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/IWmsMaterialRepository.cs
@@ -44,6 +44,13 @@
Task<List<WmsMaterial>> GetListAsync(WmsMaterial material, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, string filter = null, Specification<WmsMaterial> specification = null, bool includeDetails = false, CancellationToken cancellationToken = default);
/// <summary>
+ /// 鑾峰彇鐗╂枡鍩虹鍒楄〃
+ /// </summary>
+ /// <param name="material"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ Task<List<WmsMaterial>> GetMaterialListAsync(WmsMaterial? material, CancellationToken cancellationToken = default);
+ /// <summary>
/// Gets the count asynchronous.
/// </summary>
/// <param name="filter">The filter.</param>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlace.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlace.cs
index c73bb3a..e77bed9 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlace.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsPlaces/WmsPlace.cs
@@ -61,6 +61,11 @@
public YesNoEnum EmptyContainer { get; set; }
/// <summary>
+ /// 鏈�澶у簱瀛橀噺
+ /// </summary>
+ public int MaxStockNumber { get; set; }
+
+ /// <summary>
/// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
/// </summary>
public string RedundantField1 { get; set; }
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainerPlace.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainerPlace.cs
index dee8105..fcd6a2c 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainerPlace.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsContainerPlace.cs
@@ -8,7 +8,9 @@
using System.Text;
using System.Threading.Tasks;
using Volo.Abp;
+using CMS.Plugin.MyExtension;
using Volo.Abp.EntityFrameworkCore.Modeling;
+using CMS.Plugin.MyExtension.Domain;
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions
{
@@ -58,6 +60,7 @@
.HasMaxLength(50)
.IsRequired()
.HasComment("鎵樼洏缂栧彿");
+ b.ConfigureMyCmsEntity();
// Composite primary key
b.HasKey(x => new { x.PlaceNo, x.ContainerNo });
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsPlace.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsPlace.cs
index b557a95..8831876 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsPlace.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsPlace.cs
@@ -54,6 +54,7 @@
b.Property(x => x.LayerNo).HasComment("灞�");
b.Property(x => x.Islock).HasComment("鏄惁閿佸畾");
b.Property(x => x.EmptyContainer).HasComment("鏄惁绌烘墭");
+ b.Property(x => x.MaxStockNumber).HasComment("鏈�澶у簱瀛橀噺");
b.Property(x => x.RedundantField1).HasMaxLength(WmsPlaceConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
b.Property(x => x.RedundantField2).HasMaxLength(WmsPlaceConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
b.Property(x => x.RedundantField3).HasMaxLength(WmsPlaceConsts.MaxRedundantFieldLength).IsRequired(false).HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs
index 72d311a..f0a1d1a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs
@@ -73,6 +73,23 @@
}
/// <summary>
+ /// 获取物料基础列表
+ /// </summary>
+ /// <param name="material"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WmsMaterial>> GetMaterialListAsync(WmsMaterial? material, CancellationToken cancellationToken = default)
+ {
+ return await (await GetDbSetAsync())
+ .WhereIf(!string.IsNullOrEmpty(material.MaterialName), u => u.MaterialName.Contains(material.MaterialName))
+ .WhereIf(!string.IsNullOrEmpty(material.MaterialCode), u => u.MaterialName.Contains(material.MaterialCode))
+ .WhereIf(material.MaterialType > 0, u => u.MaterialType == material.MaterialType)
+ .WhereIf(material.PurchaseType > 0, u => u.PurchaseType == material.PurchaseType)
+ .Where(x => !x.IsDeleted)
+ .ToListAsync(GetCancellationToken(cancellationToken));
+ }
+
+ /// <summary>
/// 获取总数
/// </summary>
/// <param name="material"></param>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509054804_InitialCreate10.Designer.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509054804_InitialCreate10.Designer.cs
new file mode 100644
index 0000000..5153c13
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509054804_InitialCreate10.Designer.cs
@@ -0,0 +1,1723 @@
+锘�// <auto-generated />
+using System;
+using CMS.Plugin.HIAWms.MySQL;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace CMS.Plugin.HIAWms.MySQL.Migrations
+{
+ [DbContext(typeof(CMSPluginDbContext))]
+ [Migration("20250509054804_InitialCreate10")]
+ partial class InitialCreate10
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
+ .HasAnnotation("ProductVersion", "6.0.16")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsAreas.WmsArea", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("AreaDesc")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鎻忚堪");
+
+ b.Property<string>("AreaName")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("搴撳尯鍚嶇О");
+
+ b.Property<string>("AreaNo")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("搴撳尯缂栧彿");
+
+ b.Property<int>("AreaStatus")
+ .HasColumnType("int")
+ .HasComment("搴撳尯鐘舵��");
+
+ b.Property<int>("AreaType")
+ .HasColumnType("int")
+ .HasComment("搴撳尯绫诲瀷");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("StoreCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠撳簱浠ｇ爜");
+
+ b.Property<string>("StoreName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("浠撳簱鍚嶇О");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaName");
+
+ b.ToTable("scms_wmsareas", (string)null);
+
+ b.HasComment("搴撳尯琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainerPlaces.WmsContainerPlace", b =>
+ {
+ b.Property<string>("PlaceNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("搴撲綅缂栫爜");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("char(36)");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int");
+
+ b.HasKey("PlaceNo", "ContainerNo");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("PlaceNo");
+
+ b.ToTable("scms_wmscontainerplaces", (string)null);
+
+ b.HasComment("瀹瑰櫒搴撲綅鍏崇郴琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainers.WmsContainer", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<int>("ContainerStatus")
+ .HasColumnType("int")
+ .HasComment("鎵樼洏鐘舵��");
+
+ b.Property<int>("ContainerType")
+ .HasColumnType("int")
+ .HasComment("鎵樼洏绫诲瀷");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int?>("ExceptionNumber")
+ .HasColumnType("int")
+ .HasComment("寮傚父鏁伴噺");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<decimal?>("LimitHeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愰珮");
+
+ b.Property<decimal?>("LimitLength")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愰暱");
+
+ b.Property<decimal?>("LimitWidth")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愬");
+
+ b.Property<int?>("MaterialNumber")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡鏁伴噺");
+
+ b.Property<decimal?>("MaxWeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("杞介噸涓婇檺");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<decimal?>("SpecHeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("楂樺害");
+
+ b.Property<decimal?>("SpecLength")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害");
+
+ b.Property<decimal?>("SpecWidth")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("瀹藉害");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo")
+ .IsUnique();
+
+ b.HasIndex("ContainerStatus");
+
+ b.HasIndex("ContainerType");
+
+ b.ToTable("scms_wmscontainers", (string)null);
+
+ b.HasComment("鎵樼洏淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder.WmsInOutStockOrder", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int>("CompleteNumber")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("瀹屾垚鏁伴噺");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int>("DistributeNumber")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("涓嬪彂鏁伴噺");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵规鍙�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍨嬪彿");
+
+ b.Property<string>("MaterialName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠跺彿");
+
+ b.Property<int>("MaterialNumber")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁鏁伴噺");
+
+ b.Property<DateTime?>("OperateTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鎿嶄綔鏃堕棿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<int>("OrderStatus")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁鐘舵��");
+
+ b.Property<int>("OrderType")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁绫诲瀷");
+
+ b.Property<string>("PlanNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍏宠仈璁″垝缂栧彿");
+
+ b.Property<int>("Priority")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(1)
+ .HasComment("浼樺厛绾�");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StockType")
+ .HasColumnType("int")
+ .HasComment("鎿嶄綔绫诲瀷锛堟灇涓惧�硷級");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialBatch");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OperateTime");
+
+ b.HasIndex("OrderNo")
+ .IsUnique();
+
+ b.HasIndex("PlanNo");
+
+ b.ToTable("scms_wmsinoutstockorder", (string)null);
+
+ b.HasComment("鍑哄叆搴撳崟鎹〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrderDetail.WmsInOutStockOrderDetail", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int?>("MaterialBatch")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡鎵规");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鍞竴鐮�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏈哄瀷");
+
+ b.Property<string>("MaterialName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠跺彿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<int>("OrderType")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OrderNo");
+
+ b.HasIndex("OrderNo", "OrderType");
+
+ b.ToTable("scms_wmsinoutstockorderdetail", (string)null);
+
+ b.HasComment("鍑哄叆搴撳崟鎹槑缁嗚〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏈哄瀷");
+
+ b.Property<string>("MaterialName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠跺彿");
+
+ b.Property<DateTime?>("OperateTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鎿嶄綔鏃堕棿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("SourcePlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("璧峰搴撲綅");
+
+ b.Property<int>("StockType")
+ .HasColumnType("int")
+ .HasComment("鎿嶄綔绫诲瀷");
+
+ b.Property<string>("TaskNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠诲姟鍙�");
+
+ b.Property<string>("ToPlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐩爣搴撲綅");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OperateTime");
+
+ b.HasIndex("OrderNo");
+
+ b.HasIndex("StockType");
+
+ b.HasIndex("TaskNo");
+
+ b.ToTable("scms_wmsinoutstockrecords", (string)null);
+
+ b.HasComment("鍑哄叆搴撹褰曡〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialContainer.WmsMaterialContainer", b =>
+ {
+ b.Property<string>("MaterialId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("char(36)");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int");
+
+ b.HasKey("MaterialId", "ContainerNo");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.ToTable("scms_wmsmaterialcontainer", (string)null);
+
+ b.HasComment("鐗╂枡瀹瑰櫒鍏崇郴琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialInfos.WmsMaterialInfo", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int?>("CheckStatus")
+ .HasColumnType("int")
+ .HasComment("妫�楠岀姸鎬�(0:鏈楠�,1:妫�楠岄�氳繃,2:妫�楠屼笉閫氳繃)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡鎵瑰彿");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鍞竴鐮�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏈哄瀷/瑙勬牸");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠ｅ彿");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁1");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁2");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁3");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int?>("StockNumber")
+ .HasColumnType("int")
+ .HasComment("搴撳瓨鏁伴噺");
+
+ b.Property<string>("SupplierCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("渚涘簲鍟嗙紪鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CheckStatus");
+
+ b.HasIndex("MaterialBatch");
+
+ b.HasIndex("MaterialId")
+ .IsUnique();
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialNo")
+ .IsUnique();
+
+ b.HasIndex("SupplierCode");
+
+ b.ToTable("scms_wmsmaterialinfos", (string)null);
+
+ b.HasComment("WMS鐗╂枡淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterials.WmsMaterial", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("Certification")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("璇佷功缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<string>("Factory")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐢熶骇宸ュ巶");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("IsMainBranch")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鏄惁涓轰富鏀");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<decimal>("Length")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害锛堝崟浣嶏細m锛�");
+
+ b.Property<string>("MaterialCode")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鍨嬪彿");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialQuality")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鏉愯川锛堝锛�304涓嶉攬閽級");
+
+ b.Property<int>("MaterialType")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<decimal>("OuterDiameter")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澶栧緞锛堝崟浣嶏細mm锛�");
+
+ b.Property<string>("PrimaryUnit")
+ .HasMaxLength(20)
+ .HasColumnType("varchar(20)")
+ .HasComment("涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�");
+
+ b.Property<int>("PurchaseType")
+ .HasColumnType("int")
+ .HasComment("閲囪喘绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("Standard")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�");
+
+ b.Property<decimal>("WallThickness")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澹佸帤锛堝崟浣嶏細mm锛�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialCode")
+ .IsUnique();
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialType");
+
+ b.HasIndex("PurchaseType");
+
+ b.ToTable("scms_wmsmaterials", (string)null);
+
+ b.HasComment("鐗╂枡鍩虹淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialStocks.WmsMaterialStock", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("AreaCode")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍖哄煙缂栧彿");
+
+ b.Property<string>("AreaName")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("搴撳尯鍚嶇О");
+
+ b.Property<int?>("CheckStatus")
+ .HasColumnType("int")
+ .HasComment("妫�楠岀姸鎬�(1:鏈楠�,2:妫�楠岄�氳繃,3:妫�楠屼笉閫氳繃)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<int>("ContainerStatus")
+ .HasColumnType("int")
+ .HasComment("瀹瑰櫒鐘舵��");
+
+ b.Property<int>("ContainerType")
+ .HasColumnType("int")
+ .HasComment("瀹瑰櫒绫诲瀷");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int>("EmptyContainer")
+ .HasColumnType("int")
+ .HasComment("鏄惁绌烘墭(2:鍚�,1:鏄�)");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<DateTime?>("InStockTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鍏ュ簱鏃堕棿");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("IsLock")
+ .HasColumnType("int")
+ .HasComment("鏄惁閿佸畾(2:鏈攣瀹�,1:宸查攣瀹�)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鎵规");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鏈哄瀷/瑙勬牸");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡缂栧彿");
+
+ b.Property<string>("PlaceNo")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("搴撲綅缂栧彿");
+
+ b.Property<int>("PlaceStatus")
+ .HasColumnType("int")
+ .HasComment("搴撲綅鐘舵��;");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StockNumber")
+ .HasColumnType("int")
+ .HasComment("搴撳瓨鏁伴噺");
+
+ b.Property<int>("StorageTypeNo")
+ .HasColumnType("int")
+ .HasComment("搴撲綅绫诲瀷");
+
+ b.Property<string>("SupplierCode")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("渚涘簲鍟嗙紪鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaCode");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("PlaceNo");
+
+ b.HasIndex("MaterialBatch", "SupplierCode");
+
+ b.ToTable("scms_wmsmaterialstocks", (string)null);
+
+ b.HasComment("WMS鐗╂枡搴撳瓨琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsPlaces.WmsPlace", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int>("Aisle")
+ .HasColumnType("int")
+ .HasComment("宸烽亾");
+
+ b.Property<string>("AreaCode")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵�鍦ㄥ簱鍖�");
+
+ b.Property<int>("ColumnNo")
+ .HasColumnType("int")
+ .HasComment("鍒�");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int>("EmptyContainer")
+ .HasColumnType("int")
+ .HasComment("鏄惁绌烘墭");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("Islock")
+ .HasColumnType("int")
+ .HasComment("鏄惁閿佸畾");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("LayerNo")
+ .HasColumnType("int")
+ .HasComment("灞�");
+
+ b.Property<int>("MaxStockNumber")
+ .HasColumnType("int")
+ .HasComment("鏈�澶у簱瀛橀噺");
+
+ b.Property<string>("PlaceNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("缂栧彿");
+
+ b.Property<int>("PlaceStatus")
+ .HasColumnType("int")
+ .HasComment("璐т綅鐘舵��");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("RowNo")
+ .HasColumnType("int")
+ .HasComment("鎺�");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StorageTypeNo")
+ .HasColumnType("int")
+ .HasComment("璐т綅绫诲瀷");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaCode");
+
+ b.HasIndex("PlaceNo")
+ .IsUnique();
+
+ b.HasIndex("PlaceStatus");
+
+ b.HasIndex("StorageTypeNo");
+
+ b.ToTable("scms_wmsplaces", (string)null);
+
+ b.HasComment("搴撲綅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsStores.WmsStore", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("StoreCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠撳簱浠ｇ爜");
+
+ b.Property<string>("StoreName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("浠撳簱鍚嶇О");
+
+ b.HasKey("Id");
+
+ b.HasIndex("StoreName");
+
+ b.ToTable("scms_wmsstores", (string)null);
+
+ b.HasComment("浠撳簱淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int?>("Aisle")
+ .HasColumnType("int")
+ .HasComment("宸烽亾");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int?>("DodeviceId")
+ .HasColumnType("int")
+ .HasComment("鍫嗗灈鏈篒D");
+
+ b.Property<int>("Dodevicetype")
+ .HasColumnType("int")
+ .HasComment("璁惧绫诲瀷");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int?>("IsNextTask")
+ .HasColumnType("int")
+ .HasComment("涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛");
+
+ b.Property<bool>("IsRead")
+ .HasColumnType("tinyint(1)")
+ .HasComment("WCS鏄惁鍙互璇诲彇");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MutableParam1")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺1");
+
+ b.Property<string>("MutableParam2")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺2");
+
+ b.Property<string>("MutableParam3")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺3");
+
+ b.Property<int?>("SonTaskType")
+ .HasColumnType("int")
+ .HasComment("瀛愪换鍔＄被鍨�");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("SourceOrderNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏉ユ簮鍗曟嵁鍙�");
+
+ b.Property<string>("SourcePlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("璧峰搴撲綅");
+
+ b.Property<int>("TaskDodeviceStatus")
+ .HasColumnType("int")
+ .HasComment("璁惧浠诲姟鐘舵��");
+
+ b.Property<int>("TaskLevel")
+ .HasColumnType("int")
+ .HasComment("浠诲姟绛夌骇");
+
+ b.Property<string>("TaskNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠诲姟鍙�");
+
+ b.Property<int>("TaskStatus")
+ .HasColumnType("int")
+ .HasComment("浠诲姟鐘舵��");
+
+ b.Property<int>("TaskType")
+ .HasColumnType("int")
+ .HasComment("浠诲姟绫诲瀷");
+
+ b.Property<string>("ToPlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐩爣搴撲綅");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("DodeviceId");
+
+ b.HasIndex("IsRead");
+
+ b.HasIndex("Sort");
+
+ b.HasIndex("SourceOrderNo");
+
+ b.HasIndex("SourcePlace");
+
+ b.HasIndex("TaskNo")
+ .IsUnique();
+
+ b.HasIndex("TaskStatus");
+
+ b.HasIndex("TaskType");
+
+ b.HasIndex("ToPlace");
+
+ b.ToTable("scms_wmstasks", (string)null);
+
+ b.HasComment("浠诲姟琛�");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509054804_InitialCreate10.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509054804_InitialCreate10.cs
new file mode 100644
index 0000000..c0c0908
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509054804_InitialCreate10.cs
@@ -0,0 +1,27 @@
+锘縰sing Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CMS.Plugin.HIAWms.MySQL.Migrations
+{
+ public partial class InitialCreate10 : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn<int>(
+ name: "MaxStockNumber",
+ table: "scms_wmsplaces",
+ type: "int",
+ nullable: false,
+ defaultValue: 0,
+ comment: "鏈�澶у簱瀛橀噺");
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "MaxStockNumber",
+ table: "scms_wmsplaces");
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509065902_InitialCreate11.Designer.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509065902_InitialCreate11.Designer.cs
new file mode 100644
index 0000000..359204b
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509065902_InitialCreate11.Designer.cs
@@ -0,0 +1,1781 @@
+锘�// <auto-generated />
+using System;
+using CMS.Plugin.HIAWms.MySQL;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace CMS.Plugin.HIAWms.MySQL.Migrations
+{
+ [DbContext(typeof(CMSPluginDbContext))]
+ [Migration("20250509065902_InitialCreate11")]
+ partial class InitialCreate11
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
+ .HasAnnotation("ProductVersion", "6.0.16")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsAreas.WmsArea", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("AreaDesc")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鎻忚堪");
+
+ b.Property<string>("AreaName")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("搴撳尯鍚嶇О");
+
+ b.Property<string>("AreaNo")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("搴撳尯缂栧彿");
+
+ b.Property<int>("AreaStatus")
+ .HasColumnType("int")
+ .HasComment("搴撳尯鐘舵��");
+
+ b.Property<int>("AreaType")
+ .HasColumnType("int")
+ .HasComment("搴撳尯绫诲瀷");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("StoreCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠撳簱浠ｇ爜");
+
+ b.Property<string>("StoreName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("浠撳簱鍚嶇О");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaName");
+
+ b.ToTable("scms_wmsareas", (string)null);
+
+ b.HasComment("搴撳尯琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainerPlaces.WmsContainerPlace", b =>
+ {
+ b.Property<string>("PlaceNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("搴撲綅缂栫爜");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp")
+ .HasComment("骞跺彂鎴�");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime")
+ .HasComment("鍒涘缓鏃堕棿");
+
+ b.Property<Guid?>("CreatorId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId")
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property<string>("CreatorName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍒涘缓浜�");
+
+ b.Property<string>("DeleteRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍒犻櫎澶囨敞");
+
+ b.Property<Guid?>("DeleterId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId")
+ .HasComment("鍒犻櫎浜篒D");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime")
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property<string>("ExtraField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁1");
+
+ b.Property<string>("ExtraField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁2");
+
+ b.Property<string>("ExtraField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁3");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties")
+ .HasComment("鎵╁睍灞炴��");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("char(36)");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("LastModifierName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("淇敼浜�");
+
+ b.Property<string>("OperationRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎿嶄綔澶囨敞");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.HasKey("PlaceNo", "ContainerNo");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("PlaceNo");
+
+ b.ToTable("scms_wmscontainerplaces", (string)null);
+
+ b.HasComment("瀹瑰櫒搴撲綅鍏崇郴琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainers.WmsContainer", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<int>("ContainerStatus")
+ .HasColumnType("int")
+ .HasComment("鎵樼洏鐘舵��");
+
+ b.Property<int>("ContainerType")
+ .HasColumnType("int")
+ .HasComment("鎵樼洏绫诲瀷");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int?>("ExceptionNumber")
+ .HasColumnType("int")
+ .HasComment("寮傚父鏁伴噺");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<decimal?>("LimitHeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愰珮");
+
+ b.Property<decimal?>("LimitLength")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愰暱");
+
+ b.Property<decimal?>("LimitWidth")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愬");
+
+ b.Property<int?>("MaterialNumber")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡鏁伴噺");
+
+ b.Property<decimal?>("MaxWeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("杞介噸涓婇檺");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<decimal?>("SpecHeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("楂樺害");
+
+ b.Property<decimal?>("SpecLength")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害");
+
+ b.Property<decimal?>("SpecWidth")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("瀹藉害");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo")
+ .IsUnique();
+
+ b.HasIndex("ContainerStatus");
+
+ b.HasIndex("ContainerType");
+
+ b.ToTable("scms_wmscontainers", (string)null);
+
+ b.HasComment("鎵樼洏淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder.WmsInOutStockOrder", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int>("CompleteNumber")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("瀹屾垚鏁伴噺");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int>("DistributeNumber")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("涓嬪彂鏁伴噺");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵规鍙�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍨嬪彿");
+
+ b.Property<string>("MaterialName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠跺彿");
+
+ b.Property<int>("MaterialNumber")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁鏁伴噺");
+
+ b.Property<DateTime?>("OperateTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鎿嶄綔鏃堕棿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<int>("OrderStatus")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁鐘舵��");
+
+ b.Property<int>("OrderType")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁绫诲瀷");
+
+ b.Property<string>("PlanNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍏宠仈璁″垝缂栧彿");
+
+ b.Property<int>("Priority")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(1)
+ .HasComment("浼樺厛绾�");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StockType")
+ .HasColumnType("int")
+ .HasComment("鎿嶄綔绫诲瀷锛堟灇涓惧�硷級");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialBatch");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OperateTime");
+
+ b.HasIndex("OrderNo")
+ .IsUnique();
+
+ b.HasIndex("PlanNo");
+
+ b.ToTable("scms_wmsinoutstockorder", (string)null);
+
+ b.HasComment("鍑哄叆搴撳崟鎹〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrderDetail.WmsInOutStockOrderDetail", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int?>("MaterialBatch")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡鎵规");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鍞竴鐮�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏈哄瀷");
+
+ b.Property<string>("MaterialName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠跺彿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<int>("OrderType")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OrderNo");
+
+ b.HasIndex("OrderNo", "OrderType");
+
+ b.ToTable("scms_wmsinoutstockorderdetail", (string)null);
+
+ b.HasComment("鍑哄叆搴撳崟鎹槑缁嗚〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏈哄瀷");
+
+ b.Property<string>("MaterialName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠跺彿");
+
+ b.Property<DateTime?>("OperateTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鎿嶄綔鏃堕棿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("SourcePlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("璧峰搴撲綅");
+
+ b.Property<int>("StockType")
+ .HasColumnType("int")
+ .HasComment("鎿嶄綔绫诲瀷");
+
+ b.Property<string>("TaskNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠诲姟鍙�");
+
+ b.Property<string>("ToPlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐩爣搴撲綅");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OperateTime");
+
+ b.HasIndex("OrderNo");
+
+ b.HasIndex("StockType");
+
+ b.HasIndex("TaskNo");
+
+ b.ToTable("scms_wmsinoutstockrecords", (string)null);
+
+ b.HasComment("鍑哄叆搴撹褰曡〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialContainer.WmsMaterialContainer", b =>
+ {
+ b.Property<string>("MaterialId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("char(36)");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int");
+
+ b.HasKey("MaterialId", "ContainerNo");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.ToTable("scms_wmsmaterialcontainer", (string)null);
+
+ b.HasComment("鐗╂枡瀹瑰櫒鍏崇郴琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialInfos.WmsMaterialInfo", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int?>("CheckStatus")
+ .HasColumnType("int")
+ .HasComment("妫�楠岀姸鎬�(0:鏈楠�,1:妫�楠岄�氳繃,2:妫�楠屼笉閫氳繃)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡鎵瑰彿");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鍞竴鐮�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏈哄瀷/瑙勬牸");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠ｅ彿");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁1");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁2");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁3");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int?>("StockNumber")
+ .HasColumnType("int")
+ .HasComment("搴撳瓨鏁伴噺");
+
+ b.Property<string>("SupplierCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("渚涘簲鍟嗙紪鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CheckStatus");
+
+ b.HasIndex("MaterialBatch");
+
+ b.HasIndex("MaterialId")
+ .IsUnique();
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialNo")
+ .IsUnique();
+
+ b.HasIndex("SupplierCode");
+
+ b.ToTable("scms_wmsmaterialinfos", (string)null);
+
+ b.HasComment("WMS鐗╂枡淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterials.WmsMaterial", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("Certification")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("璇佷功缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<string>("Factory")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐢熶骇宸ュ巶");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("IsMainBranch")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鏄惁涓轰富鏀");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<decimal>("Length")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害锛堝崟浣嶏細m锛�");
+
+ b.Property<string>("MaterialCode")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鍨嬪彿");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialQuality")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鏉愯川锛堝锛�304涓嶉攬閽級");
+
+ b.Property<int>("MaterialType")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<decimal>("OuterDiameter")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澶栧緞锛堝崟浣嶏細mm锛�");
+
+ b.Property<string>("PrimaryUnit")
+ .HasMaxLength(20)
+ .HasColumnType("varchar(20)")
+ .HasComment("涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�");
+
+ b.Property<int>("PurchaseType")
+ .HasColumnType("int")
+ .HasComment("閲囪喘绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("Standard")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�");
+
+ b.Property<decimal>("WallThickness")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澹佸帤锛堝崟浣嶏細mm锛�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialCode")
+ .IsUnique();
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialType");
+
+ b.HasIndex("PurchaseType");
+
+ b.ToTable("scms_wmsmaterials", (string)null);
+
+ b.HasComment("鐗╂枡鍩虹淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialStocks.WmsMaterialStock", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("AreaCode")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍖哄煙缂栧彿");
+
+ b.Property<string>("AreaName")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("搴撳尯鍚嶇О");
+
+ b.Property<int?>("CheckStatus")
+ .HasColumnType("int")
+ .HasComment("妫�楠岀姸鎬�(1:鏈楠�,2:妫�楠岄�氳繃,3:妫�楠屼笉閫氳繃)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<int>("ContainerStatus")
+ .HasColumnType("int")
+ .HasComment("瀹瑰櫒鐘舵��");
+
+ b.Property<int>("ContainerType")
+ .HasColumnType("int")
+ .HasComment("瀹瑰櫒绫诲瀷");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int>("EmptyContainer")
+ .HasColumnType("int")
+ .HasComment("鏄惁绌烘墭(2:鍚�,1:鏄�)");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<DateTime?>("InStockTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鍏ュ簱鏃堕棿");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("IsLock")
+ .HasColumnType("int")
+ .HasComment("鏄惁閿佸畾(2:鏈攣瀹�,1:宸查攣瀹�)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鎵规");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鏈哄瀷/瑙勬牸");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡缂栧彿");
+
+ b.Property<string>("PlaceNo")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("搴撲綅缂栧彿");
+
+ b.Property<int>("PlaceStatus")
+ .HasColumnType("int")
+ .HasComment("搴撲綅鐘舵��;");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StockNumber")
+ .HasColumnType("int")
+ .HasComment("搴撳瓨鏁伴噺");
+
+ b.Property<int>("StorageTypeNo")
+ .HasColumnType("int")
+ .HasComment("搴撲綅绫诲瀷");
+
+ b.Property<string>("SupplierCode")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("渚涘簲鍟嗙紪鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaCode");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("PlaceNo");
+
+ b.HasIndex("MaterialBatch", "SupplierCode");
+
+ b.ToTable("scms_wmsmaterialstocks", (string)null);
+
+ b.HasComment("WMS鐗╂枡搴撳瓨琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsPlaces.WmsPlace", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int>("Aisle")
+ .HasColumnType("int")
+ .HasComment("宸烽亾");
+
+ b.Property<string>("AreaCode")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵�鍦ㄥ簱鍖�");
+
+ b.Property<int>("ColumnNo")
+ .HasColumnType("int")
+ .HasComment("鍒�");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int>("EmptyContainer")
+ .HasColumnType("int")
+ .HasComment("鏄惁绌烘墭");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("Islock")
+ .HasColumnType("int")
+ .HasComment("鏄惁閿佸畾");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("LayerNo")
+ .HasColumnType("int")
+ .HasComment("灞�");
+
+ b.Property<int>("MaxStockNumber")
+ .HasColumnType("int")
+ .HasComment("鏈�澶у簱瀛橀噺");
+
+ b.Property<string>("PlaceNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("缂栧彿");
+
+ b.Property<int>("PlaceStatus")
+ .HasColumnType("int")
+ .HasComment("璐т綅鐘舵��");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("RowNo")
+ .HasColumnType("int")
+ .HasComment("鎺�");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StorageTypeNo")
+ .HasColumnType("int")
+ .HasComment("璐т綅绫诲瀷");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaCode");
+
+ b.HasIndex("PlaceNo")
+ .IsUnique();
+
+ b.HasIndex("PlaceStatus");
+
+ b.HasIndex("StorageTypeNo");
+
+ b.ToTable("scms_wmsplaces", (string)null);
+
+ b.HasComment("搴撲綅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsStores.WmsStore", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("StoreCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠撳簱浠ｇ爜");
+
+ b.Property<string>("StoreName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("浠撳簱鍚嶇О");
+
+ b.HasKey("Id");
+
+ b.HasIndex("StoreName");
+
+ b.ToTable("scms_wmsstores", (string)null);
+
+ b.HasComment("浠撳簱淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int?>("Aisle")
+ .HasColumnType("int")
+ .HasComment("宸烽亾");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property<int?>("DodeviceId")
+ .HasColumnType("int")
+ .HasComment("鍫嗗灈鏈篒D");
+
+ b.Property<int>("Dodevicetype")
+ .HasColumnType("int")
+ .HasComment("璁惧绫诲瀷");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int?>("IsNextTask")
+ .HasColumnType("int")
+ .HasComment("涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛");
+
+ b.Property<bool>("IsRead")
+ .HasColumnType("tinyint(1)")
+ .HasComment("WCS鏄惁鍙互璇诲彇");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MutableParam1")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺1");
+
+ b.Property<string>("MutableParam2")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺2");
+
+ b.Property<string>("MutableParam3")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍙彉鍙橀噺3");
+
+ b.Property<int?>("SonTaskType")
+ .HasColumnType("int")
+ .HasComment("瀛愪换鍔＄被鍨�");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("SourceOrderNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏉ユ簮鍗曟嵁鍙�");
+
+ b.Property<string>("SourcePlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("璧峰搴撲綅");
+
+ b.Property<int>("TaskDodeviceStatus")
+ .HasColumnType("int")
+ .HasComment("璁惧浠诲姟鐘舵��");
+
+ b.Property<int>("TaskLevel")
+ .HasColumnType("int")
+ .HasComment("浠诲姟绛夌骇");
+
+ b.Property<string>("TaskNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠诲姟鍙�");
+
+ b.Property<int>("TaskStatus")
+ .HasColumnType("int")
+ .HasComment("浠诲姟鐘舵��");
+
+ b.Property<int>("TaskType")
+ .HasColumnType("int")
+ .HasComment("浠诲姟绫诲瀷");
+
+ b.Property<string>("ToPlace")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐩爣搴撲綅");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("DodeviceId");
+
+ b.HasIndex("IsRead");
+
+ b.HasIndex("Sort");
+
+ b.HasIndex("SourceOrderNo");
+
+ b.HasIndex("SourcePlace");
+
+ b.HasIndex("TaskNo")
+ .IsUnique();
+
+ b.HasIndex("TaskStatus");
+
+ b.HasIndex("TaskType");
+
+ b.HasIndex("ToPlace");
+
+ b.ToTable("scms_wmstasks", (string)null);
+
+ b.HasComment("浠诲姟琛�");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509065902_InitialCreate11.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509065902_InitialCreate11.cs
new file mode 100644
index 0000000..78c395b
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509065902_InitialCreate11.cs
@@ -0,0 +1,372 @@
+锘縰sing System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CMS.Plugin.HIAWms.MySQL.Migrations
+{
+ public partial class InitialCreate11 : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AlterColumn<int>(
+ name: "Sort",
+ table: "scms_wmscontainerplaces",
+ type: "int",
+ nullable: false,
+ defaultValue: 0,
+ comment: "鎺掑簭",
+ oldClrType: typeof(int),
+ oldType: "int");
+
+ migrationBuilder.AlterColumn<Guid>(
+ name: "LastModifierId",
+ table: "scms_wmscontainerplaces",
+ type: "char(36)",
+ maxLength: 36,
+ nullable: true,
+ comment: "淇敼浜篒D",
+ collation: "ascii_general_ci",
+ oldClrType: typeof(Guid),
+ oldType: "char(36)",
+ oldNullable: true)
+ .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+ migrationBuilder.AlterColumn<DateTime>(
+ name: "LastModificationTime",
+ table: "scms_wmscontainerplaces",
+ type: "datetime(6)",
+ nullable: true,
+ comment: "淇敼鏃堕棿",
+ oldClrType: typeof(DateTime),
+ oldType: "datetime(6)",
+ oldNullable: true);
+
+ migrationBuilder.AlterColumn<bool>(
+ name: "IsDisabled",
+ table: "scms_wmscontainerplaces",
+ type: "tinyint(1)",
+ nullable: true,
+ defaultValue: false,
+ comment: "鏄惁绂佺敤",
+ oldClrType: typeof(bool),
+ oldType: "tinyint(1)",
+ oldNullable: true);
+
+ migrationBuilder.AlterColumn<bool>(
+ name: "IsDeleted",
+ table: "scms_wmscontainerplaces",
+ type: "tinyint(1)",
+ nullable: false,
+ defaultValue: false,
+ comment: "鏄惁鍒犻櫎",
+ oldClrType: typeof(bool),
+ oldType: "tinyint(1)",
+ oldDefaultValue: false);
+
+ migrationBuilder.AlterColumn<string>(
+ name: "ExtraProperties",
+ table: "scms_wmscontainerplaces",
+ type: "longtext",
+ nullable: true,
+ comment: "鎵╁睍灞炴��",
+ oldClrType: typeof(string),
+ oldType: "longtext",
+ oldNullable: true)
+ .Annotation("MySql:CharSet", "utf8mb4")
+ .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AlterColumn<DateTime>(
+ name: "DeletionTime",
+ table: "scms_wmscontainerplaces",
+ type: "datetime(6)",
+ nullable: true,
+ comment: "鍒犻櫎鏃堕棿",
+ oldClrType: typeof(DateTime),
+ oldType: "datetime(6)",
+ oldNullable: true);
+
+ migrationBuilder.AlterColumn<Guid>(
+ name: "DeleterId",
+ table: "scms_wmscontainerplaces",
+ type: "char(36)",
+ maxLength: 36,
+ nullable: true,
+ comment: "鍒犻櫎浜篒D",
+ collation: "ascii_general_ci",
+ oldClrType: typeof(Guid),
+ oldType: "char(36)",
+ oldNullable: true)
+ .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+ migrationBuilder.AlterColumn<Guid>(
+ name: "CreatorId",
+ table: "scms_wmscontainerplaces",
+ type: "char(36)",
+ maxLength: 36,
+ nullable: true,
+ comment: "鍒涘缓浜篒D",
+ collation: "ascii_general_ci",
+ oldClrType: typeof(Guid),
+ oldType: "char(36)",
+ oldNullable: true)
+ .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+ migrationBuilder.AlterColumn<DateTime>(
+ name: "CreationTime",
+ table: "scms_wmscontainerplaces",
+ type: "datetime(6)",
+ nullable: false,
+ comment: "鍒涘缓鏃堕棿",
+ oldClrType: typeof(DateTime),
+ oldType: "datetime(6)");
+
+ migrationBuilder.AlterColumn<string>(
+ name: "ConcurrencyStamp",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(40)",
+ maxLength: 40,
+ nullable: true,
+ comment: "骞跺彂鎴�",
+ oldClrType: typeof(string),
+ oldType: "varchar(40)",
+ oldMaxLength: 40,
+ oldNullable: true)
+ .Annotation("MySql:CharSet", "utf8mb4")
+ .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AddColumn<string>(
+ name: "CreatorName",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(64)",
+ maxLength: 64,
+ nullable: true,
+ comment: "鍒涘缓浜�")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AddColumn<string>(
+ name: "DeleteRemark",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(256)",
+ maxLength: 256,
+ nullable: true,
+ comment: "鍒犻櫎澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AddColumn<string>(
+ name: "ExtraField1",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(256)",
+ maxLength: 256,
+ nullable: true,
+ comment: "鎵╁睍瀛楁1")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AddColumn<string>(
+ name: "ExtraField2",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(256)",
+ maxLength: 256,
+ nullable: true,
+ comment: "鎵╁睍瀛楁2")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AddColumn<string>(
+ name: "ExtraField3",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(256)",
+ maxLength: 256,
+ nullable: true,
+ comment: "鎵╁睍瀛楁3")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AddColumn<string>(
+ name: "LastModifierName",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(64)",
+ maxLength: 64,
+ nullable: true,
+ comment: "淇敼浜�")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AddColumn<string>(
+ name: "OperationRemark",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(256)",
+ maxLength: 256,
+ nullable: true,
+ comment: "鎿嶄綔澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AddColumn<string>(
+ name: "Remark",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(256)",
+ maxLength: 256,
+ nullable: true,
+ comment: "澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4");
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "CreatorName",
+ table: "scms_wmscontainerplaces");
+
+ migrationBuilder.DropColumn(
+ name: "DeleteRemark",
+ table: "scms_wmscontainerplaces");
+
+ migrationBuilder.DropColumn(
+ name: "ExtraField1",
+ table: "scms_wmscontainerplaces");
+
+ migrationBuilder.DropColumn(
+ name: "ExtraField2",
+ table: "scms_wmscontainerplaces");
+
+ migrationBuilder.DropColumn(
+ name: "ExtraField3",
+ table: "scms_wmscontainerplaces");
+
+ migrationBuilder.DropColumn(
+ name: "LastModifierName",
+ table: "scms_wmscontainerplaces");
+
+ migrationBuilder.DropColumn(
+ name: "OperationRemark",
+ table: "scms_wmscontainerplaces");
+
+ migrationBuilder.DropColumn(
+ name: "Remark",
+ table: "scms_wmscontainerplaces");
+
+ migrationBuilder.AlterColumn<int>(
+ name: "Sort",
+ table: "scms_wmscontainerplaces",
+ type: "int",
+ nullable: false,
+ oldClrType: typeof(int),
+ oldType: "int",
+ oldDefaultValue: 0,
+ oldComment: "鎺掑簭");
+
+ migrationBuilder.AlterColumn<Guid>(
+ name: "LastModifierId",
+ table: "scms_wmscontainerplaces",
+ type: "char(36)",
+ nullable: true,
+ collation: "ascii_general_ci",
+ oldClrType: typeof(Guid),
+ oldType: "char(36)",
+ oldMaxLength: 36,
+ oldNullable: true,
+ oldComment: "淇敼浜篒D")
+ .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+ migrationBuilder.AlterColumn<DateTime>(
+ name: "LastModificationTime",
+ table: "scms_wmscontainerplaces",
+ type: "datetime(6)",
+ nullable: true,
+ oldClrType: typeof(DateTime),
+ oldType: "datetime(6)",
+ oldNullable: true,
+ oldComment: "淇敼鏃堕棿");
+
+ migrationBuilder.AlterColumn<bool>(
+ name: "IsDisabled",
+ table: "scms_wmscontainerplaces",
+ type: "tinyint(1)",
+ nullable: true,
+ oldClrType: typeof(bool),
+ oldType: "tinyint(1)",
+ oldNullable: true,
+ oldDefaultValue: false,
+ oldComment: "鏄惁绂佺敤");
+
+ migrationBuilder.AlterColumn<bool>(
+ name: "IsDeleted",
+ table: "scms_wmscontainerplaces",
+ type: "tinyint(1)",
+ nullable: false,
+ defaultValue: false,
+ oldClrType: typeof(bool),
+ oldType: "tinyint(1)",
+ oldDefaultValue: false,
+ oldComment: "鏄惁鍒犻櫎");
+
+ migrationBuilder.AlterColumn<string>(
+ name: "ExtraProperties",
+ table: "scms_wmscontainerplaces",
+ type: "longtext",
+ nullable: true,
+ oldClrType: typeof(string),
+ oldType: "longtext",
+ oldNullable: true,
+ oldComment: "鎵╁睍灞炴��")
+ .Annotation("MySql:CharSet", "utf8mb4")
+ .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.AlterColumn<DateTime>(
+ name: "DeletionTime",
+ table: "scms_wmscontainerplaces",
+ type: "datetime(6)",
+ nullable: true,
+ oldClrType: typeof(DateTime),
+ oldType: "datetime(6)",
+ oldNullable: true,
+ oldComment: "鍒犻櫎鏃堕棿");
+
+ migrationBuilder.AlterColumn<Guid>(
+ name: "DeleterId",
+ table: "scms_wmscontainerplaces",
+ type: "char(36)",
+ nullable: true,
+ collation: "ascii_general_ci",
+ oldClrType: typeof(Guid),
+ oldType: "char(36)",
+ oldMaxLength: 36,
+ oldNullable: true,
+ oldComment: "鍒犻櫎浜篒D")
+ .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+ migrationBuilder.AlterColumn<Guid>(
+ name: "CreatorId",
+ table: "scms_wmscontainerplaces",
+ type: "char(36)",
+ nullable: true,
+ collation: "ascii_general_ci",
+ oldClrType: typeof(Guid),
+ oldType: "char(36)",
+ oldMaxLength: 36,
+ oldNullable: true,
+ oldComment: "鍒涘缓浜篒D")
+ .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+ migrationBuilder.AlterColumn<DateTime>(
+ name: "CreationTime",
+ table: "scms_wmscontainerplaces",
+ type: "datetime(6)",
+ nullable: false,
+ oldClrType: typeof(DateTime),
+ oldType: "datetime(6)",
+ oldComment: "鍒涘缓鏃堕棿");
+
+ migrationBuilder.AlterColumn<string>(
+ name: "ConcurrencyStamp",
+ table: "scms_wmscontainerplaces",
+ type: "varchar(40)",
+ maxLength: 40,
+ nullable: true,
+ oldClrType: typeof(string),
+ oldType: "varchar(40)",
+ oldMaxLength: 40,
+ oldNullable: true,
+ oldComment: "骞跺彂鎴�")
+ .Annotation("MySql:CharSet", "utf8mb4")
+ .OldAnnotation("MySql:CharSet", "utf8mb4");
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
index dc97f08..4def327 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
@@ -155,27 +155,60 @@
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("varchar(40)")
- .HasColumnName("ConcurrencyStamp");
+ .HasColumnName("ConcurrencyStamp")
+ .HasComment("骞跺彂鎴�");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime(6)")
- .HasColumnName("CreationTime");
+ .HasColumnName("CreationTime")
+ .HasComment("鍒涘缓鏃堕棿");
b.Property<Guid?>("CreatorId")
+ .HasMaxLength(36)
.HasColumnType("char(36)")
- .HasColumnName("CreatorId");
+ .HasColumnName("CreatorId")
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property<string>("CreatorName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍒涘缓浜�");
+
+ b.Property<string>("DeleteRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍒犻櫎澶囨敞");
b.Property<Guid?>("DeleterId")
+ .HasMaxLength(36)
.HasColumnType("char(36)")
- .HasColumnName("DeleterId");
+ .HasColumnName("DeleterId")
+ .HasComment("鍒犻櫎浜篒D");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime(6)")
- .HasColumnName("DeletionTime");
+ .HasColumnName("DeletionTime")
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property<string>("ExtraField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁1");
+
+ b.Property<string>("ExtraField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁2");
+
+ b.Property<string>("ExtraField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁3");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
- .HasColumnName("ExtraProperties");
+ .HasColumnName("ExtraProperties")
+ .HasComment("鎵╁睍灞炴��");
b.Property<Guid>("Id")
.HasColumnType("char(36)");
@@ -184,21 +217,46 @@
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
.HasDefaultValue(false)
- .HasColumnName("IsDeleted");
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
b.Property<bool?>("IsDisabled")
- .HasColumnType("tinyint(1)");
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
- .HasColumnName("LastModificationTime");
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
.HasColumnType("char(36)")
- .HasColumnName("LastModifierId");
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("LastModifierName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("淇敼浜�");
+
+ b.Property<string>("OperationRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎿嶄綔澶囨敞");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
b.Property<int>("Sort")
- .HasColumnType("int");
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
b.HasKey("PlaceNo", "ContainerNo");
@@ -1398,6 +1456,10 @@
.HasColumnType("int")
.HasComment("灞�");
+ b.Property<int>("MaxStockNumber")
+ .HasColumnType("int")
+ .HasComment("鏈�澶у簱瀛橀噺");
+
b.Property<string>("PlaceNo")
.IsRequired()
.HasMaxLength(50)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat
index cdc8f7c..3bc21e6 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat
@@ -1,5 +1,5 @@
cd ../
-dotnet ef migrations add InitialCreate9 -c CMSPluginDbContext -o Migrations
+dotnet ef migrations add InitialCreate11 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update1 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update2 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update3 -c CMSPluginDbContext -o Migrations
--
Gitblit v1.9.3