13

zhang

2025-05-28 f934f933155b4c65a17d18176f4a2fbf95e68535

 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;
@@ -23,7 +24,8 @@
public enum OrderInAndOutType {
    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);
        }

        @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,6 +111,7 @@
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }

        @Transactional
        public void remove(Long orderId) {
            try{
@@ -107,6 +120,7 @@
                throw new CoolException("删除单据失败");
            }
        }

        @Transactional
        public List<Order> selectComplete() {
            List<OrderPakin> orderPakinList = orderPakinService.selectComplete();
@@ -161,27 +175,33 @@
            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);
        }

        @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);
        }

        @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);
        }

        @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);
@@ -189,7 +209,8 @@
    },
    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);
        }

        @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,6 +296,7 @@
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }

        @Transactional
        public void remove(Long orderId) {
            try{
@@ -313,13 +345,25 @@

        @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);
        }

@@ -329,38 +373,44 @@
            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);
        }

        @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);
        }

        @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);
        }



    },
    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);
@@ -382,48 +433,58 @@
            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");
@@ -488,26 +549,32 @@
        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,6 +657,7 @@
        OrderPakoutService orderPakoutService;
        @Autowired
        OrderDetlPakoutService orderDetlPakoutService;

        @PostConstruct
        public void postConstruct(){
            for(OrderInAndOutType orderInAndOutType : EnumSet.allOf(OrderInAndOutType.class)){