From f934f933155b4c65a17d18176f4a2fbf95e68535 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期三, 28 五月 2025 08:33:01 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 162 ++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 115 insertions(+), 47 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 7998654..650c6cf 100644 --- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java +++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java @@ -8,6 +8,7 @@ import com.zy.asrs.service.OrderPakinService; import com.zy.asrs.service.OrderPakoutService; import com.zy.asrs.utils.OrderTransFormationUtil; +import com.zy.nc.util.OutUtil; import lombok.Setter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -21,9 +22,10 @@ * Created by IX on 2024/12/16 */ public enum OrderInAndOutType { - PAKIN{ + PAKIN { @Transactional - public void implement() {} + public void implement() { + } @Transactional public void query(String orderNo) { @@ -32,6 +34,7 @@ throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦"); } } + @Transactional public Order selectByNo(String orderNo) { OrderPakin orderPakin = orderPakinService.selectByNo(orderNo); @@ -40,29 +43,35 @@ } return OrderTransFormationUtil.transformationOrderPakin(orderPakin); } + @Transactional public List<Order> selectBySettle(Long settle) { List<OrderPakin> orderPakinList = orderPakinService.selectBySettle(settle); return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList); } + @Transactional public List<OrderDetl> selectByOrderId(Long orderId) { List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId); return OrderTransFormationUtil.transformationOrderDetlListPakin(orderDetlPakinList); } + @Transactional public List<OrderDetl> selectWorkingDetls(Long orderId) { List<OrderDetlPakin> orderDetlPakinList = orderPakinService.selectWorkingDetls(orderId); return OrderTransFormationUtil.transformationOrderDetlListPakin(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); + return orderPakinService.saveHandlerOrder(pakin, wrkMast, wrkDetls); } + @Transactional public void insertOrder(Order order) { OrderPakin orderPakin = new OrderPakin(); @@ -71,6 +80,7 @@ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�"); } } + @Transactional public void insertOrderDetl(Order order, OrderDetl orderDetl) { OrderPakin orderPakin = orderPakinService.selectByNo(order.getOrderNo()); @@ -82,12 +92,14 @@ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"); } } + @Transactional public void updateOrder(Long id, Long settle, Long userId) { if (!orderPakinService.updateSettle(id, settle, userId)) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); } } + @Transactional public void updateOrderDetl(Order order, OrderDetl orderDetl) { OrderPakin orderPakin = orderPakinService.selectByNo(order.getOrderNo()); @@ -99,14 +111,16 @@ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"); } } + @Transactional public void remove(Long orderId) { - try{ + try { orderPakinService.remove(orderId); - } catch (Exception e){ + } catch (Exception e) { throw new CoolException("鍒犻櫎鍗曟嵁澶辫触"); } } + @Transactional public List<Order> selectComplete() { List<OrderPakin> orderPakinList = orderPakinService.selectComplete(); @@ -145,51 +159,58 @@ @Transactional public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { - OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); + OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin); } @Transactional public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { - OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); + OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin); } @Transactional public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { List<OrderDetlPakin> orderDetlPakins = OrderTransFormationUtil.transformationDetlListPakin(orderDetls); - OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); + OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin); } + @Transactional public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { - return orderDetlPakinService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty); + return orderDetlPakinService.increase(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty); } + @Transactional public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { - return orderDetlPakinService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty); + return orderDetlPakinService.decrease(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty); } + @Transactional public boolean modifyStatus(Long orderId, Integer status) { return orderDetlPakinService.modifyStatus(orderId, status); } + @Transactional public boolean addToLogTableOrderDetl(OrderDetl orderDetl) { OrderDetlPakin orderDetlPakin = OrderTransFormationUtil.transformationDetlPakin(orderDetl); return orderDetlPakinService.addToLogTable(orderDetlPakin); } + @Transactional public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { - return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty); + return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty); } + @Transactional public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) { - return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty); + return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, workQty); } }, - PAKOUT{ + PAKOUT { @Transactional - public void implement() {} + public void implement() { + } @Transactional public void query(String orderNo) { @@ -198,6 +219,7 @@ throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦"); } } + @Transactional public Order selectByNo(String orderNo) { OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo); @@ -206,29 +228,35 @@ } return OrderTransFormationUtil.transformationOrderPakout(orderPakout); } + @Transactional public List<Order> selectBySettle(Long settle) { List<OrderPakout> orderPakoutList = orderPakoutService.selectBySettle(settle); return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList); } + @Transactional public List<OrderDetl> selectByOrderId(Long orderId) { List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId); return OrderTransFormationUtil.transformationOrderDetlListPakout(orderDetlPakoutList); } + @Transactional public List<OrderDetl> selectWorkingDetls(Long orderId) { List<OrderDetlPakout> orderDetlPakoutList = orderPakoutService.selectWorkingDetls(orderId); return OrderTransFormationUtil.transformationOrderDetlListPakout(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); + return orderPakoutService.saveHandlerOrder(Pakout, wrkMast, wrkDetls); } + @Transactional public void insertOrder(Order order) { OrderPakout orderPakout = new OrderPakout(); @@ -237,6 +265,7 @@ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�"); } } + @Transactional public void insertOrderDetl(Order order, OrderDetl orderDetl) { OrderPakout orderPakout = orderPakoutService.selectByNo(order.getOrderNo()); @@ -248,12 +277,14 @@ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"); } } + @Transactional public void updateOrder(Long id, Long settle, Long userId) { if (!orderPakoutService.updateSettle(id, settle, userId)) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); } } + @Transactional public void updateOrderDetl(Order order, OrderDetl orderDetl) { OrderPakout orderPakout = orderPakoutService.selectByNo(order.getOrderNo()); @@ -265,11 +296,12 @@ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"); } } + @Transactional public void remove(Long orderId) { - try{ + try { orderPakoutService.remove(orderId); - } catch (Exception e){ + } catch (Exception e) { throw new CoolException("鍒犻櫎鍗曟嵁澶辫触"); } } @@ -313,54 +345,72 @@ @Transactional public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); + OrderPakout orderPakout = orderPakoutService.selectById(orderId); + OrderDetlPakout orderDetlPakout; + if (OutUtil.rule(orderPakout.getDocType$())) { + orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); + } else { + orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); + } return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout); } @Transactional public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); + OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo); + OrderDetlPakout orderDetlPakout; + if (OutUtil.rule(orderPakout.getDocType$())) { + orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, null, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); + } else { + orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); + } return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout); } @Transactional public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { List<OrderDetlPakout> orderDetlPakouts = OrderTransFormationUtil.transformationDetlListPakout(orderDetls); - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout); } + @Transactional public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { - return orderDetlPakoutService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty); + return orderDetlPakoutService.increase(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty); } + @Transactional public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { - return orderDetlPakoutService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty); + return orderDetlPakoutService.decrease(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty); } + @Transactional public boolean modifyStatus(Long orderId, Integer status) { return orderDetlPakoutService.modifyStatus(orderId, status); } + @Transactional public boolean addToLogTableOrderDetl(OrderDetl orderDetl) { OrderDetlPakout orderDetlPakout = OrderTransFormationUtil.transformationDetlPakout(orderDetl); return orderDetlPakoutService.addToLogTable(orderDetlPakout); } + @Transactional public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { - return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty); - } - @Transactional - public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) { - return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty); + return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty); } + @Transactional + public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) { + return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, workQty); + } }, - PAKALL{ + PAKALL { @Transactional - public void implement() {} + public void implement() { + } @Transactional public void query(String orderNo) { @@ -369,6 +419,7 @@ throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦"); } } + @Transactional public Order selectByNo(String orderNo) { OrderPakin orderPakin = orderPakinService.selectByNo(orderNo); @@ -377,53 +428,63 @@ if (Cools.isEmpty(orderPakout)) { return null; } - return OrderTransFormationUtil.transformationOrder(null,orderPakout); + return OrderTransFormationUtil.transformationOrder(null, orderPakout); } - return OrderTransFormationUtil.transformationOrder(orderPakin,null); + return OrderTransFormationUtil.transformationOrder(orderPakin, null); } + @Transactional public List<Order> selectBySettle(Long settle) { List<OrderPakin> orderPakinList = orderPakinService.selectBySettle(settle); List<OrderPakout> orderPakoutList = orderPakoutService.selectBySettle(settle); - return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList); + return OrderTransFormationUtil.transformationOrderList(orderPakinList, orderPakoutList); } + @Transactional public List<OrderDetl> selectByOrderId(Long orderId) { List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId); List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId); - return OrderTransFormationUtil.transformationOrderDetlList(orderDetlPakinList,orderDetlPakoutList); + return OrderTransFormationUtil.transformationOrderDetlList(orderDetlPakinList, orderDetlPakoutList); } + @Transactional public List<OrderDetl> selectWorkingDetls(Long orderId) { List<OrderDetlPakin> orderDetlPakinList = orderPakinService.selectWorkingDetls(orderId); List<OrderDetlPakout> orderDetlPakoutList = orderPakoutService.selectWorkingDetls(orderId); - return OrderTransFormationUtil.transformationOrderDetlList(orderDetlPakinList,orderDetlPakoutList); + return OrderTransFormationUtil.transformationOrderDetlList(orderDetlPakinList, orderDetlPakoutList); } + @Transactional public void checkComplete(String orderNo) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�403"); } + @Transactional public boolean saveHandlerOrder(Boolean Pakout, WrkMast wrkMast, List<WrkDetl> wrkDetls) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�407"); } + @Transactional public void insertOrder(Order order) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�411"); } + @Transactional public void insertOrderDetl(Order order, OrderDetl orderDetl) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�415"); } + @Transactional public void updateOrder(Long id, Long settle, Long userId) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�419"); } + @Transactional public void updateOrderDetl(Order order, OrderDetl orderDetl) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�423"); } + @Transactional public void remove(Long orderId) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�427"); @@ -434,7 +495,7 @@ public List<Order> selectComplete8() { List<OrderPakin> orderPakinList = orderPakinService.selectComplete8(); List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8(); - return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList); + return OrderTransFormationUtil.transformationOrderList(orderPakinList, orderPakoutList); } @Transactional @@ -446,68 +507,74 @@ public List<Order> selectOrderNoL(String orderNo) { List<OrderPakin> orderPakinList = orderPakinService.selectorderNoL(orderNo); List<OrderPakout> orderPakoutList = orderPakoutService.selectorderNoL(orderNo); - return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList); + return OrderTransFormationUtil.transformationOrderList(orderPakinList, orderPakoutList); } @Transactional public Order selectOrderMoveStatus() { OrderPakin orderPakin = orderPakinService.selectOrderMoveStatus(); OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus(); - return OrderTransFormationUtil.transformationOrder(orderPakin,orderPakout); + return OrderTransFormationUtil.transformationOrder(orderPakin, orderPakout); } @Transactional public Order selectOrderMoveStatusInitial() { OrderPakin orderPakin = orderPakinService.selectOrderMoveStatusInitial(); OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatusInitial(); - return OrderTransFormationUtil.transformationOrder(orderPakin,orderPakout); + return OrderTransFormationUtil.transformationOrder(orderPakin, orderPakout); } @Transactional public List<Order> selectComplete() { List<OrderPakin> orderPakinList = orderPakinService.selectComplete(); List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete(); - return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList); + return OrderTransFormationUtil.transformationOrderList(orderPakinList, orderPakoutList); } @Transactional public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { - OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); - return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout); + OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); + return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin, orderDetlPakout); } @Transactional public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { - OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3); - return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout); + OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3); + return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin, orderDetlPakout); } @Transactional public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�487"); } + @Transactional public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�491"); } + @Transactional public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�495"); } + @Transactional public boolean modifyStatus(Long orderId, Integer status) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�499"); } + @Transactional public boolean addToLogTableOrderDetl(OrderDetl orderDetl) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�503"); } + @Transactional public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�507"); } + @Transactional public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�511"); @@ -590,9 +657,10 @@ OrderPakoutService orderPakoutService; @Autowired OrderDetlPakoutService orderDetlPakoutService; + @PostConstruct - public void postConstruct(){ - for(OrderInAndOutType orderInAndOutType : EnumSet.allOf(OrderInAndOutType.class)){ + public void postConstruct() { + for (OrderInAndOutType orderInAndOutType : EnumSet.allOf(OrderInAndOutType.class)) { orderInAndOutType.setOrderPakinService(orderPakinService); orderInAndOutType.setOrderDetlPakinService(orderDetlPakinService); orderInAndOutType.setOrderPakoutService(orderPakoutService); -- Gitblit v1.9.1