From b466c42d036653cc6107a017d03c0adfa4ad257c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 16 八月 2024 16:49:05 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java | 36 ++++++
zy-asrs-admin/src/views/strategy/shelvesRule/index.vue | 119 ++++++++++++-----------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java | 14 ++
zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue | 79 +++++++++++++++
4 files changed, 186 insertions(+), 62 deletions(-)
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue b/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
index c9a44f1..83aaf80 100644
--- a/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
+++ b/zy-asrs-admin/src/views/strategy/shelvesRule/edit.vue
@@ -1,8 +1,12 @@
<script setup>
-import { ref, nextTick } from 'vue';
+import { ref, nextTick, reactive, watch } from 'vue';
import { get, post, postBlob, postForm } from '@/utils/request.js'
import { formatMessage } from '@/utils/localeUtils.js';
import { message } from 'ant-design-vue';
+import {
+ MinusCircleOutlined,
+ PlusOutlined,
+} from "@ant-design/icons-vue";
const formTable = ref(null);
const submitButton = ref(null);
@@ -10,6 +14,10 @@
const open = ref(false);
const initFormData = {}
let formData = ref(initFormData);
+
+const dynamicValidateForm = reactive({
+ detls: [],
+});
const emit = defineEmits(['tableReload'])
@@ -24,6 +32,12 @@
const onFinish = values => {
// console.log('Success:', values);
open.value = false;
+
+ let detls = []
+ dynamicValidateForm.detls.forEach((item) => {
+ detls.push(item.value)
+ })
+ formData.value.detls = detls;
post(isSave.value ? '/api/shelvesRule/save' : '/api/shelvesRule/update', formData.value).then((resp) => {
let result = resp.data;
if (result.code === 200) {
@@ -59,6 +73,36 @@
})
}
+const removeDomain = item => {
+ const index = dynamicValidateForm.detls.indexOf(item);
+ if (index !== -1) {
+ dynamicValidateForm.detls.splice(index, 1);
+ }
+};
+
+const addDomain = () => {
+ dynamicValidateForm.detls.push({
+ value: '',
+ });
+};
+
+watch(open, (newVal, oldVal) => {
+ if (open.value) {
+ if (!isSave.value) {
+ let ruleDetls = formData.value.ruleDetl$
+ let detls = []
+ ruleDetls.forEach((item) => {
+ detls.push({
+ value: item.detlType
+ })
+ })
+
+ dynamicValidateForm.detls = detls;
+ }
+ }else {
+ dynamicValidateForm.detls = []
+ }
+})
defineExpose({
open,
@@ -83,6 +127,10 @@
<a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }"
:wrapper-col="{ span: 16 }" style="display: flex;justify-content: space-between;flex-wrap: wrap;"
autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed">
+ <a-form-item :label="formatMessage('db.strategy_shelves_rule.name', '瑙勫垯鍚嶇О')" name="name"
+ style="width: 250px;">
+ <a-input v-model:value="formData.name" />
+ </a-form-item>
<a-form-item :label="formatMessage('db.strategy_shelves_rule.rule_type', '瑙勫垯绫诲瀷')" name="ruleType"
style="width: 250px;">
<a-select v-model:value="formData.ruleType" :options="[
@@ -106,7 +154,7 @@
]">
</a-select>
</a-form-item>
- <a-form-item :label="formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿')" name="createTime"
+ <!-- <a-form-item :label="formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿')" name="createTime"
style="width: 250px;">
<a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" />
@@ -129,7 +177,7 @@
style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
optionLabelProp="label">
</a-select>
- </a-form-item>
+ </a-form-item> -->
<a-form-item :label="formatMessage('db.strategy_shelves_rule.memo', '澶囨敞')" name="memo"
style="width: 250px;">
<a-input v-model:value="formData.memo" />
@@ -140,6 +188,31 @@
style="visibility: hidden;">Submit</a-button>
</a-form-item>
</a-form>
+
+ <a-form>
+ <a-form-item v-for="(domain, index) in dynamicValidateForm.detls" :key="domain.key"
+ :label="formatMessage('db.strategy_shelves_rule.memo', '瑙勫垯鏄庣粏')" :name="['domains', index, 'value']"
+ :labelCol="{ span: 4, offset: 1 }" style="width: 100%;">
+ <div style="width: 400px;">
+ <a-select v-model:value="domain.value" :options="[
+ { label: '搴撳瓨鎴栦换鍔′腑鍖归厤鐩搁偦搴撲綅', value: 1 },
+ { label: '鎺ㄨ崘鍖哄煙', value: 2 },
+ { label: '瀹屾暣宸烽亾', value: 3 },
+ ]" style="width: 300px;margin-right: 20px;">
+ </a-select>
+ <MinusCircleOutlined v-if="dynamicValidateForm.detls.length > 1"
+ @click="removeDomain(domain)" />
+ </div>
+ </a-form-item>
+ <a-form-item :labelCol="{ span: 4, offset: 1 }" style="width: 100%;">
+ <div style="width: 200px;">
+ <a-button type="dashed" style="width: 200px;" @click="addDomain">
+ <PlusOutlined />
+ {{ formatMessage('db.strategy_shelves_rule.addDetl', '娣诲姞鏄庣粏') }}
+ </a-button>
+ </div>
+ </a-form-item>
+ </a-form>
</a-modal>
</div>
</template>
diff --git a/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue b/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
index 2d71c77..e9da135 100644
--- a/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/shelvesRule/index.vue
@@ -26,62 +26,69 @@
} = useTableSearch();
const columns = [
- {
- title: formatMessage('db.strategy_shelves_rule.rule_type', '瑙勫垯绫诲瀷'),
- dataIndex: 'ruleType$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('ruleType$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.lane$', '宸烽亾'),
- dataIndex: 'lane$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('lane$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('status$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createTime$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createBy$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
- },
- {
- title: formatMessage('db.strategy_shelves_rule.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('memo'),
- },
+ {
+ title: formatMessage('db.strategy_shelves_rule.name', '瑙勫垯鍚嶇О'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('name'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.rule_type', '瑙勫垯绫诲瀷'),
+ dataIndex: 'ruleType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('ruleType$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.lane$', '宸烽亾'),
+ dataIndex: 'lane$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('lane$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.strategy_shelves_rule.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
index f53228e..dabce8c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.ShelvesRuleDetl;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -15,6 +18,7 @@
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -26,6 +30,8 @@
@Autowired
private ShelvesRuleService shelvesRuleService;
+ @Autowired
+ private ShelvesRuleDetlService shelvesRuleDetlService;
@PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
@PostMapping("/shelvesRule/page")
@@ -55,10 +61,21 @@
return R.error("缂哄皯鍙傛暟");
}
ShelvesRule shelvesRule = new ShelvesRule();
+ shelvesRule.setName(param.get("name").toString());
shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
if (!shelvesRuleService.save(shelvesRule)) {
- return R.error("娣诲姞澶辫触");
+ throw new CoolException("娣诲姞澶辫触");
+ }
+
+ List<Integer> detls = JSON.parseArray(JSON.toJSONString(param.get("detls")), Integer.class);
+ for (Integer detlType : detls) {
+ ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl();
+ shelvesRuleDetl.setRuleId(shelvesRule.getId());
+ shelvesRuleDetl.setDetlType(detlType);
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ throw new CoolException("娣诲姞瑙勫垯鏄庣粏澶辫触");
+ }
}
return R.ok("娣诲姞鎴愬姛");
}
@@ -66,6 +83,7 @@
@PreAuthorize("hasAuthority('asrs:shelvesRule:update')")
@OperationLog("淇敼涓婃灦瑙勫垯")
@PostMapping("/shelvesRule/update")
+ @Transactional
public R update(@RequestBody HashMap<String, Object> param) {
if(!param.containsKey("ruleType") || !param.containsKey("laneList") || !param.containsKey("id")) {
return R.error("缂哄皯鍙傛暟");
@@ -76,11 +94,25 @@
return R.error("涓婃灦瑙勫垯涓嶅瓨鍦�");
}
+ shelvesRule.setName(param.get("name").toString());
shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
+ shelvesRule.setStatus(Integer.parseInt(param.get("status").toString()));
if (!shelvesRuleService.updateById(shelvesRule)) {
- return R.error("淇敼澶辫触");
+ throw new CoolException("淇敼澶辫触");
}
+
+ shelvesRuleDetlService.remove(new LambdaQueryWrapper<ShelvesRuleDetl>().eq(ShelvesRuleDetl::getRuleId, shelvesRule.getId()));
+ List<Integer> detls = JSON.parseArray(JSON.toJSONString(param.get("detls")), Integer.class);
+ for (Integer detlType : detls) {
+ ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl();
+ shelvesRuleDetl.setRuleId(shelvesRule.getId());
+ shelvesRuleDetl.setDetlType(detlType);
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ throw new CoolException("娣诲姞瑙勫垯鏄庣粏澶辫触");
+ }
+ }
+
return R.ok("淇敼鎴愬姛");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
index 952206e..6916686 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ShelvesRule.java
@@ -5,7 +5,9 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wms.asrs.service.LanewayRuleService;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
@@ -42,6 +44,12 @@
private Long id;
/**
+ * 瑙勫垯鍚嶇О
+ */
+ @ApiModelProperty(value= "瑙勫垯鍚嶇О")
+ private String name;
+
+ /**
* 瑙勫垯绫诲瀷 0: 浼樺厛骞冲眰 1: 浼樺厛绔嬩綋
*/
@ApiModelProperty(value= "瑙勫垯绫诲瀷 0: 浼樺厛骞冲眰 1: 浼樺厛绔嬩綋 ")
@@ -69,7 +77,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -156,6 +163,11 @@
return list;
}
+ public List<ShelvesRuleDetl> getRuleDetl$() {
+ ShelvesRuleDetlService service = SpringUtils.getBean(ShelvesRuleDetlService.class);
+ return service.list(new LambdaQueryWrapper<ShelvesRuleDetl>().eq(ShelvesRuleDetl::getRuleId, id));
+ }
+
public String getRuleType$(){
if (null == this.ruleType){ return null; }
switch (this.ruleType){
--
Gitblit v1.9.1