From 64f818924d5ef3f3a2d52149f5379694987b52d7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 12 十二月 2024 14:38:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java | 161 ++++++++++++++++++++++---------
src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 78 +++++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 +-
src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java | 13 ++
4 files changed, 207 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f3b6c85..e95f470 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -59,7 +59,7 @@
public void pakinOrderCreate(OpenOrderPakinParam param) {
try{
- OrderInAndOutUtil.query(Boolean.TRUE,OrderMethodVo.QUERY,param.getOrderNo());
+ OrderInAndOutUtil.query(Boolean.TRUE,param.getOrderNo());
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
@@ -104,7 +104,7 @@
null // 澶囨敞
);
try{
- OrderInAndOutUtil.insertOrder(Boolean.TRUE,OrderMethodVo.INSERT_ORDER,order);
+ OrderInAndOutUtil.insertOrder(Boolean.TRUE,order);
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
@@ -139,7 +139,7 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
try{
- OrderInAndOutUtil.insertOrderDetl(Boolean.TRUE,OrderMethodVo.INSERT_ORDERDETL,order,orderDetl);
+ OrderInAndOutUtil.insertOrderDetl(Boolean.TRUE,order,orderDetl);
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
@@ -154,7 +154,7 @@
// 鎸囧畾璁㈠崟
// Order order = orderService.selectByNo(param.getOrderNo());
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE,OrderMethodVo.SELECT_BY_NO,param.getOrderNo());
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE,param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
@@ -163,7 +163,7 @@
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.TRUE, OrderMethodVo.SELECT_BY_NO, order.getId());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.TRUE, order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
@@ -173,7 +173,7 @@
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(Boolean.TRUE, OrderMethodVo.SELECT_BY_NO,order.getId(), 6L, null);
+ OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 6L, null);
}
}
} else {
diff --git a/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java b/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
index db697d7..6addc46 100644
--- a/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
@@ -85,6 +85,16 @@
return casual.getDeclaredMethod(OrderMethodVo.REMOVE.getCode(), Long.class);
case SELECT_COMPLETE:
return casual.getDeclaredMethod(OrderMethodVo.SELECT_COMPLETE.getCode());
+ case SELECT_COMPLETE8:
+ return casual.getDeclaredMethod(OrderMethodVo.SELECT_COMPLETE8.getCode());
+ case ADD_TO_LOG_TABLE_ORDER:
+ return casual.getDeclaredMethod(OrderMethodVo.ADD_TO_LOG_TABLE_ORDER.getCode(), Order.class);
+ case SELECT_ORDER_NO_L:
+ return casual.getDeclaredMethod(OrderMethodVo.SELECT_ORDER_NO_L.getCode(), String.class);
+ case SELECT_ORDER_MOVE_STATUS:
+ return casual.getDeclaredMethod(OrderMethodVo.SELECT_ORDER_MOVE_STATUS.getCode());
+ case SELECT_ORDER_MOVE_STATUS_INITIAL:
+ return casual.getDeclaredMethod(OrderMethodVo.SELECT_ORDER_MOVE_STATUS_INITIAL.getCode());
case SELECT_ITEM1:
return casual.getDeclaredMethod(OrderMethodVo.SELECT_ITEM1.getCode(), Long.class,String.class,String.class);
case SELECT_ITEM2:
@@ -97,8 +107,8 @@
return casual.getDeclaredMethod(OrderMethodVo.DECREASE.getCode(), String.class,String.class,String.class,Double.class);
case MODIFY_STATUS:
return casual.getDeclaredMethod(OrderMethodVo.MODIFY_STATUS.getCode(), Long.class,Integer.class);
- case ADD_TO_LOG_TABLE:
- return casual.getDeclaredMethod(OrderMethodVo.ADD_TO_LOG_TABLE.getCode(), OrderDetl.class);
+ case ADD_TO_LOG_TABLE_ORDERDETL:
+ return casual.getDeclaredMethod(OrderMethodVo.ADD_TO_LOG_TABLE_ORDERDETL.getCode(), OrderDetl.class);
case INCREASE_QTY_BY_ORDER_NO:
return casual.getDeclaredMethod(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO.getCode(), String.class,String.class,String.class,Double.class);
case INCREASE_WORKING_QTY:
@@ -110,26 +120,26 @@
throw new CoolException("鏈煡寮傚父");
}
- public static void query(boolean sign,OrderMethodVo orderMethodVo,String orderNo){
+ public static void query(boolean sign,String orderNo){
try{
- implement(orderMethodVo).invoke(getOrderInAndOutType(sign),orderNo);
+ implement(OrderMethodVo.QUERY).invoke(getOrderInAndOutType(sign),orderNo);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static Order selectByNo(boolean sign,OrderMethodVo orderMethodVo,String orderNo){
+ public static Order selectByNo(boolean sign,String orderNo){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderNo);
+ Object invoke = implement(OrderMethodVo.SELECT_BY_NO).invoke(getOrderInAndOutType(sign), orderNo);
return aOrder(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static List<OrderDetl> selectByOrderId(boolean sign,OrderMethodVo orderMethodVo,Long orderId){
+ public static List<OrderDetl> selectByOrderId(boolean sign,Long orderId){
try{
- Object result = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderId);
+ Object result = implement(OrderMethodVo.SELECT_BY_ORDER_ID).invoke(getOrderInAndOutType(sign), orderId);
if (Cools.isEmpty(result)){
return null;
} else if (result instanceof List) {
@@ -142,9 +152,9 @@
}
}
- public static List<OrderDetl> selectWorkingDetls(boolean sign,OrderMethodVo orderMethodVo,Long orderId){
+ public static List<OrderDetl> selectWorkingDetls(boolean sign,Long orderId){
try{
- Object result = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderId);
+ Object result = implement(OrderMethodVo.SELECT_WORKING_DETLS).invoke(getOrderInAndOutType(sign), orderId);
if (Cools.isEmpty(result)){
return null;
} else if (result instanceof List) {
@@ -157,70 +167,70 @@
}
}
- public static void checkComplete(boolean sign,OrderMethodVo orderMethodVo,String orderNo){
+ public static void checkComplete(boolean sign,String orderNo){
try{
- implement(orderMethodVo).invoke(getOrderInAndOutType(sign),orderNo);
+ implement(OrderMethodVo.CHECK_COMPLETE).invoke(getOrderInAndOutType(sign),orderNo);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean saveHandlerOrder(boolean sign,OrderMethodVo orderMethodVo,Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls){
+ public static boolean saveHandlerOrder(boolean sign,Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), pakin, wrkMast, wrkDetls);
+ Object invoke = implement(OrderMethodVo.SAVE_HANDLER_ORDER).invoke(getOrderInAndOutType(sign), pakin, wrkMast, wrkDetls);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static void insertOrder(boolean sign,OrderMethodVo orderMethodVo,Order order){
+ public static void insertOrder(boolean sign,Order order){
try{
- implement(orderMethodVo).invoke(getOrderInAndOutType(sign),order);
+ implement(OrderMethodVo.INSERT_ORDER).invoke(getOrderInAndOutType(sign),order);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static void insertOrderDetl(boolean sign,OrderMethodVo orderMethodVo,Order order, OrderDetl orderDetl){
+ public static void insertOrderDetl(boolean sign,Order order, OrderDetl orderDetl){
try{
- implement(orderMethodVo).invoke(getOrderInAndOutType(sign),order,orderDetl);
+ implement(OrderMethodVo.INSERT_ORDERDETL).invoke(getOrderInAndOutType(sign),order,orderDetl);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static void updateOrder(boolean sign,OrderMethodVo orderMethodVo,Long id, Long settle, Long userId){
+ public static void updateOrder(boolean sign,Long id, Long settle, Long userId){
try{
- implement(orderMethodVo).invoke(getOrderInAndOutType(sign),id,settle,userId);
+ implement(OrderMethodVo.UPDATE_ORDER).invoke(getOrderInAndOutType(sign),id,settle,userId);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static void updateOrderDetl(boolean sign,OrderMethodVo orderMethodVo,Order order, OrderDetl orderDetl){
+ public static void updateOrderDetl(boolean sign,Order order, OrderDetl orderDetl){
try{
- implement(orderMethodVo).invoke(getOrderInAndOutType(sign),order,orderDetl);
+ implement(OrderMethodVo.UPDATE_ORDERDETL).invoke(getOrderInAndOutType(sign),order,orderDetl);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static void remove(boolean sign,OrderMethodVo orderMethodVo,Long orderId){
+ public static void remove(boolean sign,Long orderId){
try{
- implement(orderMethodVo).invoke(getOrderInAndOutType(sign),orderId);
+ implement(OrderMethodVo.REMOVE).invoke(getOrderInAndOutType(sign),orderId);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static List<Order> selectComplete(boolean sign,OrderMethodVo orderMethodVo){
+ public static List<Order> selectComplete(boolean sign){
try{
- Object result = implement(orderMethodVo).invoke(getOrderInAndOutType(sign));
- if (Cools.isEmpty(result)){
+ Object invoke = implement(OrderMethodVo.SELECT_COMPLETE).invoke(getOrderInAndOutType(sign));
+ if (Cools.isEmpty(invoke)){
return null;
- } else if (result instanceof List) {
- return (List<Order>) result;
+ } else if (invoke instanceof List) {
+ return (List<Order>) invoke;
} else {
throw new CoolException("Unexpected return type");
}
@@ -229,81 +239,138 @@
}
}
- public static OrderDetl selectItem(boolean sign,OrderMethodVo orderMethodVo,Long orderId, String matnr, String batch){
+ public static List<Order> selectComplete8(boolean sign){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderId, matnr, batch);
+ Object invoke = implement(OrderMethodVo.SELECT_COMPLETE8).invoke(getOrderInAndOutType(sign));
+ if (Cools.isEmpty(invoke)){
+ return null;
+ } else if (invoke instanceof List) {
+ return (List<Order>) invoke;
+ } else {
+ throw new CoolException("Unexpected return type");
+ }
+ } catch (Exception e) {
+ throw new CoolException(e.getCause().getMessage());
+ }
+ }
+
+ public static boolean addToLogTableOrder(boolean sign,Order order){
+ try{
+ Object invoke = implement(OrderMethodVo.ADD_TO_LOG_TABLE_ORDER).invoke(getOrderInAndOutType(sign), order);
+ return aBoolean(invoke);
+ } catch (Exception e) {
+ throw new CoolException(e.getCause().getMessage());
+ }
+ }
+
+ public static List<Order> selectOrderNoL(boolean sign,String orderNo){
+ try{
+ Object invoke = implement(OrderMethodVo.SELECT_ORDER_NO_L).invoke(getOrderInAndOutType(sign),orderNo);
+ if (Cools.isEmpty(invoke)){
+ return null;
+ } else if (invoke instanceof List) {
+ return (List<Order>) invoke;
+ } else {
+ throw new CoolException("Unexpected return type");
+ }
+ } catch (Exception e) {
+ throw new CoolException(e.getCause().getMessage());
+ }
+ }
+
+ public static Order selectOrderMoveStatus(boolean sign){
+ try{
+ Object invoke = implement(OrderMethodVo.SELECT_ORDER_MOVE_STATUS).invoke(getOrderInAndOutType(sign));
+ return aOrder(invoke);
+ } catch (Exception e) {
+ throw new CoolException(e.getCause().getMessage());
+ }
+ }
+
+ public static Order selectOrderMoveStatusInitial(boolean sign){
+ try{
+ Object invoke = implement(OrderMethodVo.SELECT_ORDER_MOVE_STATUS_INITIAL).invoke(getOrderInAndOutType(sign));
+ return aOrder(invoke);
+ } catch (Exception e) {
+ throw new CoolException(e.getCause().getMessage());
+ }
+ }
+
+ public static OrderDetl selectItem(boolean sign,Long orderId, String matnr, String batch){
+ try{
+ Object invoke = implement(OrderMethodVo.SELECT_ITEM1).invoke(getOrderInAndOutType(sign), orderId, matnr, batch);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static OrderDetl selectItem(boolean sign,OrderMethodVo orderMethodVo,String orderNo, String matnr, String batch){
+ public static OrderDetl selectItem(boolean sign,String orderNo, String matnr, String batch){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch);
+ Object invoke = implement(OrderMethodVo.SELECT_ITEM2).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static OrderDetl findByLook(boolean sign,OrderMethodVo orderMethodVo,List<OrderDetl> orderDetls, Long orderId, String matnr, String batch){
+ public static OrderDetl findByLook(boolean sign,List<OrderDetl> orderDetls, Long orderId, String matnr, String batch){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderDetls, orderId, matnr, batch);
+ Object invoke = implement(OrderMethodVo.FIND_BY_LOOK).invoke(getOrderInAndOutType(sign), orderDetls, orderId, matnr, batch);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean increase(boolean sign,OrderMethodVo orderMethodVo,Long orderId, String matnr, String batch, Double qty){
+ public static boolean increase(boolean sign,Long orderId, String matnr, String batch, Double qty){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderId, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.INCREASE).invoke(getOrderInAndOutType(sign), orderId, matnr, batch, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean decrease(boolean sign,OrderMethodVo orderMethodVo,String orderNo, String matnr, String batch, Double qty){
+ public static boolean decrease(boolean sign,String orderNo, String matnr, String batch, Double qty){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.DECREASE).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean modifyStatus(boolean sign,OrderMethodVo orderMethodVo,Long orderId, Integer status){
+ public static boolean modifyStatus(boolean sign,Long orderId, Integer status){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderId, status);
+ Object invoke = implement(OrderMethodVo.MODIFY_STATUS).invoke(getOrderInAndOutType(sign), orderId, status);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean addToLogTable(boolean sign,OrderMethodVo orderMethodVo,OrderDetl orderDetl){
+ public static boolean addToLogTableOrderDetl(boolean sign,OrderDetl orderDetl){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderDetl);
+ Object invoke = implement(OrderMethodVo.ADD_TO_LOG_TABLE_ORDERDETL).invoke(getOrderInAndOutType(sign), orderDetl);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean increaseQtyByOrderNo(boolean sign,OrderMethodVo orderMethodVo,String orderNo, String matnr, String batch, Double qty){
+ public static boolean increaseQtyByOrderNo(boolean sign,String orderNo, String matnr, String batch, Double qty){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean increaseWorkQty(boolean sign,OrderMethodVo orderMethodVo,Long orderId, String matnr, String batch, Double workQty){
+ public static boolean increaseWorkQty(boolean sign,Long orderId, String matnr, String batch, Double workQty){
try{
- Object invoke = implement(orderMethodVo).invoke(getOrderInAndOutType(sign), orderId, matnr, batch, workQty);
+ Object invoke = implement(OrderMethodVo.INCREASE_WORKING_QTY).invoke(getOrderInAndOutType(sign), orderId, matnr, batch, workQty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
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 9610b67..6073848 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
@@ -106,6 +106,36 @@
}
@Transactional
+ public List<Order> selectComplete8() {
+ List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
+ return transformationOrderList(orderPakinList);
+ }
+
+ @Transactional
+ public boolean addToLogTableOrder(Order order) {
+ OrderPakin orderPakin = transformation(order);
+ return orderPakinService.addToLogTable(orderPakin);
+ }
+
+ @Transactional
+ public List<Order> selectOrderNoL(String orderNo) {
+ List<OrderPakin> orderPakinList = orderPakinService.selectorderNoL(orderNo);
+ return transformationOrderList(orderPakinList);
+ }
+
+ @Transactional
+ public Order selectOrderMoveStatus() {
+ OrderPakin orderPakin = orderPakinService.selectOrderMoveStatus();
+ return transformationOrder(orderPakin);
+ }
+
+ @Transactional
+ public Order selectOrderMoveStatusInitial() {
+ OrderPakin orderPakin = orderPakinService.selectOrderMoveStatusInitial();
+ return transformationOrder(orderPakin);
+ }
+
+ @Transactional
public OrderDetl selectItem(Long orderId, String matnr, String batch) {
OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch);
return transformationOrderDetl(orderDetlPakin);
@@ -136,7 +166,7 @@
return orderDetlPakinService.modifyStatus(orderId, status);
}
@Transactional
- public boolean addToLogTable(OrderDetl orderDetl) {
+ public boolean addToLogTableOrderDetl(OrderDetl orderDetl) {
OrderDetlPakin orderDetlPakin = transformationDetl(orderDetl);
return orderDetlPakinService.addToLogTable(orderDetlPakin);
}
@@ -289,6 +319,38 @@
throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
}
}
+
+
+ @Transactional
+ public List<Order> selectComplete8() {
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
+ return transformationOrderList(orderPakoutList);
+ }
+
+ @Transactional
+ public boolean addToLogTableOrder(Order order) {
+ OrderPakout orderPakout = transformation(order);
+ return orderPakoutService.addToLogTable(orderPakout);
+ }
+
+ @Transactional
+ public List<Order> selectOrderNoL(String orderNo) {
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectorderNoL(orderNo);
+ return transformationOrderList(orderPakoutList);
+ }
+
+ @Transactional
+ public Order selectOrderMoveStatus() {
+ OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
+ return transformationOrder(orderPakout);
+ }
+
+ @Transactional
+ public Order selectOrderMoveStatusInitial() {
+ OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
+ return transformationOrder(orderPakout);
+ }
+
@Transactional
public List<Order> selectComplete() {
List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete();
@@ -326,7 +388,7 @@
return orderDetlPakoutService.modifyStatus(orderId, status);
}
@Transactional
- public boolean addToLogTable(OrderDetl orderDetl) {
+ public boolean addToLogTableOrderDetl(OrderDetl orderDetl) {
OrderDetlPakout orderDetlPakout = transformationDetl(orderDetl);
return orderDetlPakoutService.addToLogTable(orderDetlPakout);
}
@@ -425,6 +487,16 @@
public abstract List<Order> selectComplete();
+ public abstract List<Order> selectComplete8();
+
+ public abstract boolean addToLogTableOrder(Order order);
+
+ public abstract List<Order> selectOrderNoL(String orderNo);
+
+ public abstract Order selectOrderMoveStatus();
+
+ public abstract Order selectOrderMoveStatusInitial();
+
public abstract OrderDetl selectItem(Long orderId, String matnr, String batch);
public abstract OrderDetl selectItem(String orderNo, String matnr, String batch);
@@ -437,7 +509,7 @@
public abstract boolean modifyStatus(Long orderId, Integer status);
- public abstract boolean addToLogTable(OrderDetl orderDetl);
+ public abstract boolean addToLogTableOrderDetl(OrderDetl orderDetl);
public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java b/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java
index 0b982eb..44465e6 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java
@@ -1,5 +1,9 @@
package com.zy.common.model.enumUtils;
+import com.zy.asrs.entity.Order;
+
+import java.util.List;
+
public enum OrderMethodVo {
IMPLEMENT("implement"),
QUERY("query"),
@@ -14,13 +18,20 @@
UPDATE_ORDERDETL("updateOrderDetl"),
REMOVE("remove"),
SELECT_COMPLETE("selectComplete"),
+
+ SELECT_COMPLETE8("selectComplete8"),
+ ADD_TO_LOG_TABLE_ORDER("addToLogTableOrder"),
+ SELECT_ORDER_NO_L("selectOrderNoL"),
+ SELECT_ORDER_MOVE_STATUS("selectOrderMoveStatus"),
+ SELECT_ORDER_MOVE_STATUS_INITIAL("selectOrderMoveStatusInitial"),
+
SELECT_ITEM1("selectItem"),
SELECT_ITEM2("selectItem"),
FIND_BY_LOOK("findByLook"),
INCREASE("increase"),
DECREASE("decrease"),
MODIFY_STATUS("modifyStatus"),
- ADD_TO_LOG_TABLE("addToLogTable"),
+ ADD_TO_LOG_TABLE_ORDERDETL("addToLogTableOrderDetl"),
INCREASE_QTY_BY_ORDER_NO("increaseQtyByOrderNo"),
INCREASE_WORKING_QTY("increaseWorkQty");
--
Gitblit v1.9.1