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

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

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -10,20 +11,21 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.entity.MatExcel;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.QrCode;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -42,6 +44,12 @@
    private MatService matService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Value("${mes.address.url}")
    private String url;
    @Value("${mes.address.cxaddress}")
    private String cxaddress;
    @Autowired
    private ApiLogService apiLogService;

    @RequestMapping(value = "/mat/auto/matnr/auth")
    public R autoMatnr(){
@@ -80,7 +88,92 @@
    @RequestMapping(value = "/mat/auth")
    @ManagerAuth
    public R find(@RequestParam("matnr") String matnr) {
        return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
        Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr));
        if(Cools.isEmpty(mat)){
            LinkedHashMap<String,Object> map = new LinkedHashMap<>();
            LinkedHashMap<String,Object> YongHuCanShu=new LinkedHashMap<>();
            YongHuCanShu.put("QianMingId","");
            map.put("YongHuCanShu",YongHuCanShu);
            LinkedHashMap<String,Object> QiTaCanShu=new LinkedHashMap<>();
            QiTaCanShu.put("GnBm","bopp_TM302D12");
            QiTaCanShu.put("pagesize",50);
            QiTaCanShu.put("pageindex",1);
            QiTaCanShu.put("Operation","1");

            List<LinkedHashMap<String,Object>> XhJiHes=new ArrayList<>();
            LinkedHashMap<String,Object> XhJiHe=new LinkedHashMap<>();
            XhJiHe.put("Xh1","1");
            XhJiHe.put("Xh2",2);
            XhJiHes.add(XhJiHe);
            QiTaCanShu.put("XhJiHe",XhJiHes);
            QiTaCanShu.put("条件一"," and t1.tm_xj like ##"+"%"+matnr+"%"+"##");
            map.put("QiTaCanShu",QiTaCanShu);


            HashMap<String,Object>hashMap=new HashMap<String,Object>();
            hashMap.put("Quanjucanshu","%7B%22XiTongCanShu%22%3A%7B%22xt_id%22%3A%2230077%22%2C%22xt_bm%22%3A%22undefined%22%2C%22xt_yhid%22%3A%22156%22%2C%22xt_yhms%22%3A%22%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yhbm%22%3A%22admin%22%2C%22xt_qyms%22%3A%221%22%2C%22xt_qyjc%22%3A%221%22%2C%22xt_jsms%22%3A%22%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yuyan%22%3A%22%22%7D%2C%22NeiBuCanShu%22%3A%7B%7D%7D");

            String jsonString = JSON.toJSONString(map);
            HashMap<String,Object>CanShuJi=new HashMap<String,Object>();
            CanShuJi.put("CanShuJi",jsonString);
            System.out.println(JSON.toJSONString(CanShuJi));
            String response = "";
            boolean success = false;
            try {
                response = new HttpHandler.Builder()
                        .setHeaders(hashMap)
                        .setUri(url)
                        .setPath(cxaddress)
                        .setParams(CanShuJi)
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getString("BianHao").equals("0000")) {
                    Object jieGuo = jsonObject.get("JieGuo");
                    JSONObject jsonString1 = JSON.parseObject(jieGuo.toString());
                    JSONObject jsonString2 = JSON.parseObject(jsonString1.get("peizhidingyicanshu").toString());
                    JSONArray sqlyujujg = JSON.parseArray(jsonString2.get("sqlyujujg").toString());
                    JSONObject jsonString3 = JSON.parseObject(sqlyujujg.get(0).toString());
                    //添加物料档案
                    Mat mat1=new Mat();
                    mat1.setMatnr(jsonString3.getString("生产批号"));
                    mat1.setMaktx(jsonString3.getString("产品名称"));
                    mat1.setSpecs(jsonString3.getString("产品规格"));
                    mat1.setUnit(jsonString3.getString("单位"));
                    mat1.setModel(jsonString3.getString("制单人"));
                    mat1.setColor(jsonString3.getString("状态"));
                    mat1.setPrice(jsonString3.getDouble("生产数量"));
                    mat1.setSku(jsonString3.getString("生产批号"));
                    mat1.setOrigin(jsonString3.getString("胶量"));
                    mat1.setBarcode(jsonString3.getString("条码"));
                    mat1.setManu(jsonString3.getString("质量状态"));
                    matService.insert(mat1);
                    mat=mat1;
                    success=true;

                } else {
                    throw new CoolException("wms请求mes查询物料信息失败");
                }
            } catch (Exception e) {
                return R.error(e.getMessage());
            } finally {
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "wms请求mes查询物料信息",
                            url+"/"+cxaddress,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(map),
                            response,
                            success
                    );
                } catch (Exception e) {
                    R.error(e.toString());
                }
            }
        }
        return R.ok(mat);
    }

    @RequestMapping(value = "/mat/list/auth")

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

