*

lsh

昨天 dfdf98629fa109a18a76bcc00a63a812c4ecbcaa

*

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

@@ -1132,6 +1132,36 @@

    }

//    /*
//     * FQC质检 退库至2楼
//     * */
//    @Override
//    @Transactional
//    public R qualityInspection(QualityInspectionParam param) {
//        try{
////            String[] split = param.getModel().split(",");
////            if (Cools.isEmpty(split)){
////                throw new CoolException("参数：卷号 Model为空,解析失败！！！");
////            }
//            List<String[]> OutLocBoxCs = new ArrayList<>();
//            String orderNo = "TK" + snowflakeIdWorker.nextId();
//            String cstmrName = "未知";
////            for (String model:split){
//            String[] outLocBox = new String[]{param.getBoxNo(),orderNo,cstmrName,param.getMemo(),"不合格"};
//            OutLocBoxCs.add(outLocBox);
////            }
//
//            if (!OutLocBoxCs.isEmpty()){
//                OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,cstmrName,"","MES下发不合格退货","不合格退货",true);
//                return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
//            }
//        } catch (Exception e) {
//            throw new CoolException("对应箱号："+param.getBoxNo()+"的物料退库至2楼失败"+e.getMessage());
//        }
//        return R.error("对应箱号："+param.getBoxNo()+"的物料退库至2楼失败");
//
//    }

    /*
     * 正常退库至二楼包装
     * */
@@ -1152,7 +1182,7 @@
//            }

            if (!OutLocBoxCs.isEmpty()){
                OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,cstmrName,"","MES下发退货至二楼","退货至二楼");
                OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,cstmrName,"","MES下发退货至二楼","退货至二楼",false);
                return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
            }
        } catch (Exception e) {

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

@@ -31,6 +31,7 @@
    private String action = "";
    private String orderName = "";
    private Long userId = 9999L;
    private boolean signDanger = true;


    public OrderOutBatchUtil() {
@@ -45,7 +46,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 +55,7 @@
        this.action = action;
        this.orderName = orderName;
        this.userId = 9999L;
        this.signDanger = signDanger;
    }

    public R setOrderOutBatch() {
@@ -81,11 +83,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;