海诺尔 物料打印码 pda移库增加

zyx

2024-02-28 273e605c07488911229da645df2f4b128c2d14e4

 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;
@@ -134,13 +133,13 @@
                DateUtils.convert(now),    // 单据日期
                param.getDocType(),    // 单据类型
                null,    // 项目编号
                null,    //
                param.getItemName(),    //
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                null,    // 联系方式
                param.getNumber(),    // 票据号
                param.getCstmr(),    // 客户编号
                param.getCstmrName(),    // 客户
                param.getTel(),    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
                null,    // 优惠率
@@ -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("保存订单明细档失败");
@@ -220,9 +209,14 @@
        Date now = new Date();
        Long userId = getUserId();
        // 修改主档
        if (!param.getDocType().equals(order.getDocType())) {
        if (!param.getDocType().equals(order.getDocType()) || param.getCstmrName() != order.getCstmrName() || !Cools.eq(param.getItemName(),order.getItemName())) {
            order.setDocType(param.getDocType());
            order.setUpdateBy(userId);
            order.setCstmr(param.getCstmr());
            order.setCstmrName(param.getCstmrName());
            order.setTel(param.getTel());
            order.setNumber(param.getNumber());
            order.setItemName(param.getItemName());
            order.setUpdateTime(now);
            if (!orderService.updateById(order)) {
                throw new CoolException("修改订单类型失败");
@@ -350,16 +344,22 @@
    }

    @RequestMapping(value = "/orderQuery/auth")
    @ManagerAuth
//    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        wrapper.like("order_no", condition);
        wrapper.le("settle",3);
        Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Order order : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", order.getId());
            map.put("value", order.getOrderNo());
            map.put("customer",order.getCstmrName());
            map.put("phone",order.getTel());
            map.put("addr",order.getNumber());
            map.put("allocate",order.getItemName());
            map.put("type","order");
            result.add(map);
        }
        return R.ok(result);
@@ -403,7 +403,7 @@
        List<OrderDetlVo> orderDetlVos=new ArrayList<>();
        OrderDetlVo orderDetlVo=new OrderDetlVo();
        for (OrderDetl o:
             list) {
                list) {
            orderDetlVo.setOrderNo(o.getOrderNo());
            orderDetlVo.setMatnr(o.getMatnr());
            orderDetlVo.setMaktx(o.getMaktx());