#

whycq

2025-05-07 0e6a308dcd198a0c4aeeb8162bd1a4d1a787b016

#

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

@@ -286,12 +286,6 @@
    private String memo;


    /**
     * 工序状态
     */
    @ApiModelProperty(value= "工序状态 1：待加工，2：已加工，3：无需加工")
    @TableField("process_sts")
    private Integer processSts;

    public OrderDetlLog() {}

@@ -335,7 +329,6 @@
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.processSts = processSts;
    }

    public String getOrderId$(){
@@ -347,21 +340,6 @@
        return null;
    }

    public String getProcessSts$(){
        if (null == this.processSts){ return null; }
        switch (this.processSts){
            case 0:
                return "其他";
            case 1:
                return "待加工";
            case 2:
                return "已加工";
            case 3:
                return "无需加工";
            default:
                return String.valueOf(this.processSts);
        }
    }

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -23,10 +23,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.*;

/**
 * 移动端服务核心类
@@ -115,7 +112,14 @@
                combMat.setBatch("");
            }
        }

        HashMap<String,Object> cM=new HashMap<>();
        for (CombParam.CombMat combMat : param.getCombMats()) {
            if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
                cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
            }else {
                throw new CoolException("组托数据中存在重复的数据===>>编码：" + combMat.getMatnr()+"批号："+combMat.getBatch());
            }
        }



@@ -259,7 +263,14 @@
                combMat.setBatch("");
            }
        }

        HashMap<String,Object> cM=new HashMap<>();
        for (CombParam.CombMat combMat : param.getCombMats()) {
            if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
                cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
            }else {
                throw new CoolException("组托数据中存在重复的数据===>>编码：" + combMat.getMatnr()+"批号："+combMat.getBatch());
            }
        }



@@ -424,6 +435,14 @@
                combMat.setBatch("");
            }
        }
        HashMap<String,Object> cM=new HashMap<>();
        for (CombParam.CombMat combMat : param.getCombMats()) {
            if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
                cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
            }else {
                throw new CoolException("组托数据中存在重复的数据===>>编码：" + combMat.getMatnr()+"批号："+combMat.getBatch());
            }
        }




 src/main/java/com/zy/common/config/CoolExceptionHandler.java

@@ -26,6 +26,7 @@

    @ExceptionHandler(CoolException.class)
    public R handleRRException(CoolException e) {
        e.printStackTrace();
        String[] split = e.getMessage().split("-");
        if (split.length == 2) {
            if (String.valueOf(split[0]).length() < 3) {

 src/main/java/com/zy/common/model/TaskDto.java

@@ -1,5 +1,6 @@
package com.zy.common.model;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -107,6 +108,8 @@
                    }
                }
                if (dto.getAnfme() > locDetl.getAnfme()) {
                    System.out.println(JSON.toJSON(dto));
                    System.out.println(JSON.toJSON(locDetl));
                    throw new CoolException("服务器内部错误");
                }
                if (dto.getAnfme().equals(locDetl.getAnfme())) {

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

@@ -25,7 +25,7 @@
        url: baseUrl+'/orderDetl/pakout/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        limits: [15, 30, 50, 100, 200, 1000],
        toolbar: '#orderDetToolbar',
        height: 'full-120',
        where: {order_id: 9999999999},

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

@@ -303,7 +303,7 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/out.js?v=1" charset="utf-8"></script>
<!--<script type="text/template" id="takeSiteSelectTemplate">-->
<!--    {{#each data}}-->
<!--    <option value="{{siteId}}">{{desc}}</option>-->