From 751a8ee4490aaeab911f5e1ff60bbba40c104613 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 17:57:23 +0800
Subject: [PATCH] 控制属性规则明细调整
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs | 96 ----
/dev/null | 64 ---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsControlRuleDetailImport.xlsx | 0
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/editForm.vue | 22
使用文档/PDManer文件/原材料库标准化.pdma.json | 843 ++++++++-----------------------------------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs | 20
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs | 38 -
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue | 15
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs | 10
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/addForm.vue | 20
10 files changed, 242 insertions(+), 886 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/addForm.vue
index 767ae4b..43dc396 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/addForm.vue
@@ -8,32 +8,32 @@
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-form-item label="鎺у埗灞炴�ц鍒橧D" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒橧D" v-decorator="['controlRuleId', {rules: [{required: true, message: '璇疯緭鍏ユ帶鍒跺睘鎬ц鍒橧D锛�'}]}]" />
+ <a-form-item label="鎺у埗灞炴�ц鍒欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙�" v-decorator="['ruleCode', {rules: [{required: true, message: '璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙凤紒'}]}]" />
</a-form-item>
<a-form-item label="鏈�楂樺簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ渶楂樺簱瀛�" v-decorator="['maxImumqty', {rules: [{required: true, message: '璇疯緭鍏ユ渶楂樺簱瀛橈紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ユ渶楂樺簱瀛�" v-decorator="['maxImumqty']" />
</a-form-item>
<a-form-item label="鏈�浣庡簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" v-decorator="['minImumqty', {rules: [{required: true, message: '璇疯緭鍏ユ渶浣庡簱瀛橈紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" v-decorator="['minImumqty']" />
</a-form-item>
<a-form-item label="瀹夊叏搴撳瓨" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ畨鍏ㄥ簱瀛�" v-decorator="['safeImumqty', {rules: [{required: true, message: '璇疯緭鍏ュ畨鍏ㄥ簱瀛橈紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ュ畨鍏ㄥ簱瀛�" v-decorator="['safeImumqty']" />
</a-form-item>
<a-form-item label="鏈�灏忓簱榫�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ渶灏忓簱榫�" v-decorator="['minStorageAge', {rules: [{required: true, message: '璇疯緭鍏ユ渶灏忓簱榫勶紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓簱榫�" v-decorator="['minStorageAge']" />
</a-form-item>
<a-form-item label="鏈�澶у簱榫�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ渶澶у簱榫�" v-decorator="['maxStorageAge', {rules: [{required: true, message: '璇疯緭鍏ユ渶澶у簱榫勶紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ユ渶澶у簱榫�" v-decorator="['maxStorageAge']" />
</a-form-item>
<a-form-item label="鏄惁鍏嶆" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isNotChek',{rules: [{ required: true, message: '璇烽�夋嫨鏄惁鍏嶆锛�' }], valuePropName: 'checked'}]" />
+ <a-switch v-decorator="['isNotChek', { valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="淇濊川鏈熷ぉ鏁�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヤ繚璐ㄦ湡澶╂暟" v-decorator="['shelfLifeDays', {rules: [{required: true, message: '璇疯緭鍏ヤ繚璐ㄦ湡澶╂暟锛�'}]}]" />
+ <a-input placeholder="璇疯緭鍏ヤ繚璐ㄦ湡澶╂暟" v-decorator="['shelfLifeDays']" />
</a-form-item>
<a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '璇烽�夋嫨鏄惁绂佺敤锛�' }], valuePropName: 'checked'}]" />
+ <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
</a-form-item>
</a-form>
</a-spin>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/editForm.vue
index 41a2dda..bbadedf 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/editForm.vue
@@ -8,32 +8,32 @@
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-form-item label="鎺у埗灞炴�ц鍒橧D" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒橧D" v-decorator="['controlRuleId', {rules: [{required: true, message: '璇疯緭鍏ユ帶鍒跺睘鎬ц鍒橧D锛�'}]}]" />
+ <a-form-item label="鎺у埗灞炴�ц鍒欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙�" v-decorator="['ruleCode', {rules: [{required: true, message: '璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙凤紒'}]}]" />
</a-form-item>
<a-form-item label="鏈�楂樺簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ渶楂樺簱瀛�" v-decorator="['maxImumqty', {rules: [{required: true, message: '璇疯緭鍏ユ渶楂樺簱瀛橈紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ユ渶楂樺簱瀛�" v-decorator="['maxImumqty']" />
</a-form-item>
<a-form-item label="鏈�浣庡簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" v-decorator="['minImumqty', {rules: [{required: true, message: '璇疯緭鍏ユ渶浣庡簱瀛橈紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" v-decorator="['minImumqty']" />
</a-form-item>
<a-form-item label="瀹夊叏搴撳瓨" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ畨鍏ㄥ簱瀛�" v-decorator="['safeImumqty', {rules: [{required: true, message: '璇疯緭鍏ュ畨鍏ㄥ簱瀛橈紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ュ畨鍏ㄥ簱瀛�" v-decorator="['safeImumqty']" />
</a-form-item>
<a-form-item label="鏈�灏忓簱榫�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ渶灏忓簱榫�" v-decorator="['minStorageAge', {rules: [{required: true, message: '璇疯緭鍏ユ渶灏忓簱榫勶紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓簱榫�" v-decorator="['minStorageAge']" />
</a-form-item>
<a-form-item label="鏈�澶у簱榫�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ渶澶у簱榫�" v-decorator="['maxStorageAge', {rules: [{required: true, message: '璇疯緭鍏ユ渶澶у簱榫勶紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ユ渶澶у簱榫�" v-decorator="['maxStorageAge']" />
</a-form-item>
<a-form-item label="鏄惁鍏嶆" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isNotChek',{rules: [{ required: true, message: '璇烽�夋嫨鏄惁鍏嶆锛�' }], valuePropName: 'checked'}]" />
+ <a-switch v-decorator="['isNotChek', { valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="淇濊川鏈熷ぉ鏁�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヤ繚璐ㄦ湡澶╂暟" v-decorator="['shelfLifeDays', {rules: [{required: true, message: '璇疯緭鍏ヤ繚璐ㄦ湡澶╂暟锛�'}]}]" />
+ <a-input placeholder="璇疯緭鍏ヤ繚璐ㄦ湡澶╂暟" v-decorator="['shelfLifeDays']" />
</a-form-item>
<a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '璇烽�夋嫨鏄惁绂佺敤锛�' }], valuePropName: 'checked'}]" />
+ <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
@@ -78,7 +78,7 @@
this.form.setFieldsValue(
{
id: record.id,
- controlRuleId: record.controlRuleId,
+ ruleCode: record.ruleCode,
maxImumqty: record.maxImumqty,
minImumqty: record.minImumqty,
safeImumqty: record.safeImumqty,
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
index 7eff19e..627d961 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
@@ -7,8 +7,8 @@
<a-form layout="inline">
<a-row :gutter="48">
<a-col :md="8" :sm="24">
- <a-form-item label="鎺у埗灞炴�ц鍒橧D">
- <a-input v-model="queryParam.controlRuleId" allow-clear placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒橧D"/>
+ <a-form-item label="鎺у埗灞炴�ц鍒欑紪鍙�">
+ <a-input v-model="queryParam.ruleCode" allow-clear placeholder="璇疯緭鍏ユ帶鍒跺睘鎬ц鍒欑紪鍙�"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
@@ -104,7 +104,6 @@
</a-card>
</div>
<a-card :bordered="false">
- <!-- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" -->
<s-table
ref="table"
:columns="columns"
@@ -113,7 +112,7 @@
@changeTablePage="pageInfo = $event"
:scroll="{x: true,y:tableHeight}"
:rowKey="(record) => record.id"
- >
+ :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
<template class="table-operator" slot="operator" v-if="hasPerm('WmsControlRuleDetail:add')" >
<div ref="actionBar" class="actionBar">
<a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
@@ -193,24 +192,24 @@
customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
},
{
- title: '鎺у埗灞炴�ц鍒橧D',
+ title: '鎺у埗灞炴�ц鍒欑紪鍙�',
align: 'center',
customHeaderCell: () => {
return {
style: {
- 'min-width': '140px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '140px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
sorter: true,
- dataIndex: 'controlRuleId'
+ dataIndex: 'ruleCode'
},
{
title: '鏈�楂樺簱瀛�',
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Dto/WmsControlRuleInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Dto/WmsControlRuleInput.cs
deleted file mode 100644
index cb04d39..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Dto/WmsControlRuleInput.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-锘縰sing Admin.NET.Core;
-using Admin.NET.Core.Service;
-using System.ComponentModel.DataAnnotations;
-
-namespace Admin.NET.Application
-{
-
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欐煡璇㈠弬鏁�
- /// </summary>
- public class WmsControlRuleSearch : PageInputBase
- {
- /// <summary>
- /// 瑙勫垯缂栧彿
- /// </summary>
- public virtual string RuleCode { get; set; }
-
- /// <summary>
- /// 瑙勫垯鍚嶇О
- /// </summary>
- public virtual string RuleName { get; set; }
-
- /// <summary>
- /// 瑙勫垯鎻忚堪
- /// </summary>
- public virtual string RuleDesc { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public virtual List<string> CreatedTime { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- public virtual List<string> UpdatedTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呭悕绉�
- /// </summary>
- public virtual string CreatedUserName { get; set; }
-
- /// <summary>
- /// 淇敼鑰呭悕绉�
- /// </summary>
- public virtual string UpdatedUserName { get; set; }
-
- }
-
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欎笉鍒嗛〉鏌ヨ鍙傛暟
- /// </summary>
- public class WmsControlRuleSearchNonPage : PageInputNonPageBase
- {
- /// <summary>
- /// 瑙勫垯缂栧彿
- /// </summary>
- public virtual string RuleCode { get; set; }
-
- /// <summary>
- /// 瑙勫垯鍚嶇О
- /// </summary>
- public virtual string RuleName { get; set; }
-
- /// <summary>
- /// 瑙勫垯鎻忚堪
- /// </summary>
- public virtual string RuleDesc { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public virtual List<DateTimeOffset>? CreatedTime { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呭悕绉�
- /// </summary>
- public virtual string CreatedUserName { get; set; }
-
- /// <summary>
- /// 淇敼鑰呭悕绉�
- /// </summary>
- public virtual string UpdatedUserName { get; set; }
-
- }
-
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欒緭鍏ュ弬鏁�
- /// </summary>
- public class WmsControlRuleInput
- {
- /// <summary>
- /// 瑙勫垯缂栧彿
- /// </summary>
- [Required(ErrorMessage = "瑙勫垯缂栧彿涓嶈兘涓虹┖")]
- public virtual string RuleCode { get; set; }
-
- /// <summary>
- /// 瑙勫垯鍚嶇О
- /// </summary>
- [Required(ErrorMessage = "瑙勫垯鍚嶇О涓嶈兘涓虹┖")]
- public virtual string RuleName { get; set; }
-
- /// <summary>
- /// 瑙勫垯鎻忚堪
- /// </summary>
- public virtual string RuleDesc { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [Required(ErrorMessage = "鏄惁绂佺敤涓嶈兘涓虹┖")]
- public virtual bool IsDisabled { get; set; }
-
- }
-
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欐柊澧炲弬鏁�
- /// </summary>
- public class AddWmsControlRuleInput : WmsControlRuleInput
- {
- }
-
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欏垹闄ゅ弬鏁�
- /// </summary>
- public class DeleteWmsControlRuleInput : BaseId
- {
- }
-
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欐洿鏂板弬鏁�
- /// </summary>
- public class UpdateWmsControlRuleInput : WmsControlRuleInput
- {
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
- public long? Id { get; set; }
-
- }
-
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欒幏鍙栧崟涓弬鏁�
- /// </summary>
- public class QueryeWmsControlRuleInput : BaseId
- {
-
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Dto/WmsControlRuleOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Dto/WmsControlRuleOutput.cs
deleted file mode 100644
index 62887e5..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Dto/WmsControlRuleOutput.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-锘縰sing Admin.NET.Core.Util.LowCode.Dto;
-using System;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欒緭鍑哄弬鏁�
- /// </summary>
- public class WmsControlRuleOutput
- {
- /// <summary>
- /// 瑙勫垯缂栧彿
- /// </summary>
- public string RuleCode { get; set; }
-
- /// <summary>
- /// 瑙勫垯鍚嶇О
- /// </summary>
- public string RuleName { get; set; }
-
- /// <summary>
- /// 瑙勫垯鎻忚堪
- /// </summary>
- public string RuleDesc { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool IsDisabled { get; set; }
-
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- public long? Id { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTimeOffset? CreatedTime { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- public DateTimeOffset? UpdatedTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呭悕绉�
- /// </summary>
- public string CreatedUserName { get; set; }
-
- /// <summary>
- /// 淇敼鑰呭悕绉�
- /// </summary>
- public string UpdatedUserName { get; set; }
-
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/IWmsControlRuleService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/IWmsControlRuleService.cs
deleted file mode 100644
index d52e0a8..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/IWmsControlRuleService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing Admin.NET.Core;
-using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-
-namespace Admin.NET.Application
-{
- public interface IWmsControlRuleService
- {
- Task<WmsControlRuleOutput> Get([FromQuery] QueryeWmsControlRuleInput input);
- Task<List<WmsControlRuleOutput>> List([FromQuery] WmsControlRuleInput input);
- Task<PageResult<WmsControlRuleOutput>> Page([FromQuery] WmsControlRuleSearch input);
- Task<List<WmsControlRuleOutput>> ListNonPageAsync([FromQuery] WmsControlRuleSearchNonPage input);
-
- Task Add(AddWmsControlRuleInput input);
- Task Update(UpdateWmsControlRuleInput input);
- Task Delete(DeleteWmsControlRuleInput input);
- Task<int> ImportExcelAsync(IFormFile file);
- IActionResult DownloadExcelTemplate(string version);
- }
-}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Map/WmsControlRuleMapper.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Map/WmsControlRuleMapper.cs
deleted file mode 100644
index 95b5891..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/Map/WmsControlRuleMapper.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing Mapster;
-using Admin.NET.Core;
-
-namespace Admin.NET.Application
-{
- public class WmsControlRuleMapper : IRegister
- {
- public void Register(TypeAdapterConfig config)
- {
- config.ForType<AddWmsControlRuleInput, WmsControlRule>()
- ;
- config.ForType<UpdateWmsControlRuleInput, WmsControlRule>()
- ;
- config.ForType<WmsControlRule, WmsControlRuleOutput>()
- ;
- }
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/WmsControlRuleService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/WmsControlRuleService.cs
deleted file mode 100644
index ba26582..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRule/WmsControlRuleService.cs
+++ /dev/null
@@ -1,418 +0,0 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DatabaseAccessor.Extensions;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Admin.NET.Core;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using Microsoft.AspNetCore.Http;
-using System.Text;
-using System.Web;
-using System.ComponentModel;
-using System.Data;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鎺у埗灞炴�ц鍒欐湇鍔�
- /// </summary>
- [ApiDescriptionSettings("WmsBase", Name = "WmsControlRule", Order = 100)]
- [Route("api")]
- public class WmsControlRuleService : IWmsControlRuleService, IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsControlRule,MasterDbContextLocator> _wmsControlRuleRep;
- private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
- private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
- private readonly ISysExcelTemplateService _sysExcelTemplateService;
- private readonly static object _lock = new();
-
- public WmsControlRuleService(
- IRepository<WmsControlRule,MasterDbContextLocator> wmsControlRuleRep
- ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
- ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
- ,ISysExcelTemplateService sysExcelTemplateService
- )
- {
- _wmsControlRuleRep = wmsControlRuleRep;
- _sysDictTypeRep = sysDictTypeRep;
- _sysDictDataRep = sysDictDataRep;
- _sysExcelTemplateService = sysExcelTemplateService;
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ鎺у埗灞炴�ц鍒�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("WmsControlRule/page")]
- public async Task<PageResult<WmsControlRuleOutput>> Page([FromQuery] WmsControlRuleSearch input)
- {
- var wmsControlRules = await _wmsControlRuleRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(input.RuleCode), u => u.RuleCode == input.RuleCode)
- .Where(!string.IsNullOrEmpty(input.RuleName), u => u.RuleName == input.RuleName)
- .Where(!string.IsNullOrEmpty(input.RuleDesc), u => u.RuleDesc == input.RuleDesc)
- .Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
- .Where(input.CreatedTime!=null, u => u.CreatedTime>= Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
- .Where(input.UpdatedTime!=null, u => u.UpdatedTime>= Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
- .Where(!string.IsNullOrEmpty(input.CreatedUserName), u => u.CreatedUserName == input.CreatedUserName)
- .Where(!string.IsNullOrEmpty(input.UpdatedUserName), u => u.UpdatedUserName == input.UpdatedUserName)
- .OrderBy(PageInputOrder.OrderBuilder<WmsControlRuleSearch>(input))
- .ProjectToType<WmsControlRuleOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsControlRules;
- }
-
- /// <summary>
- /// 涓嶅垎椤垫煡璇㈡帶鍒跺睘鎬ц鍒欏垪琛�
- /// </summary>
- /// <param name="input">鎺у埗灞炴�ц鍒欐煡璇㈠弬鏁�</param>
- /// <returns>(鎺у埗灞炴�ц鍒�)瀹炰緥鍒楄〃</returns>
- [HttpGet("WmsControlRule/listNonPage")]
- public async Task<List<WmsControlRuleOutput>> ListNonPageAsync([FromQuery] WmsControlRuleSearchNonPage input)
- {
- var pRuleCode = input.RuleCode?.Trim() ?? "";
- var pRuleName = input.RuleName?.Trim() ?? "";
- var pRuleDesc = input.RuleDesc?.Trim() ?? "";
- var pIsDisabled = input.IsDisabled;
- var pCreatedTime = input.CreatedTime;
- var pUpdatedTime = input.UpdatedTime;
- var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
- var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
- var wmsControlRules = await _wmsControlRuleRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(pRuleCode), u => u.RuleCode == pRuleCode)
- .Where(!string.IsNullOrEmpty(pRuleName), u => u.RuleName == pRuleName)
- .Where(!string.IsNullOrEmpty(pRuleDesc), u => u.RuleDesc == pRuleDesc)
- .Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
- .Where(input.CreatedTime!=null, u => u.CreatedTime>= Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
- .Where(input.UpdatedTime!=null, u => u.UpdatedTime>= Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
- .Where(!string.IsNullOrEmpty(pCreatedUserName), u => u.CreatedUserName == pCreatedUserName)
- .Where(!string.IsNullOrEmpty(pUpdatedUserName), u => u.UpdatedUserName == pUpdatedUserName)
- .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
- .ProjectToType<WmsControlRuleOutput>()
- .ToListAsync();
- return wmsControlRules;
- }
-
- /// <summary>
- /// 鑾峰彇鎺у埗灞炴�ц鍒�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("WmsControlRule/detail")]
- public async Task<WmsControlRuleOutput> Get([FromQuery] QueryeWmsControlRuleInput input)
- {
- return (await _wmsControlRuleRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsControlRuleOutput>();
- }
-
- /// <summary>
- /// 鑾峰彇鎺у埗灞炴�ц鍒欏垪琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("WmsControlRule/list")]
- public async Task<List<WmsControlRuleOutput>> List([FromQuery] WmsControlRuleInput input)
- {
- return await _wmsControlRuleRep.DetachedEntities.ProjectToType<WmsControlRuleOutput>().ToListAsync();
- }
-
- #region 澧炪�佸垹銆佹敼
-
- /// <summary>
- /// 澧炲姞鎺у埗灞炴�ц鍒�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("WmsControlRule/add")]
- public async Task Add(AddWmsControlRuleInput input)
- {
- var wmsControlRule = input.Adapt<WmsControlRule>();
- //楠岃瘉
- await CheckExisit(wmsControlRule);
-
- wmsControlRule.CreatedUserId = wmsControlRule.UpdatedUserId = SysHelper.GetUserId();
- wmsControlRule.CreatedUserName = wmsControlRule.UpdatedUserName = SysHelper.GetUserName();
- wmsControlRule.CreatedTime = wmsControlRule.UpdatedTime = SysHelper.GetNowTime();
- await _wmsControlRuleRep.InsertAsync(wmsControlRule);
- }
-
- /// <summary>
- /// 鍒犻櫎鎺у埗灞炴�ц鍒�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("WmsControlRule/delete")]
- public async Task Delete(DeleteWmsControlRuleInput input)
- {
- var wmsControlRule = await _wmsControlRuleRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- await _wmsControlRuleRep.DeleteAsync(wmsControlRule);
-
- }
-
- /// <summary>
- /// 鏇存柊鎺у埗灞炴�ц鍒�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("WmsControlRule/edit")]
- public async Task Update(UpdateWmsControlRuleInput input)
- {
- var isExist = await _wmsControlRuleRep.AnyAsync(u => u.Id == input.Id, false);
- if (!isExist) throw Oops.Oh(ErrorCode.D1002);
-
- var wmsControlRule = input.Adapt<WmsControlRule>();
- //楠岃瘉
- await CheckExisit(wmsControlRule,true);
-
- wmsControlRule.UpdatedUserId = SysHelper.GetUserId();
- wmsControlRule.UpdatedUserName = SysHelper.GetUserName();
- wmsControlRule.UpdatedTime = SysHelper.GetNowTime();
- await _wmsControlRuleRep.UpdateAsync(wmsControlRule,ignoreNullValues:true);
- }
-
- #endregion
-
- #region 瀵煎叆
-
- /// <summary>
- /// Excel妯℃澘瀵煎叆鎺у埗灞炴�ц鍒欏姛鑳�
- /// </summary>
- /// <param name="file">Excel妯℃澘鏂囦欢</param>
- /// <returns>瀵煎叆鐨勮褰曟暟</returns>
- [HttpPost("WmsControlRule/importExcel")]
- public async Task<int> ImportExcelAsync(IFormFile file)
- {
- int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
- int _DataStartLine = 3;//绗�3琛屽紑濮嬫槸鏁版嵁
-
- DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
- var addList =await CommonImport(importDataTable, _DataStartLine);
-
- lock (_lock)
- {
- _wmsControlRuleRep.InsertAsync(addList);
-
- }
- await Task.CompletedTask;
- return addList.Count;
- }
-
- /// <summary>
- /// DataTable杞崲瀹炰綋瀵硅薄鍒楄〃
- /// </summary>
- /// <param name="dataTable"></param>
- /// <param name="dataStartLine">妯＄増鍒楀悕寮�濮嬭</param>
- /// <returns></returns>
- private async Task<List<WmsControlRule>> CommonImport(DataTable dataTable, int dataStartLine)
- {
-
- var details = new List<WmsControlRule>();
- int index = dataStartLine;//妯＄増鍒楀悕寮�濮嬭
- foreach (System.Data.DataRow row in dataTable.Rows)
- {
- index++;
-
- //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- var addItem = new WmsControlRule()
- {
- CreatedTime = SysHelper.GetNowTime(),
- CreatedUserId = SysHelper.GetUserId(),
- CreatedUserName = SysHelper.GetUserName(),
- UpdatedTime = SysHelper.GetNowTime(),
- UpdatedUserId = SysHelper.GetUserId(),
- UpdatedUserName = SysHelper.GetUserName()
- };
- #region 瀹氫箟鍙橀噺
- var _RuleCode = "";//瑙勫垯缂栧彿
- var _RuleName = "";//瑙勫垯鍚嶇О
- var _RuleDesc = "";//瑙勫垯鎻忚堪
- var _IsDisabled = "";//鏄惁绂佺敤
- var _Id = "";//Id涓婚敭
- #endregion
-
-
- #region 鍙栧��
- _RuleCode = row["瑙勫垯缂栧彿"]?.ToString() ;
- _RuleName = row["瑙勫垯鍚嶇О"]?.ToString() ;
- _RuleDesc = row["瑙勫垯鎻忚堪"]?.ToString() ;
- _IsDisabled = row["鏄惁绂佺敤"]?.ToString() ;
- _Id = row["Id涓婚敭"]?.ToString() ;
- #endregion
-
-
- #region 楠岃瘉
-
- if (string.IsNullOrEmpty(_RuleCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾瑙勫垯缂栧彿]{_RuleCode}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_RuleCode))
- {
- addItem.RuleCode = (string)_RuleCode;
- }
-
- if (string.IsNullOrEmpty(_RuleName))
- {
- throw Oops.Oh($"绗瑊index}琛孾瑙勫垯鍚嶇О]{_RuleName}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_RuleName))
- {
- addItem.RuleName = (string)_RuleName;
- }
- if(!string.IsNullOrEmpty(_RuleDesc))
- {
- addItem.RuleDesc = (string)_RuleDesc;
- }
-
- if (string.IsNullOrEmpty(_IsDisabled))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_IsDisabled))
- {
- if(!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsDisabled = _IsDisabled.Equals("鏄�") ? true : false;
- addItem.IsDisabled = outIsDisabled;
- }
- }
-
- if(!string.IsNullOrEmpty(_Id))
- {
- if (!long.TryParse(_Id, out long outId)&&!string.IsNullOrEmpty(_Id))
- {
- throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉姝ｇ‘锛�");
- }
- if (outId <= 0&&!string.IsNullOrEmpty(_Id))
- {
- throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.Id = outId;
- }
-
- }
- #endregion
-
-
-
- details.Add(addItem);
- }
- //楠岄噸
- await CheckExisitForImport(details);
-
- return details;
- }
-
- /// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇鎺у埗灞炴�ц鍒欑殑Excel瀵煎叆妯℃澘
- /// </summary>
- /// <param name="version">妯℃澘鐗堟湰</param>
- /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [HttpGet("WmsControlRule/downloadExcelTemplate")]
- public IActionResult DownloadExcelTemplate([FromQuery] string version)
- {
- string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\WmsControlRule{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
- var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鎺у埗灞炴�ц鍒�).xlsx", Encoding.GetEncoding("UTF-8"));
- return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
- }
-
- #endregion
-
- #region 绉佹湁鏂规硶
-
- /// <summary>
- /// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-鏁版嵁搴�
- /// </summary>
- /// <param name="input"></param>
- /// <param name="isEdit"></param>
- /// <returns></returns>
- private async Task CheckExisit( WmsControlRule input,bool isEdit=false)
- {
-
-
-
- bool isExist = false;
- if (!isEdit)//鏂板
- {
- //鏁版嵁鏄惁瀛樺湪閲嶅
- isExist = await _wmsControlRuleRep.AnyAsync(u =>
- u.RuleCode.Equals(input.RuleCode)
- ,false);
- }
- else//缂栬緫
- {
-
-
-
- //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
- isExist = await _wmsControlRuleRep.AnyAsync(u =>
- u.Id != input.Id
- &&u.RuleCode.Equals(input.RuleCode)
- ,false);
- }
-
-
-
- if (isExist) throw Oops.Oh(ErrorCode.E0001);
- }
-
- /// <summary>
- /// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
- /// </summary>
- /// <param name="inputs"></param>
- /// <returns></returns>
- private async Task CheckExisitForImport(List<WmsControlRule> inputs)
- {
- //鏍规嵁鑱斿悎涓婚敭楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- if (inputs?.Count <= 0)
- {
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏁版嵁鏄惁閲嶅
- var existExcelItem = inputs.GroupBy(g => new {
- g.RuleCode
- })
- .Where(g => g.Count() > 1)
- .Select(s => new {
- s.Key.RuleCode
- }).FirstOrDefault();
- if (existExcelItem != null)
- {
- var wmsControlRule = existExcelItem.Adapt<WmsControlRule>();
- var item= existExcelItem.Adapt<WmsControlRule>();
- throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,瑙勫垯缂栧彿[{item.RuleCode}]宸插瓨鍦�");
- }
-
-
-
-
- //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- var existDBItem = await _wmsControlRuleRep.DetachedEntities.FirstOrDefaultAsync(w=>
- inputs.Select(s=>""
- +s.RuleCode
- )
- .Contains(""
- +w.RuleCode
- ));
- if (existDBItem != null)
- {
- var wmsControlRule = existExcelItem.Adapt<WmsControlRule>();
- var item= existExcelItem.Adapt<WmsControlRule>();
- throw Oops.Oh($"绯荤粺涓�,瑙勫垯缂栧彿[{item.RuleCode}]宸插瓨鍦�");
- }
- }
-
- #endregion
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs
index edc5546..e1f020b 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailInput.cs
@@ -11,9 +11,9 @@
public class WmsControlRuleDetailSearch : PageInputBase
{
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欑紪鍙�
/// </summary>
- public virtual long? ControlRuleId { get; set; }
+ public virtual string RuleCode { get; set; }
/// <summary>
/// 鏈�楂樺簱瀛�
@@ -83,9 +83,9 @@
public class WmsControlRuleDetailSearchNonPage : PageInputNonPageBase
{
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欑紪鍙�
/// </summary>
- public virtual long? ControlRuleId { get; set; }
+ public virtual string RuleCode { get; set; }
/// <summary>
/// 鏈�楂樺簱瀛�
@@ -155,58 +155,50 @@
public class WmsControlRuleDetailInput
{
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欑紪鍙�
/// </summary>
- [Required(ErrorMessage = "鎺у埗灞炴�ц鍒橧D涓嶈兘涓虹┖")]
- public virtual long ControlRuleId { get; set; }
+ [Required(ErrorMessage = "鎺у埗灞炴�ц鍒欑紪鍙蜂笉鑳戒负绌�")]
+ public virtual string RuleCode { get; set; }
/// <summary>
/// 鏈�楂樺簱瀛�
/// </summary>
- [Required(ErrorMessage = "鏈�楂樺簱瀛樹笉鑳戒负绌�")]
- public virtual decimal MaxImumqty { get; set; }
+ public virtual decimal? MaxImumqty { get; set; }
/// <summary>
/// 鏈�浣庡簱瀛�
/// </summary>
- [Required(ErrorMessage = "鏈�浣庡簱瀛樹笉鑳戒负绌�")]
- public virtual decimal MinImumqty { get; set; }
+ public virtual decimal? MinImumqty { get; set; }
/// <summary>
/// 瀹夊叏搴撳瓨
/// </summary>
- [Required(ErrorMessage = "瀹夊叏搴撳瓨涓嶈兘涓虹┖")]
- public virtual decimal SafeImumqty { get; set; }
+ public virtual decimal? SafeImumqty { get; set; }
/// <summary>
/// 鏈�灏忓簱榫�
/// </summary>
- [Required(ErrorMessage = "鏈�灏忓簱榫勪笉鑳戒负绌�")]
- public virtual decimal MinStorageAge { get; set; }
+ public virtual decimal? MinStorageAge { get; set; }
/// <summary>
/// 鏈�澶у簱榫�
/// </summary>
- [Required(ErrorMessage = "鏈�澶у簱榫勪笉鑳戒负绌�")]
- public virtual decimal MaxStorageAge { get; set; }
+ public virtual decimal? MaxStorageAge { get; set; }
/// <summary>
/// 鏄惁鍏嶆
/// </summary>
- [Required(ErrorMessage = "鏄惁鍏嶆涓嶈兘涓虹┖")]
- public virtual bool IsNotChek { get; set; }
+ public virtual bool? IsNotChek { get; set; }
/// <summary>
/// 淇濊川鏈熷ぉ鏁�
/// </summary>
- [Required(ErrorMessage = "淇濊川鏈熷ぉ鏁颁笉鑳戒负绌�")]
- public virtual decimal ShelfLifeDays { get; set; }
+ public virtual decimal? ShelfLifeDays { get; set; }
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
- [Required(ErrorMessage = "鏄惁绂佺敤涓嶈兘涓虹┖")]
- public virtual bool IsDisabled { get; set; }
+ public virtual bool? IsDisabled { get; set; }
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs
index 667c7c1..d47a984 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/Dto/WmsControlRuleDetailOutput.cs
@@ -9,49 +9,49 @@
public class WmsControlRuleDetailOutput
{
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欑紪鍙�
/// </summary>
- public long ControlRuleId { get; set; }
+ public string RuleCode { get; set; }
/// <summary>
/// 鏈�楂樺簱瀛�
/// </summary>
- public decimal MaxImumqty { get; set; }
+ public decimal? MaxImumqty { get; set; }
/// <summary>
/// 鏈�浣庡簱瀛�
/// </summary>
- public decimal MinImumqty { get; set; }
+ public decimal? MinImumqty { get; set; }
/// <summary>
/// 瀹夊叏搴撳瓨
/// </summary>
- public decimal SafeImumqty { get; set; }
+ public decimal? SafeImumqty { get; set; }
/// <summary>
/// 鏈�灏忓簱榫�
/// </summary>
- public decimal MinStorageAge { get; set; }
+ public decimal? MinStorageAge { get; set; }
/// <summary>
/// 鏈�澶у簱榫�
/// </summary>
- public decimal MaxStorageAge { get; set; }
+ public decimal? MaxStorageAge { get; set; }
/// <summary>
/// 鏄惁鍏嶆
/// </summary>
- public bool IsNotChek { get; set; }
+ public bool? IsNotChek { get; set; }
/// <summary>
/// 淇濊川鏈熷ぉ鏁�
/// </summary>
- public decimal ShelfLifeDays { get; set; }
+ public decimal? ShelfLifeDays { get; set; }
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
- public bool IsDisabled { get; set; }
+ public bool? IsDisabled { get; set; }
/// <summary>
/// Id涓婚敭
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs
index 43c03b9..7671ce4 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs
@@ -50,7 +50,7 @@
public async Task<PageResult<WmsControlRuleDetailOutput>> Page([FromQuery] WmsControlRuleDetailSearch input)
{
var wmsControlRuleDetails = await _wmsControlRuleDetailRep.DetachedEntities
- .Where(input.ControlRuleId != null, u => u.ControlRuleId == input.ControlRuleId)
+ .Where(!string.IsNullOrEmpty(input.RuleCode), u => u.RuleCode == input.RuleCode)
.Where(input.MaxImumqty != null, u => u.MaxImumqty == input.MaxImumqty)
.Where(input.MinImumqty != null, u => u.MinImumqty == input.MinImumqty)
.Where(input.SafeImumqty != null, u => u.SafeImumqty == input.SafeImumqty)
@@ -77,7 +77,7 @@
[HttpGet("WmsControlRuleDetail/listNonPage")]
public async Task<List<WmsControlRuleDetailOutput>> ListNonPageAsync([FromQuery] WmsControlRuleDetailSearchNonPage input)
{
- var pControlRuleId = input.ControlRuleId;
+ var pRuleCode = input.RuleCode?.Trim() ?? "";
var pMaxImumqty = input.MaxImumqty;
var pMinImumqty = input.MinImumqty;
var pSafeImumqty = input.SafeImumqty;
@@ -91,7 +91,7 @@
var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
var wmsControlRuleDetails = await _wmsControlRuleDetailRep.DetachedEntities
- .Where(pControlRuleId != null, u => u.ControlRuleId == pControlRuleId)
+ .Where(!string.IsNullOrEmpty(pRuleCode), u => u.RuleCode == pRuleCode)
.Where(pMaxImumqty != null, u => u.MaxImumqty == pMaxImumqty)
.Where(pMinImumqty != null, u => u.MinImumqty == pMinImumqty)
.Where(pSafeImumqty != null, u => u.SafeImumqty == pSafeImumqty)
@@ -240,7 +240,7 @@
UpdatedUserName = SysHelper.GetUserName()
};
#region 瀹氫箟鍙橀噺
- var _ControlRuleId = "";//鎺у埗灞炴�ц鍒橧D
+ var _RuleCode = "";//鎺у埗灞炴�ц鍒欑紪鍙�
var _MaxImumqty = "";//鏈�楂樺簱瀛�
var _MinImumqty = "";//鏈�浣庡簱瀛�
var _SafeImumqty = "";//瀹夊叏搴撳瓨
@@ -254,7 +254,7 @@
#region 鍙栧��
- _ControlRuleId = row["鎺у埗灞炴�ц鍒橧D"]?.ToString() ;
+ _RuleCode = row["鎺у埗灞炴�ц鍒欑紪鍙�"]?.ToString() ;
_MaxImumqty = row["鏈�楂樺簱瀛�"]?.ToString() ;
_MinImumqty = row["鏈�浣庡簱瀛�"]?.ToString() ;
_SafeImumqty = row["瀹夊叏搴撳瓨"]?.ToString() ;
@@ -269,33 +269,15 @@
#region 楠岃瘉
- if (string.IsNullOrEmpty(_ControlRuleId))
+ if (string.IsNullOrEmpty(_RuleCode))
{
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橧D]{_ControlRuleId}涓嶈兘涓虹┖锛�");
+ throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒欑紪鍙穄{_RuleCode}涓嶈兘涓虹┖锛�");
}
- if(!string.IsNullOrEmpty(_ControlRuleId))
+ if(!string.IsNullOrEmpty(_RuleCode))
{
- if (!long.TryParse(_ControlRuleId, out long outControlRuleId)&&!string.IsNullOrEmpty(_ControlRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橧D]{_ControlRuleId}鍊间笉姝ｇ‘锛�");
- }
- if (outControlRuleId <= 0&&!string.IsNullOrEmpty(_ControlRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橧D]{_ControlRuleId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.ControlRuleId = outControlRuleId;
- }
-
- }
-
- if (string.IsNullOrEmpty(_MaxImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�楂樺簱瀛榏{_MaxImumqty}涓嶈兘涓虹┖锛�");
- }
-
+ addItem.RuleCode = (string)_RuleCode;
+ }
if(!string.IsNullOrEmpty(_MaxImumqty))
{
if (!decimal.TryParse(_MaxImumqty, out decimal outMaxImumqty)&&!string.IsNullOrEmpty(_MaxImumqty))
@@ -312,12 +294,6 @@
}
}
-
- if (string.IsNullOrEmpty(_MinImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�浣庡簱瀛榏{_MinImumqty}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_MinImumqty))
{
if (!decimal.TryParse(_MinImumqty, out decimal outMinImumqty)&&!string.IsNullOrEmpty(_MinImumqty))
@@ -334,12 +310,6 @@
}
}
-
- if (string.IsNullOrEmpty(_SafeImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾瀹夊叏搴撳瓨]{_SafeImumqty}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_SafeImumqty))
{
if (!decimal.TryParse(_SafeImumqty, out decimal outSafeImumqty)&&!string.IsNullOrEmpty(_SafeImumqty))
@@ -356,12 +326,6 @@
}
}
-
- if (string.IsNullOrEmpty(_MinStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�灏忓簱榫刔{_MinStorageAge}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_MinStorageAge))
{
if (!decimal.TryParse(_MinStorageAge, out decimal outMinStorageAge)&&!string.IsNullOrEmpty(_MinStorageAge))
@@ -378,12 +342,6 @@
}
}
-
- if (string.IsNullOrEmpty(_MaxStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�澶у簱榫刔{_MaxStorageAge}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_MaxStorageAge))
{
if (!decimal.TryParse(_MaxStorageAge, out decimal outMaxStorageAge)&&!string.IsNullOrEmpty(_MaxStorageAge))
@@ -400,12 +358,6 @@
}
}
-
- if (string.IsNullOrEmpty(_IsNotChek))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鍏嶆]{_IsNotChek}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_IsNotChek))
{
if(!_IsNotChek.Equals("鏄�") && !_IsNotChek.Equals("鍚�"))
@@ -418,12 +370,6 @@
addItem.IsNotChek = outIsNotChek;
}
}
-
-
- if (string.IsNullOrEmpty(_ShelfLifeDays))
- {
- throw Oops.Oh($"绗瑊index}琛孾淇濊川鏈熷ぉ鏁癩{_ShelfLifeDays}涓嶈兘涓虹┖锛�");
- }
if(!string.IsNullOrEmpty(_ShelfLifeDays))
{
@@ -441,12 +387,6 @@
}
}
-
- if (string.IsNullOrEmpty(_IsDisabled))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_IsDisabled))
{
if(!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
@@ -521,7 +461,7 @@
{
//鏁版嵁鏄惁瀛樺湪閲嶅
isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
- u.ControlRuleId.Equals(input.ControlRuleId)
+ u.RuleCode.Equals(input.RuleCode)
,false);
}
else//缂栬緫
@@ -532,7 +472,7 @@
//褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
u.Id != input.Id
- &&u.ControlRuleId.Equals(input.ControlRuleId)
+ &&u.RuleCode.Equals(input.RuleCode)
,false);
}
@@ -555,17 +495,17 @@
}
//鏁版嵁鏄惁閲嶅
var existExcelItem = inputs.GroupBy(g => new {
- g.ControlRuleId
+ g.RuleCode
})
.Where(g => g.Count() > 1)
.Select(s => new {
- s.Key.ControlRuleId
+ s.Key.RuleCode
}).FirstOrDefault();
if (existExcelItem != null)
{
var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
var item= existExcelItem.Adapt<WmsControlRuleDetail>();
- throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鎺у埗灞炴�ц鍒橧D[{item.ControlRuleId}]宸插瓨鍦�");
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鎺у埗灞炴�ц鍒欑紪鍙穂{item.RuleCode}]宸插瓨鍦�");
}
@@ -574,16 +514,16 @@
//鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
var existDBItem = await _wmsControlRuleDetailRep.DetachedEntities.FirstOrDefaultAsync(w=>
inputs.Select(s=>""
- +s.ControlRuleId
+ +s.RuleCode
)
.Contains(""
- +w.ControlRuleId
+ +w.RuleCode
));
if (existDBItem != null)
{
var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
var item= existExcelItem.Adapt<WmsControlRuleDetail>();
- throw Oops.Oh($"绯荤粺涓�,鎺у埗灞炴�ц鍒橧D[{item.ControlRuleId}]宸插瓨鍦�");
+ throw Oops.Oh($"绯荤粺涓�,鎺у埗灞炴�ц鍒欑紪鍙穂{item.RuleCode}]宸插瓨鍦�");
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRule.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRule.cs
deleted file mode 100644
index c2a4833..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRule.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-锘縰sing Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-/*
- * @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍5:01:21
- * @desc : 鎺у埗灞炴�ц鍒�
- */
-namespace Admin.NET.Core
-{
- /// <summary>
- /// 鎺у埗灞炴�ц鍒�
- /// </summary>
- [Table("wms_control_rule")]
- [Comment("鎺у埗灞炴�ц鍒�")]
- public class WmsControlRule : DEntityBase
- {
-
-
- /// <summary>
- /// 瑙勫垯缂栧彿
- /// </summary>
- [Comment("瑙勫垯缂栧彿")]
- [Required]
- [MaxLength(50)]
- public string RuleCode { get; set; }
-
-
- /// <summary>
- /// 瑙勫垯鍚嶇О
- /// </summary>
- [Comment("瑙勫垯鍚嶇О")]
- [Required]
- [MaxLength(50)]
- public string RuleName { get; set; }
-
-
- /// <summary>
- /// 瑙勫垯鎻忚堪
- /// </summary>
- [Comment("瑙勫垯鎻忚堪")]
- [MaxLength(255)]
- public string RuleDesc { get; set; }
-
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [Comment("鏄惁绂佺敤")]
- [Required]
-
- public bool IsDisabled { get; set; }
-
-
-
-
-
-
-
-
-
- }
-}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs
index 3571838..79a2af2 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsControlRuleDetail.cs
@@ -4,7 +4,7 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍5:01:43
+ * @date : 2024/4/24涓嬪崍5:51:26
* @desc : 鎺у埗灞炴�ц鍒欐槑缁�
*/
namespace Admin.NET.Core
@@ -19,12 +19,12 @@
/// <summary>
- /// 鎺у埗灞炴�ц鍒橧D
+ /// 鎺у埗灞炴�ц鍒欑紪鍙�
/// </summary>
- [Comment("鎺у埗灞炴�ц鍒橧D")]
+ [Comment("鎺у埗灞炴�ц鍒欑紪鍙�")]
[Required]
-
- public long ControlRuleId { get; set; }
+ [MaxLength(50)]
+ public string RuleCode { get; set; }
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsControlRuleDetailImport.xlsx b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsControlRuleDetailImport.xlsx
index 77203b6..7dc82f5 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsControlRuleDetailImport.xlsx
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsControlRuleDetailImport.xlsx
Binary files differ
diff --git "a/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json" "b/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
index 2a4ee6c..c238269 100755
--- "a/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
+++ "b/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.1.3",
"createdTime": "2024-4-12 12:56:29",
- "updatedTime": "2024-4-24 16:53:19",
+ "updatedTime": "2024-4-24 17:51:09",
"dbConns": [],
"profile": {
"default": {
@@ -103,7 +103,7 @@
},
{
"defKey": "CreatedUserId",
- "defName": "鍒涘缓浜篒d",
+ "defName": "鍒涘缓鑰匢d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -121,7 +121,7 @@
},
{
"defKey": "UpdatedUserId",
- "defName": "淇敼浜篒d",
+ "defName": "淇敼鑰匢d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -21734,7 +21734,7 @@
},
{
"defKey": "ErpCode",
- "defName": "ERP搴撳瓨鍦�",
+ "defName": "ERP浠ｇ爜",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -21965,7 +21965,7 @@
},
{
"defKey": "CreatedUserId",
- "defName": "鍒涘缓浜篒d",
+ "defName": "鍒涘缓鑰匢d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -21993,7 +21993,7 @@
},
{
"defKey": "CreatedUserName",
- "defName": "鍒涘缓浜�",
+ "defName": "鍒涘缓鑰呭悕绉�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -22021,7 +22021,7 @@
},
{
"defKey": "UpdatedUserId",
- "defName": "淇敼浜篒d",
+ "defName": "淇敼鑰匢d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -22049,7 +22049,7 @@
},
{
"defKey": "UpdatedUserName",
- "defName": "淇敼浜�",
+ "defName": "淇敼鑰呭悕绉�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -32872,6 +32872,153 @@
"uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
},
{
+ "defKey": "IsSrmPlace",
+ "defName": "鏄惁鍫嗗灈鏈哄簱浣�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+ "id": "335D3433-78A5-4213-A410-95E1EFF532D6"
+ },
+ {
+ "defKey": "SrmPlaceNo",
+ "defName": "鍫嗗灈鏈哄簱浣嶅彿",
+ "comment": "",
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "BC41E431-8E6A-4253-83F4-E589578322AA",
+ "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD",
+ "extProps": {},
+ "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
+ },
+ {
+ "defKey": "IsRgvPlace",
+ "defName": "鏄惁RGV搴撲綅",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+ "id": "B18994CA-EB0C-4402-BB8E-749C080166F4"
+ },
+ {
+ "defKey": "RgvPlaceNo",
+ "defName": "RGV搴撲綅鍙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "id": "3146288B-6B5D-447C-9339-7DB5D90E56FD"
+ },
+ {
+ "defKey": "IsAgvPlace",
+ "defName": "鏄惁AGV搴撲綅",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+ "id": "3BCB2418-C037-45BE-90B7-23F37696721B"
+ },
+ {
+ "defKey": "AgvPlaceNo",
+ "defName": "AGV搴撲綅鍙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "id": "B07702F7-3F57-4A8E-B5EA-8A70FD6463E3"
+ },
+ {
+ "defKey": "IsTransPlace",
+ "defName": "鏄惁杈撻�佺嚎搴撲綅",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+ "id": "4FD2149A-C5A6-45C0-A72B-0476A5967CF7"
+ },
+ {
+ "defKey": "TransPlaceNo",
+ "defName": "杈撻�佺嚎搴撲綅鍙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "id": "755769AB-B19A-4E22-8BA3-2E44E4AC7D86"
+ },
+ {
"defKey": "IsActivateWCS",
"defName": "鏄惁婵�娲讳笌浠诲姟璋冨害",
"comment": "",
@@ -33418,7 +33565,7 @@
},
{
"defKey": "CreatedUserId",
- "defName": "鍒涘缓浜篒d",
+ "defName": "鍒涘缓鑰匢d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -33446,7 +33593,7 @@
},
{
"defKey": "CreatedUserName",
- "defName": "鍒涘缓浜�",
+ "defName": "鍒涘缓鑰呭悕绉�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -33474,7 +33621,7 @@
},
{
"defKey": "UpdatedUserId",
- "defName": "淇敼浜篒d",
+ "defName": "淇敼鑰匢d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -33502,7 +33649,7 @@
},
{
"defKey": "UpdatedUserName",
- "defName": "淇敼浜�",
+ "defName": "淇敼鑰呭悕绉�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -42241,7 +42388,7 @@
},
{
"defKey": "CreatedUserId",
- "defName": "鍒涘缓浜篒d",
+ "defName": "鍒涘缓鑰匢d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -42259,7 +42406,7 @@
},
{
"defKey": "UpdatedUserId",
- "defName": "淇敼浜篒d",
+ "defName": "淇敼鑰匢d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -45101,332 +45248,6 @@
}
},
{
- "id": "6CAD48AB-70AB-4DBE-8CF4-B6D8A8A78AEE",
- "env": {
- "base": {
- "nameSpace": "",
- "codeRoot": ""
- }
- },
- "defKey": "wms_control_rule",
- "defName": "鎺у埗灞炴�ц鍒�",
- "comment": "",
- "properties": {
- "partitioned by": "(date string)",
- "row format delimited": "",
- "fields terminated by ','": "",
- "collection items terminated by '-'": "",
- "map keys terminated by ':'": "",
- "store as textfile;": ""
- },
- "headers": [
- {
- "refKey": "hideInGraph",
- "hideInGraph": true,
- "freeze": true
- },
- {
- "refKey": "defKey",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "defName",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "primaryKey",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "notNull",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "autoIncrement",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "domain",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "type",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "len",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "scale",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "comment",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "refDict",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "defaultValue",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "isStandard",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "uiHint",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "extProps",
- "freeze": false,
- "hideInGraph": true
- }
- ],
- "fields": [
- {
- "defKey": "Id",
- "defName": "Id涓婚敭",
- "comment": "",
- "type": "",
- "len": 32,
- "scale": "",
- "primaryKey": true,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
- "refDict": "",
- "uiHint": "",
- "id": "124032A4-CAD4-4496-AC39-0C286CCE7CA1",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "RuleCode",
- "defName": "瑙勫垯缂栧彿",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "EA50CBBB-1767-4101-9DAC-7C8E302241E9",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "RuleName",
- "defName": "瑙勫垯鍚嶇О",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "A145DF29-EA07-4308-B410-4DE14F29DC8B",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "RuleDesc",
- "defName": "瑙勫垯鎻忚堪",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "ED8FCC44-999B-4952-9B40-A20A86C78EE5",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "IsDisabled",
- "defName": "鏄惁绂佺敤",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "7C32FC58-EB02-4D9F-9FA1-B1ADF198A791"
- },
- {
- "defKey": "CreatedUserName",
- "defName": "鍒涘缓浜�",
- "comment": "",
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "C3A81AF1-28C1-43A0-98CA-64CFFD9447B5",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "CreatedTime",
- "defName": "鍒涘缓鏃堕棿",
- "comment": "",
- "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "5ED71435-1C02-4592-8665-B6BE97499E73",
- "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811"
- },
- {
- "defKey": "UpdatedUserName",
- "defName": "淇敼浜�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "8D5F93E3-5C5F-4C4F-97FF-A66A4476B183",
- "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD"
- },
- {
- "defKey": "UpdatedTime",
- "defName": "淇敼鏃堕棿",
- "comment": "",
- "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "BC078593-0615-4B40-8DC8-5AC22816602D",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "CreatedUserId",
- "defName": "鍒涘缓鑰匢d",
- "comment": "",
- "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "C7685E04-D334-47B9-8EF6-CBD8E14A0D1A",
- "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
- },
- {
- "defKey": "UpdatedUserId",
- "defName": "淇敼鑰匢d",
- "comment": "",
- "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "4879E615-3C4A-4D1B-98DC-589567CD9B92",
- "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
- },
- {
- "defKey": "IsDeleted",
- "defName": "杞垹闄ゆ爣璁�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "AA1E5DF6-BD1F-4FC2-B4E3-AD2B96C00BD2",
- "baseType": "7ECAE23D-9FDB-4015-93BC-459D56A1ACA1"
- }
- ],
- "correlations": [],
- "indexes": [],
- "type": "P",
- "sysProps": {
- "nameTemplate": "{defKey}[{defName}]"
- },
- "notes": {}
- },
- {
"id": "5BA66776-30F0-4C71-92A3-0A6CB6985823",
"env": {
"base": {
@@ -45547,8 +45368,8 @@
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
},
{
- "defKey": "ControlRuleId",
- "defName": "鎺у埗灞炴�ц鍒橧D",
+ "defKey": "RuleCode",
+ "defName": "鎺у埗灞炴�ц鍒欑紪鍙�",
"comment": "",
"type": "",
"len": "",
@@ -45560,9 +45381,8 @@
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
- "id": "1C340822-4286-4525-916F-75E29EEEBAA0",
- "baseType": "87021CD5-DD8A-45AD-A867-A55DFE7993F5"
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "id": "5B84BCB4-4D25-43C3-9DF6-5D8F9B7DA5EB"
},
{
"defKey": "MaxImumqty",
@@ -48393,335 +48213,6 @@
],
"correlations": [],
"indexes": []
- },
- {
- "id": "A9C5E453-7EE0-447F-97B1-AF52177E7E2E",
- "env": {
- "base": {
- "nameSpace": "",
- "codeRoot": ""
- }
- },
- "defKey": "wms_equipment_place",
- "defName": "璁惧搴撲綅鍏宠仈淇℃伅",
- "comment": "",
- "properties": {
- "partitioned by": "(date string)",
- "row format delimited": "",
- "fields terminated by ','": "",
- "collection items terminated by '-'": "",
- "map keys terminated by ':'": "",
- "store as textfile;": ""
- },
- "nameTemplate": "{defKey}[{defName}]",
- "headers": [
- {
- "refKey": "hideInGraph",
- "hideInGraph": true
- },
- {
- "refKey": "defKey",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "defName",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "primaryKey",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "notNull",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "autoIncrement",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "domain",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "type",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "len",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "scale",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "comment",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "refDict",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "defaultValue",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "isStandard",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "uiHint",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "extProps",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr1",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr2",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr3",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr4",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr5",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr6",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr7",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr8",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr9",
- "freeze": false,
- "hideInGraph": true
- }
- ],
- "fields": [
- {
- "defKey": "Id",
- "defName": "Id涓婚敭",
- "comment": "",
- "type": "",
- "len": 32,
- "scale": "",
- "primaryKey": true,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
- "refDict": "",
- "uiHint": "",
- "id": "FD6CFC18-8FF1-4AC9-9591-8D83EE7EC6C7",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "EquipmentNo",
- "defName": "璁惧鍙�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "4B7A4560-9A82-4E0D-913C-4397ACC815A0"
- },
- {
- "defKey": "PlaceNo",
- "defName": "搴撲綅鍙�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "CC93D3DD-2AF1-4A4E-AC83-894197701520"
- },
- {
- "defKey": "CreatedUserName",
- "defName": "鍒涘缓浜�",
- "comment": "",
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "3F8A210A-A76C-4D93-8328-6CC79B7875EF",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "CreatedTime",
- "defName": "鍒涘缓鏃堕棿",
- "comment": "",
- "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "7796D18C-32E1-4472-9811-E2983F1E3ECB",
- "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811"
- },
- {
- "defKey": "UpdatedUserName",
- "defName": "淇敼浜�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "9FCCB6EB-3536-4ACF-92EA-EE685B1E4869",
- "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD"
- },
- {
- "defKey": "UpdatedTime",
- "defName": "淇敼鏃堕棿",
- "comment": "",
- "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "89D9334C-753F-494A-ACC8-38F38C58C907",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "CreatedUserId",
- "defName": "鍒涘缓浜篒d",
- "comment": "",
- "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "1924CB76-82B6-4697-BA4D-4A22505420F4",
- "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
- },
- {
- "defKey": "UpdatedUserId",
- "defName": "淇敼浜篒d",
- "comment": "",
- "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "1EC5776B-1E12-4656-941E-93D9202636F8",
- "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
- },
- {
- "defKey": "IsDeleted",
- "defName": "杞垹闄ゆ爣璁�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "D689DF98-A794-4AF4-8C2C-DB63E7306698",
- "baseType": "7ECAE23D-9FDB-4015-93BC-459D56A1ACA1"
- }
- ],
- "correlations": [],
- "indexes": []
}
],
"views": [
@@ -49268,12 +48759,10 @@
"7652F7C6-BE52-40C1-8B4E-030BCA44DF1C",
"B096C24D-5DD5-47CD-8AE2-18F09DA54D3B",
"613EBABC-DE71-4B38-9917-77A72D988753",
- "6CAD48AB-70AB-4DBE-8CF4-B6D8A8A78AEE",
"5BA66776-30F0-4C71-92A3-0A6CB6985823",
"30A9CA8E-93F6-4AFB-A388-CA0C01F74222",
"AD6794A1-3C5C-4DA3-86A9-222FBBFD109D",
- "041BF159-8998-4542-84A3-5E07D1616AF1",
- "A9C5E453-7EE0-447F-97B1-AF52177E7E2E"
+ "041BF159-8998-4542-84A3-5E07D1616AF1"
],
"refViews": [],
"refDiagrams": [],
--
Gitblit v1.9.3