*

lsh

昨天 342108bdc3b08ba44b99d9e147cb9c97d387db23

 src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java

@@ -18,6 +18,7 @@

import java.util.ArrayList;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;

import static org.reflections.Reflections.log;
@@ -31,6 +32,8 @@
    private String action = "";
    private String orderName = "";
    private Long userId = 9999L;
    private boolean signDanger = true;
    private String groupGoodsNo = "";


    public OrderOutBatchUtil() {
@@ -45,7 +48,7 @@
        this.cstmrName = cstmrName;
    }

    public OrderOutBatchUtil(String orderOneNo, String cstmrName, String ip, String action,String orderName) {
    public OrderOutBatchUtil(String orderOneNo, String cstmrName, String ip, String action,String orderName,boolean signDanger) {
        this.errorMsgOrderLoc = "";
        this.sign = true;
        this.orderOneNo = orderOneNo;
@@ -54,6 +57,20 @@
        this.action = action;
        this.orderName = orderName;
        this.userId = 9999L;
        this.signDanger = signDanger;
    }

    public OrderOutBatchUtil(String orderOneNo, String cstmrName, String ip, String action,String orderName,boolean signDanger,String groupGoodsNo ) {
        this.errorMsgOrderLoc = "";
        this.sign = true;
        this.orderOneNo = orderOneNo;
        this.cstmrName = cstmrName;
        this.ip = ip;
        this.action = action;
        this.orderName = orderName;
        this.userId = 9999L;
        this.signDanger = signDanger;
        this.groupGoodsNo = groupGoodsNo;
    }

    public R setOrderOutBatch() {
@@ -81,11 +98,13 @@
                        continue;
//                        throw new CoolException("箱号："+outLocBoxC[0]+" 未查询到数据！！！");
                    }
//                    if (!locDetlSou.getDanger$().equals(outLocBoxC[4])) {
//                        sign = false;
//                        errorMsgOrderLoc = errorMsgOrderLoc + "[===》" + "箱号：" + outLocBoxC[0] + " ==》出库输入待判状态：" + outLocBoxC[4] + "、库存状态：" + locDetlSou.getDanger$() + "。状态不匹配《===]";
//                        continue;
//                    }
                    if (signDanger){
                        if (!locDetlSou.getDanger$().equals(outLocBoxC[4])) {
                            sign = false;
                            errorMsgOrderLoc = errorMsgOrderLoc + "[===》" + "箱号：" + outLocBoxC[0] + " ==》出库输入待判状态：" + outLocBoxC[4] + "、库存状态：" + locDetlSou.getDanger$() + "。状态不匹配《===]";
                            continue;
                        }
                    }
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlSou.getLocNo()));
                    if (Cools.isEmpty(locMast)) {
                        sign = false;
@@ -174,6 +193,7 @@
            param.setOrderNo(orderOneNo);
            param.setCstmrName(cstmrName);
            param.setOrderName(orderName);
            param.setGroupGoodsNo(groupGoodsNo);

            if (sign && total > 0) {
                workService.startupFullTakeStoreOrder(param, 9999L);