From 00a6376e31fea643df9394a90aaf71b8369fd01f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 15 六月 2025 16:37:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 519 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 330 insertions(+), 189 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 9730d66..5e1ffee 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
@@ -7,20 +7,25 @@
import com.zy.asrs.service.OrderDetlPakoutService;
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;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
-import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+/**
+ * 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) {
@@ -29,37 +34,44 @@
throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
}
+
@Transactional
public Order selectByNo(String orderNo) {
OrderPakin orderPakin = orderPakinService.selectByNo(orderNo);
if (Cools.isEmpty(orderPakin)) {
return null;
}
- return transformationOrder(orderPakin);
+ return OrderTransFormationUtil.transformationOrderPakin(orderPakin);
}
+
@Transactional
public List<Order> selectBySettle(Long settle) {
List<OrderPakin> orderPakinList = orderPakinService.selectBySettle(settle);
- return transformationOrderList(orderPakinList);
+ return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
}
+
@Transactional
public List<OrderDetl> selectByOrderId(Long orderId) {
List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId);
- return transformationOrderDetlList(orderDetlPakinList);
+ return OrderTransFormationUtil.transformationOrderDetlListPakin(orderDetlPakinList);
}
+
@Transactional
public List<OrderDetl> selectWorkingDetls(Long orderId) {
List<OrderDetlPakin> orderDetlPakinList = orderPakinService.selectWorkingDetls(orderId);
- return transformationOrderDetlList(orderDetlPakinList);
+ 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();
@@ -68,6 +80,7 @@
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
+
@Transactional
public void insertOrderDetl(Order order, OrderDetl orderDetl) {
OrderPakin orderPakin = orderPakinService.selectByNo(order.getOrderNo());
@@ -79,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());
@@ -96,156 +111,133 @@
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();
- return transformationOrderList(orderPakinList);
+ if (orderPakinList == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
+ return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
}
@Transactional
public List<Order> selectComplete8() {
List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
- return transformationOrderList(orderPakinList);
+ if (orderPakinList == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
+ return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
}
@Transactional
public boolean addToLogTableOrder(Order order) {
- OrderPakin orderPakin = transformation(order);
+ OrderPakin orderPakin = OrderTransFormationUtil.transformationPakin(order);
+ if (orderPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
return orderPakinService.addToLogTable(orderPakin);
}
@Transactional
public List<Order> selectOrderNoL(String orderNo) {
List<OrderPakin> orderPakinList = orderPakinService.selectorderNoL(orderNo);
- return transformationOrderList(orderPakinList);
+ if (orderPakinList == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
+ return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
}
@Transactional
public Order selectOrderMoveStatus() {
OrderPakin orderPakin = orderPakinService.selectOrderMoveStatus();
- return transformationOrder(orderPakin);
+ if (orderPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
+ return OrderTransFormationUtil.transformationOrderPakin(orderPakin);
}
@Transactional
public Order selectOrderMoveStatusInitial() {
OrderPakin orderPakin = orderPakinService.selectOrderMoveStatusInitial();
- return transformationOrder(orderPakin);
+ if (orderPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
+ return OrderTransFormationUtil.transformationOrderPakin(orderPakin);
}
@Transactional
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch);
- return transformationOrderDetl(orderDetlPakin);
+ 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);
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
+ return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
}
@Transactional
- public OrderDetl selectItem(String orderNo, String matnr, String batch) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch);
- return transformationOrderDetl(orderDetlPakin);
+ 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);
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
+ return OrderTransFormationUtil.transformationOrderDetlPakin(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);
+ 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);
+ if (orderDetlPakin == null) {
+ throw new CoolException("鏈壘鍒拌鍗曟嵁");
+ }
+ 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, String boxType1, String boxType2, String boxType3, Double 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, 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, String boxType1, String boxType2, String boxType3, Double 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 = transformationDetl(orderDetl);
+ OrderDetlPakin orderDetlPakin = OrderTransFormationUtil.transformationDetlPakin(orderDetl);
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, String boxType1, String boxType2, String boxType3, Double 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, 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;
+ 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);
}
},
- PAKOUT{
+ PAKOUT {
@Transactional
- public void implement() {}
+ public void implement() {
+ }
@Transactional
public void query(String orderNo) {
@@ -254,37 +246,44 @@
throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
}
+
@Transactional
public Order selectByNo(String orderNo) {
OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
if (Cools.isEmpty(orderPakout)) {
return null;
}
- return transformationOrder(orderPakout);
+ return OrderTransFormationUtil.transformationOrderPakout(orderPakout);
}
+
@Transactional
public List<Order> selectBySettle(Long settle) {
List<OrderPakout> orderPakoutList = orderPakoutService.selectBySettle(settle);
- return transformationOrderList(orderPakoutList);
+ return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
}
+
@Transactional
public List<OrderDetl> selectByOrderId(Long orderId) {
List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId);
- return transformationOrderDetlList(orderDetlPakoutList);
+ return OrderTransFormationUtil.transformationOrderDetlListPakout(orderDetlPakoutList);
}
+
@Transactional
public List<OrderDetl> selectWorkingDetls(Long orderId) {
List<OrderDetlPakout> orderDetlPakoutList = orderPakoutService.selectWorkingDetls(orderId);
- return transformationOrderDetlList(orderDetlPakoutList);
+ 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();
@@ -293,6 +292,7 @@
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
+
@Transactional
public void insertOrderDetl(Order order, OrderDetl orderDetl) {
OrderPakout orderPakout = orderPakoutService.selectByNo(order.getOrderNo());
@@ -304,12 +304,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());
@@ -321,11 +323,12 @@
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
+
@Transactional
public void remove(Long orderId) {
- try{
+ try {
orderPakoutService.remove(orderId);
- } catch (Exception e){
+ } catch (Exception e) {
throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
}
}
@@ -334,148 +337,285 @@
@Transactional
public List<Order> selectComplete8() {
List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
- return transformationOrderList(orderPakoutList);
+ return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
}
@Transactional
public boolean addToLogTableOrder(Order order) {
- OrderPakout orderPakout = transformation(order);
+ OrderPakout orderPakout = OrderTransFormationUtil.transformationPakout(order);
return orderPakoutService.addToLogTable(orderPakout);
}
@Transactional
public List<Order> selectOrderNoL(String orderNo) {
List<OrderPakout> orderPakoutList = orderPakoutService.selectorderNoL(orderNo);
- return transformationOrderList(orderPakoutList);
+ return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
}
@Transactional
public Order selectOrderMoveStatus() {
OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
- return transformationOrder(orderPakout);
+ return OrderTransFormationUtil.transformationOrderPakout(orderPakout);
}
@Transactional
public Order selectOrderMoveStatusInitial() {
OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
- return transformationOrder(orderPakout);
+ return OrderTransFormationUtil.transformationOrderPakout(orderPakout);
}
@Transactional
public List<Order> selectComplete() {
List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete();
- return transformationOrderList(orderPakoutList);
+ return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
}
@Transactional
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch);
- return transformationOrderDetl(orderDetlPakout);
+ public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String 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) {
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch);
- return transformationOrderDetl(orderDetlPakout);
+ public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String 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) {
- List<OrderDetlPakout> orderDetlPakouts = transformationDetlList(orderDetls);
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch);
- return transformationOrderDetl(orderDetlPakout);
+ 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);
+ 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, String boxType1, String boxType2, String boxType3, Double 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, 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, String boxType1, String boxType2, String boxType3, Double 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 = transformationDetl(orderDetl);
+ OrderDetlPakout orderDetlPakout = OrderTransFormationUtil.transformationDetlPakout(orderDetl);
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, 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, 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, String boxType1, String boxType2, String boxType3, Double workQty) {
+ return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, 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;
+ },
+ PAKALL {
+ @Transactional
+ public void implement() {
}
- 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);
+ @Transactional
+ public void query(String orderNo) {
+ OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
+ if (!Cools.isEmpty(orderPakout)) {
+ throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
- 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);
+
+ @Transactional
+ public Order selectByNo(String orderNo) {
+ OrderPakin orderPakin = orderPakinService.selectByNo(orderNo);
+ if (Cools.isEmpty(orderPakin)) {
+ OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
+ if (Cools.isEmpty(orderPakout)) {
+ return null;
+ }
+ return OrderTransFormationUtil.transformationOrder(null, orderPakout);
}
- return orderDetlPakoutList;
+ 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);
+ }
+
+ @Transactional
+ public List<OrderDetl> selectByOrderId(Long orderId) {
+ List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId);
+ List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId);
+ 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);
+ }
+
+ @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");
+ }
+
+
+ @Transactional
+ public List<Order> selectComplete8() {
+ List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
+ return OrderTransFormationUtil.transformationOrderList(orderPakinList, orderPakoutList);
+ }
+
+ @Transactional
+ public boolean addToLogTableOrder(Order order) {
+ throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�440");
+ }
+
+ @Transactional
+ public List<Order> selectOrderNoL(String orderNo) {
+ List<OrderPakin> orderPakinList = orderPakinService.selectorderNoL(orderNo);
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectorderNoL(orderNo);
+ return OrderTransFormationUtil.transformationOrderList(orderPakinList, orderPakoutList);
+ }
+
+ @Transactional
+ public Order selectOrderMoveStatus() {
+ OrderPakin orderPakin = orderPakinService.selectOrderMoveStatus();
+ OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
+ return OrderTransFormationUtil.transformationOrder(orderPakin, orderPakout);
+ }
+
+ @Transactional
+ public Order selectOrderMoveStatusInitial() {
+ OrderPakin orderPakin = orderPakinService.selectOrderMoveStatusInitial();
+ OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
+ 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);
+ }
+
+ @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);
+ }
+
+ @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);
+ }
+
+ @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");
+ }
+ },
+ ;
public abstract void implement();
public abstract void query(String orderNo);
public abstract Order selectByNo(String orderNo);
+
+ public abstract List<Order> selectBySettle(Long settle);
public abstract List<OrderDetl> selectByOrderId(Long orderId);
@@ -507,23 +647,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, String boxType1, String boxType2, String boxType3);
- 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, String boxType1, String boxType2, String boxType3);
- 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, String boxType1, String boxType2, String boxType3);
- 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, String boxType1, String boxType2, String boxType3, 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, String boxType1, String boxType2, String boxType3, 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, String boxType1, String boxType2, String boxType3, 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, String boxType1, String boxType2, String boxType3, Double workQty);
@Setter
OrderPakinService orderPakinService;
@@ -544,9 +684,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