#杰克缝纫机立库 【根据单号检索单据数据】 优化

luxiaotao1123

2022-03-25 045c46e4891afefd6d1d9d8988f1416eacd3de1b

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -10,7 +9,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.InitOrderParam;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.common.web.BaseController;
@@ -54,9 +53,9 @@
    }

    @RequestMapping(value = "/order/form/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "手动添加订单")
    @Transactional
    public R formAdd(@RequestBody InitOrderParam param){
    public R formAdd(@RequestBody OrderDomainParam param){
        Order order = orderService.selectByNo(param.getOrderNo());
        if (order != null) {
            return R.error("单据编号已存在");
@@ -108,6 +107,7 @@
            orderDetl.setUpdateBy(getUserId());
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("保存订单明细档失败");
            }
@@ -116,15 +116,56 @@
    }

    @RequestMapping(value = "/order/form/modify/auth")
    @ManagerAuth
    public R formModify(@RequestBody InitOrderParam param){
        System.out.println(JSON.toJSONString(param));
        return R.ok();
    @ManagerAuth(memo = "手动修改订单")
    @Transactional
    public R formModify(@RequestBody OrderDomainParam param){
        Order order = orderService.selectById(param.getOrderId());
        if (order == null || order.getStatus() == 0) {
            return R.error("订单不存在");
        }
        Date now = new Date();
        Long userId = getUserId();
        // 修改主档
        if (!param.getDocType().equals(order.getDocType())) {
            order.setDocType(param.getDocType());
            order.setUpdateBy(userId);
            order.setUpdateTime(now);
            if (!orderService.updateById(order)) {
                throw new CoolException("修改订单类型失败");
            }
        }
        // 修改明细档
        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        // 1.清空明细档
        if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
            throw new CoolException("清空订单明细失败");
        }
        // 2.重组数据
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            OrderDetl detl = orderDetlService.findByLook(orderDetls, order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
            // 新增
            if (detl == null) {
                detl = orderDetl;
                detl.setOrderId(order.getId());
                detl.setCreateTime(now);
                detl.setCreateBy(userId);
                detl.setUpdateTime(now);
                detl.setUpdateBy(userId);
                detl.setStatus(1);
                detl.setQty(0.0D);
            // 修改
            } else {
                detl.setAnfme(orderDetl.getAnfme());    // 修改数量
                detl.setUpdateTime(now);
                detl.setUpdateBy(userId);
            }
            // 持久化
            if (!orderDetlService.insert(detl)) {
                throw new CoolException("新增订单明细失败");
            }
        }
        return R.ok("订单修改成功");
    }







@@ -166,25 +207,8 @@
        }
    }

    @RequestMapping(value = "/order/add/auth")
    @ManagerAuth
    public R add(Order order) {
        orderService.insert(order);
        return R.ok();
    }

   @RequestMapping(value = "/order/update/auth")
   @ManagerAuth
    public R update(Order order){
        if (Cools.isEmpty(order) || null==order.getId()){
            return R.error();
        }
        orderService.updateById(order);
        return R.ok();
    }

    @RequestMapping(value = "/order/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "手动删除订单")
    public R delete(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        if (order != null) {
@@ -217,7 +241,7 @@
        for (Order order : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", order.getId());
            map.put("value", order.getId());
            map.put("value", order.getOrderNo());
            result.add(map);
        }
        return R.ok(result);