From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 （当前牌号 批号 包号可以筛选出唯一物料） 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善
---
src/main/java/com/zy/asrs/controller/LocInPrintMatController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java b/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
index 317fb38..6ff8bce 100644
--- a/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
+++ b/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
@@ -44,6 +44,8 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("status",true);
+ wrapper.orderBy("create_time",false);
return R.ok(locInPrintMatService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -63,6 +65,12 @@
@RequestMapping(value = "/locInPrintMat/add/auth")
@ManagerAuth
public R add(LocInPrintMat locInPrintMat) {
+ Date now = new Date();
+ locInPrintMat.setUuid(String.valueOf(now.getTime()));
+ locInPrintMat.setUpdateTime(now);
+ locInPrintMat.setCreateBy(getUserId());
+ locInPrintMat.setUpdateTime(now);
+ locInPrintMat.setUpdateBy(getUserId());
locInPrintMatService.insert(locInPrintMat);
return R.ok();
}
--
Gitblit v1.9.1