From 19838a8bf458e94bed799363d11b35b517ab15df Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 18 十二月 2024 18:48:46 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 92 +++++++++++++++++++++++----------------------- 1 files changed, 46 insertions(+), 46 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 711d353..280d487 100644 --- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java +++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java @@ -144,30 +144,30 @@ } @Transactional - public OrderDetl selectItem(Long orderId, String matnr, String batch) { - OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch); + public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { + OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3); return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin); } @Transactional - public OrderDetl selectItem(String orderNo, String matnr, String batch) { - OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch); + public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { + OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3); return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin); } @Transactional - public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) { + public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { List<OrderDetlPakin> orderDetlPakins = OrderTransFormationUtil.transformationDetlListPakin(orderDetls); - OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch); + OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch,brand,standby1,standby2,standby3); return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin); } @Transactional - public boolean increase(Long orderId, String matnr, String batch, Double qty) { - return orderDetlPakinService.increase(orderId, matnr, batch, qty); + public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + return orderDetlPakinService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty); } @Transactional - public boolean decrease(String orderNo, String matnr, String batch, Double qty) { - return orderDetlPakinService.decrease(orderNo, matnr, batch, qty); + public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + return orderDetlPakinService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty); } @Transactional public boolean modifyStatus(Long orderId, Integer status) { @@ -179,12 +179,12 @@ return orderDetlPakinService.addToLogTable(orderDetlPakin); } @Transactional - public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) { - return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch, qty); + public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty); } @Transactional - public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) { - return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch, workQty); + public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) { + return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty); } }, PAKOUT{ @@ -312,30 +312,30 @@ } @Transactional - public OrderDetl selectItem(Long orderId, String matnr, String batch) { - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch); + public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3); return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout); } @Transactional - public OrderDetl selectItem(String orderNo, String matnr, String batch) { - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch); + public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3); return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout); } @Transactional - public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) { + public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { List<OrderDetlPakout> orderDetlPakouts = OrderTransFormationUtil.transformationDetlListPakout(orderDetls); - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch); + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch,brand,standby1,standby2,standby3); return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout); } @Transactional - public boolean increase(Long orderId, String matnr, String batch, Double qty) { - return orderDetlPakoutService.increase(orderId, matnr, batch, qty); + public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + return orderDetlPakoutService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty); } @Transactional - public boolean decrease(String orderNo, String matnr, String batch, Double qty) { - return orderDetlPakoutService.decrease(orderNo, matnr, batch, qty); + public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + return orderDetlPakoutService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty); } @Transactional public boolean modifyStatus(Long orderId, Integer status) { @@ -347,12 +347,12 @@ return orderDetlPakoutService.addToLogTable(orderDetlPakout); } @Transactional - public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) { - return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch, qty); + public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { + return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty); } @Transactional - public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) { - return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch, workQty); + public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) { + return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty); } @@ -471,29 +471,29 @@ } @Transactional - public OrderDetl selectItem(Long orderId, String matnr, String batch) { - OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch); - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch); + public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { + OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3); + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3); return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout); } @Transactional - public OrderDetl selectItem(String orderNo, String matnr, String batch) { - OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch); - OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch); + public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { + OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3); + OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3); return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout); } @Transactional - public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) { + public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�487"); } @Transactional - public boolean increase(Long orderId, String matnr, String batch, Double qty) { + public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�491"); } @Transactional - public boolean decrease(String orderNo, String matnr, String batch, Double qty) { + public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�495"); } @Transactional @@ -505,11 +505,11 @@ throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�503"); } @Transactional - public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) { + public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�507"); } @Transactional - public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) { + public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) { throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�511"); } }, @@ -553,23 +553,23 @@ public abstract Order selectOrderMoveStatusInitial(); - public abstract OrderDetl selectItem(Long orderId, String matnr, String batch); + public abstract OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3); - public abstract OrderDetl selectItem(String orderNo, String matnr, String batch); + public abstract OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3); - public abstract OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch); + public abstract OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3); - public abstract boolean increase(Long orderId, String matnr, String batch, Double qty); + public abstract boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty); - public abstract boolean decrease(String orderNo, String matnr, String batch, Double qty); + public abstract boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty); public abstract boolean modifyStatus(Long orderId, Integer status); public abstract boolean addToLogTableOrderDetl(OrderDetl orderDetl); - public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty); + public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty); - public abstract boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty); + public abstract boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty); @Setter OrderPakinService orderPakinService; -- Gitblit v1.9.1