单据增加业务号

pang.jiabao

2025-04-14 2f73fee4e429bd57df092ab185dfee2e1306ff09

单据增加业务号

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

@@ -2,7 +2,6 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -18,7 +17,6 @@
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import com.zy.system.entity.license.AbstractServerInfos;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +24,6 @@
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.List;

/**
 * 移动端接口控制器
@@ -433,7 +430,10 @@
    public R billQuery1(@RequestParam String billNo, @RequestParam String size) {
        Order temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", billNo));
        if (temp1 == null) {
            throw new CoolException("该订单不存在");
            temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", billNo));
            if (temp1 == null) {
                throw new CoolException("该订单不存在");
            }
        }
        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).last("and anfme > work_qty"));
        if (waitMatins == null || waitMatins.isEmpty()) {

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

@@ -8,13 +8,8 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
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 org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -80,6 +75,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        String temp = (String) param.get("temp");
        if (temp != null) {
            wrapper.where("(temp1 like '%"+temp+"%' or temp2 like '%"+temp+"%')");
            param.remove("temp");
        }
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("settle").orderBy("create_time", false);

 src/main/java/com/zy/asrs/entity/Order.java

@@ -367,6 +367,15 @@
        }
        return null;
    }
    public String getTemp$(){
        if(!Cools.isEmpty(this.temp1)) {
            return this.temp1;
        }
        if(!Cools.isEmpty(this.temp2)) {
            return this.temp2;
        }
        return "";
    }

    public String getPayType$(){
        if (null == this.payType){ return null; }

 src/main/webapp/static/js/order/order.js

@@ -43,6 +43,7 @@
        cols: [[
            {type: 'numbers'},
            {field: 'orderNo', title: '单据编号', templet: '#orderNoTpl'},
            {field: 'temp$', align: 'center', title: '业务号',  minWidth: 160, width: 160},
            {field: 'docType$', align: 'center', title: '类型',  minWidth: 160, width: 160},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 240, width: 240},
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},

 src/main/webapp/views/order/order.html

@@ -53,6 +53,11 @@
                            <input name="order_no" class="layui-input" type="text" placeholder="输入单据编号"/>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline mr0">
                            <input name="temp" class="layui-input" type="text" placeholder="输入业务号"/>
                        </div>
                    </div>
                    <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">