From c9647257d0b789f94c14977dfa767c47d61cb566 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 12 十二月 2024 13:16:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 340 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 306 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
index d6c3745..9610b67 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
@@ -8,7 +8,6 @@
import com.zy.asrs.service.OrderPakinService;
import com.zy.asrs.service.OrderPakoutService;
import lombok.Setter;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -21,9 +20,8 @@
public enum OrderInAndOutType {
PAKIN{
@Transactional
- public void implement(Class<T> tClass, Object param) {
+ public void implement() {}
- }
@Transactional
public void query(String orderNo) {
OrderPakin orderPakin = orderPakinService.selectByNo(orderNo);
@@ -32,27 +30,30 @@
}
}
@Transactional
- public Order selectOrder(String orderNo) {
+ public Order selectByNo(String orderNo) {
OrderPakin orderPakin = orderPakinService.selectByNo(orderNo);
if (Cools.isEmpty(orderPakin)) {
return null;
}
- Order order = new Order();
- order.sync(orderPakin);
- return order;
+ return transformationOrder(orderPakin);
}
@Transactional
- public List<OrderDetl> selectOrderDetl(Long orderId) {
- List<OrderDetl> orderDetlList = new ArrayList<>();
+ public List<OrderDetl> selectByOrderId(Long orderId) {
List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId);
- if (!orderDetlPakinList.isEmpty()) {
- for (OrderDetlPakin orderDetlPakin : orderDetlPakinList){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetlPakin);
- orderDetlList.add(orderDetl);
- }
- }
- return orderDetlList;
+ return transformationOrderDetlList(orderDetlPakinList);
+ }
+ @Transactional
+ public List<OrderDetl> selectWorkingDetls(Long orderId) {
+ List<OrderDetlPakin> orderDetlPakinList = orderPakinService.selectWorkingDetls(orderId);
+ return transformationOrderDetlList(orderDetlPakinList);
+ }
+ @Transactional
+ public void checkComplete(String orderNo) {
+ orderPakinService.checkComplete(orderNo);
+ }
+ @Transactional
+ public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ return orderPakinService.saveHandlerOrder(pakin,wrkMast,wrkDetls);
}
@Transactional
public void insertOrder(Order order) {
@@ -90,12 +91,127 @@
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
+ @Transactional
+ public void remove(Long orderId) {
+ try{
+ orderPakinService.remove(orderId);
+ } catch (Exception e){
+ throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
+ }
+ }
+ @Transactional
+ public List<Order> selectComplete() {
+ List<OrderPakin> orderPakinList = orderPakinService.selectComplete();
+ return transformationOrderList(orderPakinList);
+ }
+
+ @Transactional
+ public OrderDetl selectItem(Long orderId, String matnr, String batch) {
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch);
+ return transformationOrderDetl(orderDetlPakin);
+ }
+
+ @Transactional
+ public OrderDetl selectItem(String orderNo, String matnr, String batch) {
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch);
+ return transformationOrderDetl(orderDetlPakin);
+ }
+
+ @Transactional
+ public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+ List<OrderDetlPakin> orderDetlPakins = transformationDetlList(orderDetls);
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch);
+ return transformationOrderDetl(orderDetlPakin);
+ }
+ @Transactional
+ public boolean increase(Long orderId, String matnr, String batch, Double qty) {
+ return orderDetlPakinService.increase(orderId, matnr, batch, qty);
+ }
+ @Transactional
+ public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
+ return orderDetlPakinService.decrease(orderNo, matnr, batch, qty);
+ }
+ @Transactional
+ public boolean modifyStatus(Long orderId, Integer status) {
+ return orderDetlPakinService.modifyStatus(orderId, status);
+ }
+ @Transactional
+ public boolean addToLogTable(OrderDetl orderDetl) {
+ OrderDetlPakin orderDetlPakin = transformationDetl(orderDetl);
+ return orderDetlPakinService.addToLogTable(orderDetlPakin);
+ }
+ @Transactional
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+ return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch, qty);
+ }
+ @Transactional
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
+ return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch, workQty);
+ }
+
+
+ public Order transformationOrder(OrderPakin orderPakin){
+ Order order = new Order();
+ order.sync(orderPakin);
+ return order;
+ }
+ public List<Order> transformationOrderList(List<OrderPakin> orderPakinList){
+ List<Order> orderList = new ArrayList<>();
+ for (OrderPakin orderPakin : orderPakinList){
+ Order order = new Order();
+ order.sync(orderPakin);
+ orderList.add(order);
+ }
+ return orderList;
+ }
+ public OrderDetl transformationOrderDetl(OrderDetlPakin orderDetlPakin){
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(orderDetlPakin);
+ return orderDetl;
+ }
+ public List<OrderDetl> transformationOrderDetlList(List<OrderDetlPakin> orderDetlPakinList){
+ List<OrderDetl> orderDetlList = new ArrayList<>();
+ for (OrderDetlPakin orderDetlPakin : orderDetlPakinList){
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(orderDetlPakin);
+ orderDetlList.add(orderDetl);
+ }
+ return orderDetlList;
+ }
+
+ public OrderPakin transformation(Order order){
+ OrderPakin orderPakin = new OrderPakin();
+ orderPakin.sync(order);
+ return orderPakin;
+ }
+ public List<OrderPakin> transformationList(List<Order> orderList){
+ List<OrderPakin> orderPakinList = new ArrayList<>();
+ for (Order order : orderList){
+ OrderPakin orderPakin = new OrderPakin();
+ orderPakin.sync(order);
+ orderPakinList.add(orderPakin);
+ }
+ return orderPakinList;
+ }
+ public OrderDetlPakin transformationDetl(OrderDetl orderDetl){
+ OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
+ orderDetlPakin.sync(orderDetl);
+ return orderDetlPakin;
+ }
+ public List<OrderDetlPakin> transformationDetlList(List<OrderDetl> orderDetlList){
+ List<OrderDetlPakin> orderDetlPakinList = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetlList){
+ OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
+ orderDetlPakin.sync(orderDetl);
+ orderDetlPakinList.add(orderDetlPakin);
+ }
+ return orderDetlPakinList;
+ }
},
PAKOUT{
@Transactional
- public void implement(Class<T> tClass, Object param) {
+ public void implement() {}
- }
@Transactional
public void query(String orderNo) {
OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
@@ -104,27 +220,30 @@
}
}
@Transactional
- public Order selectOrder(String orderNo) {
+ public Order selectByNo(String orderNo) {
OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
if (Cools.isEmpty(orderPakout)) {
return null;
}
- Order order = new Order();
- order.sync(orderPakout);
- return order;
+ return transformationOrder(orderPakout);
}
@Transactional
- public List<OrderDetl> selectOrderDetl(Long orderId) {
- List<OrderDetl> orderDetlList = new ArrayList<>();
+ public List<OrderDetl> selectByOrderId(Long orderId) {
List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId);
- if (!orderDetlPakoutList.isEmpty()) {
- for (OrderDetlPakout orderDetlPakout : orderDetlPakoutList){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetlPakout);
- orderDetlList.add(orderDetl);
- }
- }
- return orderDetlList;
+ return transformationOrderDetlList(orderDetlPakoutList);
+ }
+ @Transactional
+ public List<OrderDetl> selectWorkingDetls(Long orderId) {
+ List<OrderDetlPakout> orderDetlPakoutList = orderPakoutService.selectWorkingDetls(orderId);
+ return transformationOrderDetlList(orderDetlPakoutList);
+ }
+ @Transactional
+ public void checkComplete(String orderNo) {
+ orderPakoutService.checkComplete(orderNo);
+ }
+ @Transactional
+ public boolean saveHandlerOrder(Boolean Pakout, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ return orderPakoutService.saveHandlerOrder(Pakout,wrkMast,wrkDetls);
}
@Transactional
public void insertOrder(Order order) {
@@ -162,15 +281,168 @@
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
+ @Transactional
+ public void remove(Long orderId) {
+ try{
+ orderPakoutService.remove(orderId);
+ } catch (Exception e){
+ throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
+ }
+ }
+ @Transactional
+ public List<Order> selectComplete() {
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete();
+ return transformationOrderList(orderPakoutList);
+ }
+
+ @Transactional
+ public OrderDetl selectItem(Long orderId, String matnr, String batch) {
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch);
+ return transformationOrderDetl(orderDetlPakout);
+ }
+
+ @Transactional
+ public OrderDetl selectItem(String orderNo, String matnr, String batch) {
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch);
+ return transformationOrderDetl(orderDetlPakout);
+ }
+
+ @Transactional
+ public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+ List<OrderDetlPakout> orderDetlPakouts = transformationDetlList(orderDetls);
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch);
+ return transformationOrderDetl(orderDetlPakout);
+ }
+ @Transactional
+ public boolean increase(Long orderId, String matnr, String batch, Double qty) {
+ return orderDetlPakoutService.increase(orderId, matnr, batch, qty);
+ }
+ @Transactional
+ public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
+ return orderDetlPakoutService.decrease(orderNo, matnr, batch, qty);
+ }
+ @Transactional
+ public boolean modifyStatus(Long orderId, Integer status) {
+ return orderDetlPakoutService.modifyStatus(orderId, status);
+ }
+ @Transactional
+ public boolean addToLogTable(OrderDetl orderDetl) {
+ OrderDetlPakout orderDetlPakout = transformationDetl(orderDetl);
+ return orderDetlPakoutService.addToLogTable(orderDetlPakout);
+ }
+ @Transactional
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+ return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch, qty);
+ }
+ @Transactional
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
+ return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch, workQty);
+ }
+
+
+ public Order transformationOrder(OrderPakout orderPakout){
+ Order order = new Order();
+ order.sync(orderPakout);
+ return order;
+ }
+ public List<Order> transformationOrderList(List<OrderPakout> orderPakoutList){
+ List<Order> orderList = new ArrayList<>();
+ for (OrderPakout orderPakout : orderPakoutList){
+ Order order = new Order();
+ order.sync(orderPakout);
+ orderList.add(order);
+ }
+ return orderList;
+ }
+ public OrderDetl transformationOrderDetl(OrderDetlPakout orderDetlPakout){
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(orderDetlPakout);
+ return orderDetl;
+ }
+ public List<OrderDetl> transformationOrderDetlList(List<OrderDetlPakout> orderDetlPakoutList){
+ List<OrderDetl> orderDetlList = new ArrayList<>();
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakoutList){
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(orderDetlPakout);
+ orderDetlList.add(orderDetl);
+ }
+ return orderDetlList;
+ }
+
+ public OrderPakout transformation(Order order){
+ OrderPakout orderPakout = new OrderPakout();
+ orderPakout.sync(order);
+ return orderPakout;
+ }
+ public List<OrderPakout> transformationList(List<Order> orderList){
+ List<OrderPakout> orderPakoutList = new ArrayList<>();
+ for (Order order : orderList){
+ OrderPakout orderPakout = new OrderPakout();
+ orderPakout.sync(order);
+ orderPakoutList.add(orderPakout);
+ }
+ return orderPakoutList;
+ }
+ public OrderDetlPakout transformationDetl(OrderDetl orderDetl){
+ OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
+ orderDetlPakout.sync(orderDetl);
+ return orderDetlPakout;
+ }
+ public List<OrderDetlPakout> transformationDetlList(List<OrderDetl> orderDetlList){
+ List<OrderDetlPakout> orderDetlPakoutList = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetlList){
+ OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
+ orderDetlPakout.sync(orderDetl);
+ orderDetlPakoutList.add(orderDetlPakout);
+ }
+ return orderDetlPakoutList;
+ }
};
- public abstract void implement(Class<T> tClass, Object param);
+ public abstract void implement();
+
public abstract void query(String orderNo);
+
+ public abstract Order selectByNo(String orderNo);
+
+ public abstract List<OrderDetl> selectByOrderId(Long orderId);
+
+ public abstract List<OrderDetl> selectWorkingDetls(Long orderId);
+
+ public abstract void checkComplete(String orderNo);
+
+ public abstract boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+
public abstract void insertOrder(Order order);
+
public abstract void insertOrderDetl(Order order, OrderDetl orderDetl);
+
public abstract void updateOrder(Long id, Long settle, Long userId);
+
public abstract void updateOrderDetl(Order order, OrderDetl orderDetl);
+ public abstract void remove(Long orderId);
+
+ public abstract List<Order> selectComplete();
+
+ public abstract OrderDetl selectItem(Long orderId, String matnr, String batch);
+
+ public abstract OrderDetl selectItem(String orderNo, String matnr, String batch);
+
+ public abstract OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
+
+ public abstract boolean increase(Long orderId, String matnr, String batch, Double qty);
+
+ public abstract boolean decrease(String orderNo, String matnr, String batch, Double qty);
+
+ public abstract boolean modifyStatus(Long orderId, Integer status);
+
+ public abstract boolean addToLogTable(OrderDetl orderDetl);
+
+ public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+
+ public abstract boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+
@Setter
OrderPakinService orderPakinService;
@Setter
--
Gitblit v1.9.1