@@ -88,15 +88,15 @@
    /**
     * 型号
     */
    @ApiModelProperty(value= "型号")
    @ExcelProperty(value = "型号")
    @ApiModelProperty(value= "制单人")
    @ExcelProperty(value = "制单人")
    private String model;

    /**
     * 颜色
     */
    @ApiModelProperty(value= "颜色")
    @ExcelProperty(value = "颜色")
    @ApiModelProperty(value= "状态")
    @ExcelProperty(value = "状态")
    private String color;

    /**
@@ -116,15 +116,15 @@
    /**
     * 单价
     */
    @ApiModelProperty(value= "单价")
    @ExcelProperty(value = "单价")
    @ApiModelProperty(value= "生产数量")
    @ExcelProperty(value = "生产数量")
    private Double price;

    /**
     * sku
     */
    @ApiModelProperty(value= "sku")
    @ExcelProperty(value = "sku")
    @ApiModelProperty(value= "生产批号")
    @ExcelProperty(value = "生产批号")
    private String sku;

    /**
@@ -144,15 +144,15 @@
    /**
     * 产地
     */
    @ApiModelProperty(value= "产地")
    @ExcelProperty(value = "产地")
    @ApiModelProperty(value= "胶量")
    @ExcelProperty(value = "胶量")
    private String origin;

    /**
     * 厂家
     */
    @ApiModelProperty(value= "厂家")
    @ExcelProperty(value = "厂家")
    @ApiModelProperty(value= "质量状态")
    @ExcelProperty(value = "质量状态")
    private String manu;

    /**

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

@@ -100,6 +100,14 @@
        if (param.getCombMats().size()>1){
            throw new CoolException("不允许混料===>>" + param.getBarcode());
        }
        Mat mat1 = matService.selectByMatnr(param.getCombMats().get(0).getMatnr());
        if(!Cools.isEmpty(mat1)){
            param.getCombMats().get(0).setBatch(mat1.getMatnr());
            param.getCombMats().get(0).setAnfme(mat1.getPrice());
        }
        if(Cools.isEmpty(param.getCombMats().get(0).getBatch())){
            throw new CoolException("批号（唯一码）不能为空===>>" + param.getBarcode());
        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));

 src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java

@@ -54,7 +54,10 @@
        if(config.getStatus()==0){
            return;
        }

        WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no",200));
        if(!Cools.isEmpty(wrkMast1)){
            return;
        }
        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 200));
        if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) {
            //找到入库最早的

 src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java

@@ -52,7 +52,7 @@

        List<WorkIssuedResult.Tasks> tasks = new ArrayList<>();
        WorkIssuedResult.Tasks task = new WorkIssuedResult.Tasks();
        task.setTaskId(wrkMast.getWrkNo().toString());
        task.setTaskId(wrkMast.getWrkNo().toString()+"-"+new Date().getTime());
        task.setBarCode(wrkMast.getBarcode());
        task.setOrder(i);


 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -1,21 +1,30 @@
package com.zy.asrs.task.handler;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import javafx.scene.input.DataFormat;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Iterator;
import java.util.List;
import java.text.SimpleDateFormat;
import java.util.*;

/**
 * Created by vincent on 2020/7/6
@@ -38,62 +47,36 @@
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private OrderService orderService;
    @Value("${mes.address.url}")
    private String url;
    @Value("${mes.address.outaddressSave}")
    private String outaddressSave;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private ConfigService configService;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            // 修改订单状态 作业中 ===>> 已完成
            if (!Cools.isEmpty(wrkDetls)) {
                Iterator<WrkDetl> iterator = wrkDetls.iterator();
                while (iterator.hasNext()) {
                    WrkDetl wrkDetl = iterator.next();
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        orderService.checkComplete(wrkDetl.getOrderNo());
                        iterator.remove();
                    }
                }
            }

            // 入库 --------------------------------------------------------------------------------
            if (wrkMast.getWrkSts() == 5) {
        List<WrkDetl> wrkDetl = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        String formattedDate = sdf.format(wrkMast.getModiTime());
        Config config=configService.selectConfigByCode("reportMes");
        if(config==null||!config.getValue().equals("Y")){
            if(wrkMast.getIoType() == 1){
                // 全板入库
                if (wrkMast.getIoType() == 1) {
                    // 入库通知单
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        // 保存入库通知档历史档
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                        // 删除入库通知档
                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                // 入库通知单
                if (!Cools.isEmpty(wrkMast.getBarcode())) {
                    // 保存入库通知档历史档
                    if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                        exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                    }
//                    // 手动入库生成单据 【 上报三方平台 】
//                    if (!Cools.isEmpty(wrkDetls)) {
//                        if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
//                            exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                        }
//                    }
                // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {
//                    if (!Cools.isEmpty(wrkDetls)) {
//                        if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
//                            exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                        }
//                    }
                    // 删除入库通知档
                    if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                        exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                    }
                }

            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 15) {
//                if (!Cools.isEmpty(wrkDetls)) {
//                    if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
//                        exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                    }
//                }
            }

            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
@@ -110,6 +93,156 @@
            if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
            }
        }
        try {
            LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
            String GnBm ="";
            String Biaomc="";

            List<LinkedHashMap<String,Object>> Baocuncanshus = new ArrayList<LinkedHashMap<String,Object>>();
            LinkedHashMap<String,Object> Baocuncanshu=new LinkedHashMap<String,Object>();


            // 入库 --------------------------------------------------------------------------------
            if (wrkMast.getIoType() == 1) {
                GnBm = "bopp_ck1070d0e";
                Biaomc = "bopp_j000000";
                Baocuncanshu.put("bh","");
                Baocuncanshu.put("djlb","半成品入库");
                Baocuncanshu.put("rq",formattedDate);
                Baocuncanshu.put("startStorageId","");//起始位置
                Baocuncanshu.put("endStorageId","");//目标位置
                Baocuncanshu.put("tm_dp_wms",wrkMast.getBarcode());//托盘码
                Baocuncanshu.put("shbz","立库");//位置类别
                Baocuncanshu.put("bz","");//备注
                Baocuncanshu.put("ck","立库");//仓库
                Baocuncanshus.add(Baocuncanshu);
                // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getIoType() == 101) {
                GnBm = "bopp_ck1090d0e";
                Biaomc = "bopp_j000000";
                Baocuncanshu.put("bh","");
                Baocuncanshu.put("djlb","普通调拨");
                Baocuncanshu.put("rq",formattedDate);
                Baocuncanshu.put("yck","布基半成品仓");
                Baocuncanshu.put("xck","复卷1#机起点");
                Baocuncanshu.put("bh_bopp_e050000","");
                Baocuncanshu.put("ykw","库位2");
                Baocuncanshu.put("bz","");//备注
                Baocuncanshu.put("xkw","FJ-01-01-01");
                Baocuncanshus.add(Baocuncanshu);
            }

            LinkedHashMap<String,Object> YongHuCanShu= new LinkedHashMap<String,Object>();
            YongHuCanShu.put("QianMingId","");
            map.put("YongHuCanShu",YongHuCanShu);

            LinkedHashMap<String,Object> QiTaCanShu= new LinkedHashMap<String,Object>();
            QiTaCanShu.put("GnBm",GnBm);
            QiTaCanShu.put("Operation", "1");
            QiTaCanShu.put("zid", "");
            QiTaCanShu.put("shbz", "");
            QiTaCanShu.put("shjg", "");

            List<LinkedHashMap<String,Object>> Caozuojihes = new ArrayList<LinkedHashMap<String,Object>>();
            LinkedHashMap<String,Object>Caozuojihe =new LinkedHashMap<String,Object>();
            Caozuojihe.put("Xh1","1");
            Caozuojihe.put("Xh2","1");
            Caozuojihe.put("Biaomc",Biaomc);


            Caozuojihe.put("Baocuncanshu",Baocuncanshus);
            Caozuojihes.add(Caozuojihe);

            LinkedHashMap<String,Object> Caozuojihe1=new LinkedHashMap<String,Object>();
            Caozuojihe1.put("Xh1","1");
            Caozuojihe1.put("Xh2","4");
            Caozuojihe1.put("Biaomc","bopp_j000101");

            List<LinkedHashMap<String,Object>> Baocuncanshus1 = new ArrayList<LinkedHashMap<String,Object>>();
            LinkedHashMap<String,Object> Baocuncanshu1=new LinkedHashMap<String,Object>();
            Baocuncanshu1.put("tm_xj",wrkDetl.get(0).getBatch());//唯一码
            Baocuncanshus1.add(Baocuncanshu1);
            Caozuojihe1.put("Baocuncanshu",Baocuncanshus1);

            Caozuojihes.add(Caozuojihe1);

            QiTaCanShu.put("Caozuojihe", Caozuojihes);

            map.put("QiTaCanShu",QiTaCanShu);

            HashMap<String,Object>hashMap=new HashMap<String,Object>();
            hashMap.put("Quanjucanshu","%7B%22XiTongCanShu%22%3A%7B%22xt_id%22%3A%2230077%22%2C%22xt_bm%22%3A%22undefined%22%2C%22xt_yhid%22%3A%22156%22%2C%22xt_yhms%22%3A%22%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yhbm%22%3A%22admin%22%2C%22xt_qyms%22%3A%221%22%2C%22xt_qyjc%22%3A%221%22%2C%22xt_jsms%22%3A%22%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yuyan%22%3A%22%22%7D%2C%22NeiBuCanShu%22%3A%7B%7D%7D");

            String jsonString = JSON.toJSONString(map);
            HashMap<String,Object>hashMap1=new HashMap<String,Object>();
            hashMap1.put("CanShuJi",jsonString);
            String response = "";
            boolean success = false;
            try {
                response = new HttpHandler.Builder()
                        .setHeaders(hashMap)
                        .setUri(url)
                        .setPath(outaddressSave)
                        .setParams(hashMap1)
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getString("BianHao").equals("0000")) {
                    success=true;
                    if(wrkMast.getIoType() == 1){
                        // 全板入库
                        // 入库通知单
                        if (!Cools.isEmpty(wrkMast.getBarcode())) {
                            // 保存入库通知档历史档
                            if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                                exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                            }
                            // 删除入库通知档
                            if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                                exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                            }
                        }
                    }
                    // 保存工作主档历史档
                    if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                        exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
                    }
                    // 删除工作主档
                    if (!wrkMastService.deleteById(wrkMast)) {
                        exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
                    }
                    // 保存工作明细档历史档
                    if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
//                exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
                    }
                    // 删除工作明细档
                    if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
                    }

                } else {
                    log.error("wms上报结果给mes失败！！！url：{}；request：{}；response：{}", url+"/"+outaddressSave, JSON.toJSONString(map), response);
                    throw new CoolException("wms上报结果给mes失败");
                }
            } catch (Exception e) {
                log.error("fail", e);
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg(e.getMessage());
            } finally {
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "wms上报结果给mes",
                            url+"/"+outaddressSave,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(map),
                            response,
                            success
                    );
                } catch (Exception e) { log.error("", e); }
            }
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();

 src/main/java/com/zy/common/CodeRes.java

@@ -5,14 +5,14 @@
public interface CodeRes extends BaseRes {

    // user
    String USER_10001 = "1-账号不存在";
    String USER_10002 = "1-账号已被禁用";
    String USER_10003 = "1-密码错误";
    String USER_10001 = "10001-账号不存在";
    String USER_10002 = "10002-账号已被禁用";
    String USER_10003 = "10003-密码错误";

    String SYSTEM_20001 = "1-许可证已失效";
    String SYSTEM_20001 = "20001-许可证已失效";

    String EXIST_500 = "1-工作档/库存条码数据已存在";
    String PICK_600 = "1-拣料任务";
    String NO_COMB_700 = "1-请先组托";
    String EXIST_500 = "500-工作档/库存条码数据已存在";
    String PICK_600 = "600-拣料任务";
    String NO_COMB_700 = "700-请先组托";

}

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

@@ -119,8 +119,8 @@
            User user = userService.selectById(userLogin.getUserId());
//            String deToken = Cools.deTokn(token, user.getPassword());
//            long timestamp = Long.parseLong(deToken.substring(0, 13));
            // 15分钟后过期
            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
            // 180分钟后过期
            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 10800000){
                Http.response(response, BaseRes.DENIED);
                return false;
            }

 src/main/java/com/zy/common/web/WcsController.java

@@ -321,7 +321,8 @@
    @PostMapping("/fromwcs/task")
    @ResponseBody
    public Re status(@RequestBody StatusParam statusParam) {
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", statusParam.getTaskId()));
        String[] wrkNo=statusParam.getTaskId().split("-",2);
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.parseInt(wrkNo[0])));
        if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()!=8){
            return Re.error("没有找到:"+statusParam.getTaskId()+"这条任务");
        }else if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8){

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8085
  port: 8086
  servlet:
    context-path: /@pom.build.finalName@

@@ -19,7 +19,7 @@
    host: localhost
    port: 6379
    database: 0
#    password: xltys1995
  #    password: xltys1995
  servlet:
    multipart:
      maxFileSize: 100MB
@@ -58,17 +58,17 @@
  # 右深库位排号
  doubleLocsRight: 4,8,12,16
  #是否开启wms下发任务给wcs
  workIssued-fig : true
  workIssued-fig: true
  #地址
  url : 192.168.110.100:8082
  url: 192.168.110.100:8082
  #wms下发任务给wcs
  workIssued : fromWms/taskReceive
  workIssued: fromWms/taskReceive
  #库位同步
  loc: fromWms/cargoNoSyn
  #入库站
  inDevp : 100
  inDevp: 100
  #出库站
  outDevp : 200
  outDevp: 200
# wms参数配置
wms-parameter:
  # 自动补空板功能开关
@@ -82,6 +82,16 @@

comb:
  limit: 5000

#mes对接
mes:
  switch:
    boo: false
  address:
    url: http://220.189.244.250:10082
    outaddressSave: hmxtapi/Yh_SP/TiJiaoShuJu_AnNui
    cxaddress: hmxtapi/Yh_SP/d12_0102


#erp对接
erp:
@@ -107,7 +117,7 @@
    #结果上报（审核）单地址
    outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
  #  登录账号管理
  login :
  login:
    acctID: "647e849ab6fa0f"
    username: "llw"
    password: "666666"

 src/main/resources/license.lic

Binary files differ

 src/main/webapp/static/js/common.js

@@ -225,21 +225,21 @@
    {field: 'matnr', align: 'center',title: '商品编号（品号）', sort:true}
    ,{field: 'maktx', align: 'center',title: '商品名称（品名）', sort:true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
    ,{field: 'batch', align: 'center',title: '货品特征', sort:true}
    ,{field: 'anfme', align: 'center',title: '数量', hide: false}
    ,{field: 'batch', align: 'center',title: '生产批号', sort:true}
    ,{field: 'anfme', align: 'center',title: '生产数量', hide: false}
    ,{field: 'zpallet', align: 'center',title: '托盘条码', hide: false}

    ,{field: 'specs', align: 'center',title: '规格', hide: false}
    ,{field: 'model', align: 'center',title: '代码', hide: true}
    ,{field: 'color', align: 'center',title: '颜色', hide: true}
    ,{field: 'specs', align: 'center',title: '产品规格', hide: false}
    ,{field: 'model', align: 'center',title: '制单人', hide: false}
    ,{field: 'color', align: 'center',title: '状态', hide: false}
    ,{field: 'brand', align: 'center',title: '品牌', hide: true}
    ,{field: 'unit', align: 'center',title: '单位', hide: false}
    ,{field: 'price', align: 'center',title: '单价', hide: true}
    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
    ,{field: 'units', align: 'center',title: '单位量', hide: true}
    ,{field: 'barcode', align: 'center',title: '条码', hide: true}
    ,{field: 'origin', align: 'center',title: '产地', hide: true}
    ,{field: 'manu', align: 'center',title: '厂家', hide: true}
    ,{field: 'origin', align: 'center',title: '胶量', hide: false}
    ,{field: 'manu', align: 'center',title: '质量状态', hide: false}
    ,{field: 'manuDate', align: 'center',title: '生产日期', hide: true}
    ,{field: 'itemNum', align: 'center',title: '品项数', hide: true}
    ,{field: 'safeQty', align: 'center',title: '安全库存量', hide: true}

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -9,17 +9,17 @@
        ,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true}
        ,{field: 'anfme', align: 'center',title: '数量'}
        ,{field: 'zpallet', align: 'center',title: '托盘条码'}
        ,{field: 'specs', align: 'center',title: '规格'}
        ,{field: 'model', align: 'center',title: '代码', hide: true}
        ,{field: 'color', align: 'center',title: '颜色', hide: true}
        ,{field: 'specs', align: 'center',title: '产品规格'}
        ,{field: 'model', align: 'center',title: '制单人', hide: false}
        ,{field: 'color', align: 'center',title: '状态', hide: false}
        ,{field: 'brand', align: 'center',title: '品牌', hide: true}
        ,{field: 'unit', align: 'center',title: '单位', hide: true}
        ,{field: 'unit', align: 'center',title: '单位', hide: false}
        ,{field: 'price', align: 'center',title: '单价', hide: true}
        ,{field: 'sku', align: 'center',title: 'sku', hide: true}
        ,{field: 'units', align: 'center',title: '单位量', hide: true}
        ,{field: 'barcode', align: 'center',title: '条码', hide: true}
        ,{field: 'origin', align: 'center',title: '产地', hide: true}
        ,{field: 'manu', align: 'center',title: '厂家', hide: true}
        ,{field: 'origin', align: 'center',title: '胶量', hide: false}
        ,{field: 'manu', align: 'center',title: '质量状态', hide: false}
        ,{field: 'manuDate', align: 'center',title: '生产日期', hide: true}
        ,{field: 'itemNum', align: 'center',title: '品项数', hide: true}
        ,{field: 'safeQty', align: 'center',title: '安全库存量', hide: true}