Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-08-06 d20289401001352bb20ca0bd614f4ef3e2c749d0

 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java

@@ -10,9 +10,11 @@
import com.example.erp.dto.sd.DeliveryDetailDTO;
import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,6 +43,8 @@
    FinishedGoodsInventoryMapper finishedGoodsInventoryMapper;
    @Autowired
    DeliveryOtherMoneyMapper deliveryOtherMoneyMapper;
    @Autowired
    LogService logService;
    @Autowired
    SysErrorService sysErrorService;

@@ -175,6 +179,11 @@
            //查询发货单是否存在
            Integer deliveryConut = deliveryMapper.getDeliveryConut(deliveryId);

            Log log = new Log();
            log.setOperator(delivery.getCreator());
            log.setOperatorId(delivery.getCreatorId());
            log.setContent(object.toString());

            if (deliveryConut != 0) {
                //编辑还原数据
                String deliveryDetailNumber = "";
@@ -205,11 +214,13 @@
                deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
                oddNumber = deliveryId;
                deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
                log.setFunction("insertDelivery修改:"+oddNumber);
            } else {
                //获取单号
                oddNumber = orderNumberSetting("发货",deliveryIdType);
                //新增发货表数据
                deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
                log.setFunction("insertDelivery新增:"+oddNumber);
            }
            double area = 0.0;
            Integer quantity = 0;
@@ -221,10 +232,12 @@
                deliveryOtherMoney.setQuantity(0.0);
            });
            double otherMoneys=0.0;

            List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//最终结果
            //获取对象集合循环进行新增修改
            if (!orderDetaillist.isEmpty()) {
                for (OrderDetail orderDetail : orderDetaillist) {
                    double deliveryDetailotherMoneys=0.0;
                    Integer calculateType=0;

                    if (orderDetail.getOrder().getOrderId()==null){
@@ -235,15 +248,21 @@
                    }
                    double deliveryDetailMoney = 0.0;
                    if (calculateType==1){
                        deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
                        deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
                                String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
                        )*orderDetail.getPrice()));
                    }else if (calculateType==2){
                        deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
                                String.format("%.2f", orderDetail.getComputeGrossArea()/orderDetail.getQuantity()*orderDetail.getDeliveryDetail().getQuantity())
                        )*orderDetail.getPrice()));
                        if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
                            deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
                                    String.format("%.2f", orderDetail.getWidth()*orderDetail.getHeight()*orderDetail.getDeliveryDetail().getQuantity()/1000000)
                            )*orderDetail.getPrice()));
                        }else{
                            deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
                                    String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
                            )*orderDetail.getPrice()));
                        }
                    }else if (calculateType==3){
                        deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
                        deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));

                    }
                    //根据订单计算方式进行金额计算
@@ -258,6 +277,7 @@
                                Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
                                if(deliveryDetailOtherMoney.get("monery")!=null){
                                    otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
                                    deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
                                    moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                                    moneryList.add(moneryItemmap);
                                }else{
@@ -293,7 +313,7 @@
                    }

                    //新增发货明细数据
                    deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney);
                    deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys);
                    //修改订单明细
                    deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
                    //修改库存表出库数量
@@ -318,7 +338,7 @@
                int intMoney= (int) Math.round(money+freight+otherMoneys);
                //修改发货明细累加面积数量金额
                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);

                logService.saveLog(log);
            } else {
                return false;
            }