From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 5c32944..26e5569 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -39,6 +39,7 @@
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+ wrapper.orderBy("type_no",true);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
@@ -60,6 +61,14 @@
@RequestMapping(value = "/staDesc/add/auth")
@ManagerAuth(memo = "绔欑偣璺緞娣诲姞")
public R add(StaDesc staDesc) {
+ int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+ .eq("type_no", staDesc.getTypeNo())
+ .eq("stn_no", staDesc.getStnNo())
+ .eq("crn_no", staDesc.getCrnNo())
+ .eq("crn_stn", staDesc.getCrnStn()));
+ if (sameRes > 0) {
+ return R.error("璺緞宸插瓨鍦�");
+ }
staDesc.setModiUser(getUserId());
staDesc.setModiTime(new Date());
staDesc.setAppeUser(getUserId());
--
Gitblit v1.9.1