自动化立体仓库 - WMS系统
zyx
2024-01-08 71d838e032d13a46a07917f5606862496220ea74
src/main/java/com/zy/asrs/controller/OrderController.java
@@ -9,7 +9,6 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.OrderDetlVo;
@@ -169,14 +168,7 @@
        }
        List<DetlDto> list = new ArrayList<>();
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            if (Cools.isEmpty(orderDetl.getOwner())){
                throw new CoolException("保存订单明细档失败,请输入货主编号");
            }else {
                LocOwner locOwner = locOwnerService.selectById(orderDetl.getOwner());
                if (Cools.isEmpty(locOwner)){
                    throw new CoolException("保存订单明细档失败,请输入存在的货主编号(整数)");
                }
            }
            if (orderDetl.getBatch() == null) {
                orderDetl.setBatch("");
            }
@@ -197,9 +189,6 @@
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if(orderDetl.getPayment() == null){
                    orderDetl.setPayment(1);
                }
                orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");
@@ -238,7 +227,8 @@
        List<DetlDto> list = new ArrayList<>();
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            if (DetlDto.has(list, dto)) {
            //if (DetlDto.has(list, dto)) {
            if(false){
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {