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;

@@ -160,7 +164,7 @@
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();


        try {
            String deliveryId="";
            String oddNumber;
            if (object.get("deliveryId") != null) {
@@ -168,11 +172,17 @@
            } else {
                deliveryId = "";
            }
            String deliveryIdType = object.get("deliveryIdType").toString();
            Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
            List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
            List<DeliveryOtherMoney> deliveryOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(object.get("otherMoney")), DeliveryOtherMoney.class);
            //查询发货单是否存在
            Integer deliveryConut = deliveryMapper.getDeliveryConut(deliveryId);

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

            if (deliveryConut != 0) {
                //编辑还原数据
@@ -204,11 +214,13 @@
                deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
                oddNumber = deliveryId;
                deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
                log.setFunction("insertDelivery修改:"+oddNumber);
            } else {
                //获取单号
                oddNumber = orderNumberSetting("发货");
                oddNumber = orderNumberSetting("发货",deliveryIdType);
                //新增发货表数据
                deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
                log.setFunction("insertDelivery新增:"+oddNumber);
            }
            double area = 0.0;
            Integer quantity = 0;
@@ -220,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){
@@ -234,14 +248,21 @@
                    }
                    double deliveryDetailMoney = 0.0;
                    if (calculateType==1){
                        deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)))
                                *orderDetail.getDeliveryDetail().getQuantity()*orderDetail.getPrice()));
                    }else if (calculateType==2){
                        deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
                                String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)*orderDetail.getDeliveryDetail().getQuantity())
                        deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
                                String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
                        )*orderDetail.getPrice()));
                    }else if (calculateType==2){
                        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()));

                    }
                    //根据订单计算方式进行金额计算
@@ -254,9 +275,15 @@
                            if(isnull) {
                                Map<String, Object> moneryItemmap = new HashMap<>();
                                Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
                                otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
                                moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                                moneryList.add(moneryItemmap);
                                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{
                                    TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
                                    return false;
                                }
                            }
                        }

@@ -286,7 +313,7 @@
                    }

                    //新增发货明细数据
                    deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney);
                    deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys);
                    //修改订单明细
                    deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
                    //修改库存表出库数量
@@ -307,14 +334,24 @@
                if (delivery.getFreightPrice()!=null&&delivery.getFreightQuantity()!=null){
                    freight=delivery.getFreightPrice()*delivery.getFreightQuantity();
                }
                int intMoney= (int) Math.floor(money+freight+otherMoneys);

                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;
            }
        }catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("insertDelivery");
            sysErrorService.insert(sysError);
            saveState = false;

        }

        return saveState;
    }
@@ -367,8 +404,8 @@
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("deleteDelivery");
            sysErrorService.insert(sysError);
            saveState = false;

@@ -470,6 +507,10 @@

    public List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates) {
        return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
    }

    public boolean updateDeliveryPrintNumber(String deliveryId) {
        return deliveryMapper.updateDeliveryPrintNumber(deliveryId);
    }


@@ -718,21 +759,34 @@
        }
    }

    public String orderNumberSetting(String type) {
    public String orderNumberSetting(String type,String deliveryIdType) {
        //根据类型自动生成不同的操作单号
        String alias="";
        if(Objects.equals(type, "发货")){
            alias="FH";
        }
        //查询当天的最大数量
        Integer maximum=deliveryMapper.getmaximum(type);
        //设置两位不够补0
        String formattedNumber = String.format("%02d", maximum+1);
        //格式化当前日期
        Date currentDate = new Date();
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
        String formattedDate = dateFormat.format(currentDate);
        String oddNumbers =  alias+formattedDate+formattedNumber;
        String oddNumbers="";

        if(deliveryIdType.equals("day")){
            //查询当天的最大数量
            Integer maximum=deliveryMapper.getmaximum(type);
            //设置两位不够补0
            String formattedNumber = String.format("%02d", maximum+1);
            //格式化当前日期
            Date currentDate = new Date();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
            String formattedDate = dateFormat.format(currentDate);
             oddNumbers =  alias+formattedDate+formattedNumber;
        }else if(deliveryIdType.equals("month")){
            Integer maximum = deliveryMapper.getmaximumMonth();
            String formattedNumber = String.format("%04d", maximum+1);
            Date currentDate = new Date();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyMM");
            String formattedDate = dateFormat.format(currentDate);
            oddNumbers =  alias+formattedDate+formattedNumber;

        }

        return oddNumbers;
    }
}