Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs-erp

whycq

2024-09-04 41326b3129ae3e4ef7a45bc16dba64dc9dd27404

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

@@ -8,11 +8,13 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.AgvMobileStartPakin;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.DataFormatter;
@@ -54,6 +56,48 @@
    private MatService matService;
    @Autowired
    private AgvLocDetlService agvLocDetlService;

    @GetMapping("/doc/type/list")
    @Transactional
    @ManagerAuth(memo = "入库单据类型")
    @Synchronized
    public R docTypeList(){
        List<DocType> result = new ArrayList<>();
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> unDocIds = new ArrayList<>();
        unDocIds.add(19L);
        unDocIds.add(30L);
        unDocIds.add(32L);
        unDocIds.add(36L);
        for (DocType pakin : pakins) {
            if (!unDocIds.contains(pakin.getDocId())) {
                result.add(pakin);
            }
        }
        return R.ok().add(result);
    }

    @GetMapping("/doc/type/out/list")
    @Transactional
    @ManagerAuth(memo = "出库单据类型")
    @Synchronized
    public R docTypeOutList(){
        List<DocType> result = new ArrayList<>();
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> unDocIds = new ArrayList<>();
        unDocIds.add(18L);
        unDocIds.add(31L);
        unDocIds.add(33L);
        unDocIds.add(34L);
        unDocIds.add(35L);
        unDocIds.add(37L);
        for (DocType pakin : pakins) {
            if (!unDocIds.contains(pakin.getDocId())) {
                result.add(pakin);
            }
        }
        return R.ok().add(result);
    }

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -166,6 +210,68 @@
//        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/detls/pakin")
    @ManagerAuth
    public R orderDetlsIn(@RequestParam(defaultValue = "1")Integer curr,
                        @RequestParam(defaultValue = "100")Integer limit,
                        @RequestParam(required = false)String orderByField,
                        @RequestParam(required = false)String orderByType,
                        @RequestParam(required = false)Long docType,
                        @RequestParam Map<String, Object> param){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        param.remove("docType");
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        List<Long> unDocIds = new ArrayList<>();
        unDocIds.add(19L);
        unDocIds.add(30L);
        unDocIds.add(32L);
        unDocIds.add(36L);
        for (DocType pakin : pakins) {
            if (!unDocIds.contains(pakin.getDocId())) {
                docIds.add(pakin.getDocId());
            }
        }

        if (docIds.size() > 0) {
            if (docType > 0) {
                wrapper.in("source",docType);
            } else {
                wrapper.in("source",docIds);
            }

        } else {
            wrapper.in("source",0);
        }

        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/wait/detls/pakin/page/auth")
    @ManagerAuth
    public R waitOrderDetls(@RequestParam(defaultValue = "1")Integer curr,
                        @RequestParam(defaultValue = "100")Integer limit,
                        @RequestParam(required = false)String orderByField,
                        @RequestParam(required = false)String orderByType,
                        @RequestParam Map<String, Object> param){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 36) {
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.in("source",docIds);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    //  所有入库订单明细
    @RequestMapping(value = "/order/bcp/detls/pakin/page/auth")
    @ManagerAuth
@@ -211,6 +317,32 @@
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        for (OrderDetl record : page.getRecords()) {
            Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(),1);
            record.setStock(sumAnfme == null ? 0 : sumAnfme);
        }
        return R.ok(page);
    }
    @RequestMapping(value = "/order/backStocks/detls/pakin/page/auth")
    @ManagerAuth
    public R backStocksOrderDetls(@RequestParam(defaultValue = "1")Integer curr,
                             @RequestParam(defaultValue = "100")Integer limit,
                             @RequestParam(required = false)String orderByField,
                             @RequestParam(required = false)String orderByType,
                             @RequestParam Map<String, Object> param){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 36) {
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.in("source",docIds);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        for (OrderDetl record : page.getRecords()) {
            Double sumAnfme = agvLocDetlService.getSumAnfmeback(record.getMatnr(), record.getThreeCode(),1);
            record.setStock(sumAnfme == null ? 0 : sumAnfme);
        }
        return R.ok(page);
@@ -271,7 +403,17 @@
            throw new CoolException("保存订单主档失败");
        }
        List<DetlDto> list = new ArrayList<>();
        Boolean flag = false;
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            if (Cools.isEmpty(orderDetl.getProcessSts())) {
                orderDetl.setProcessSts(3);
            }
            if (orderDetl.getProcessSts() == 1) {
                flag = true;
            }
            if (param.getDocType() != 32) {
                orderDetl.setProcessSts(3);
            }
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
@@ -360,9 +502,79 @@
                    }
                }
            }

        }
        // 工序为1：待加工 生成加工单
        if (flag) {
            if (param.getDocType().intValue() == 32) {
                order = new Order(
                        String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                        "JG" + param.getOrderNo(),    // 订单编号
                        DateUtils.convert(now),    // 单据日期
                        35L,    // 单据类型
                        null,    // 项目编号
                        null,    //
                        null,    // 调拨项目编号
                        null,    // 初始票据号
                        null,    // 票据号
                        null,    // 客户编号
                        null,    // 客户
                        null,    // 联系方式
                        null,    // 操作人员
                        null,    // 合计金额
                        null,    // 优惠率
                        null,    // 优惠金额
                        null,    // 销售或采购费用合计
                        null,    // 实付金额
                        null,    // 付款类型
                        null,    // 业务员
                        null,    // 结算天数
                        null,    // 邮费支付类型
                        null,    // 邮费
                        null,    // 付款时间
                        null,    // 发货时间
                        null,    // 物流名称
                        null,    // 物流单号
                        1L,    // 订单状态
                        1,    // 状态
                        getUserId(),    // 添加人员
                        now,    // 添加时间
                        getUserId(),    // 修改人员
                        now,    // 修改时间
                        null    // 备注
                );
                if (!orderService.insert(order)) {
                    throw new CoolException("生成半成品调拨单失败");
                }
                List<DetlDto> dbList = new ArrayList<>();
                for (OrderDetl orderDetl : param.getOrderDetlList()) {
                    if (orderDetl.getProcessSts() != 1) continue;
                    DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
                    if (DetlDto.has(dbList, dto)) {
                        OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
                        item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                        if (!orderDetlService.updateById(item)) {
                            throw new CoolException("生成半成品调拨单明细档失败");
                        }
                    } else {
                        dbList.add(dto);
                        orderDetl.setOrderId(order.getId());
                        orderDetl.setOrderNo(order.getOrderNo());
                        orderDetl.setSource(35);
                        orderDetl.setCreateBy(getUserId());
                        orderDetl.setCreateTime(now);
                        orderDetl.setUpdateBy(getUserId());
                        orderDetl.setUpdateTime(now);
                        orderDetl.setStatus(1);
                        orderDetl.setQty(0.0D);
                        if (!orderDetlService.insert(orderDetl)) {
                            throw new CoolException("生成半成品调拨单明细档失败");
                        }
                    }
                }


            }
        }
        return R.ok("订单添加成功");
    }

@@ -405,6 +617,7 @@
                list.add(dto);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSource(param.getDocType().intValue());
                orderDetl.setCreateBy(getUserId());
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(getUserId());
@@ -669,6 +882,8 @@
                        proSts = 3;
                    }
                }
            } else {
                proSts = 3;
            }


@@ -816,6 +1031,7 @@
                    orderDetl2.setDeadTime(isocode);
                    orderDetl2.setStatus(1);
                    orderDetl2.setQty(0.0D);
                    orderDetl2.setProcessSts(proSts);
                    if (!orderDetlService.insert(orderDetl2)) {
                        throw new CoolException("生成单据明细失败，请重新导入！");
                    }
@@ -893,6 +1109,7 @@
                        orderDetl3.setDeadTime(isocode);
                        orderDetl3.setStatus(1);
                        orderDetl3.setQty(0.0D);
                        orderDetl3.setProcessSts(proSts);
                        if (!orderDetlService.insert(orderDetl3)) {
                            throw new CoolException("生成单据明细失败，请重新导入！");
                        }