*

lsh

13 小时以前 8d702fa2c62b3617f71c5e91293e338d1ccd1549

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

@@ -1163,32 +1163,39 @@
//    }

    /*
     * 正常退库至二楼包装
     * 正常退库至二楼包装  拆包装检出库
     * */
    @Override
    @Transactional
    public R packagingAreaOrderCreate(QualityInspectionParam param) {
    public R packagingAreaOrderCreate(OrderCargoBookingNoteParam param) {
        try{
//            String[] split = param.getModel().split(",");
//            if (Cools.isEmpty(split)){
//                throw new CoolException("参数：卷号 Model为空,解析失败！！！");
//            }
            List<String[]> OutLocBoxCs = new ArrayList<>();

            List<OrderOutLocBoxCsUtilParam> 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);
//            }
            for (OrderCargoBookingNoteParam.Box box : param.getBoxList()){
                for (OrderCargoBookingNoteParam.Box.Roll roll : box.getRollList()){
                    if (Cools.isEmpty(roll.getMemo())){
                        return new R(401,"卷号"+roll.getRollNo()+"的备注为空！");
                    }
                    OrderOutLocBoxCsUtilParam outLocBox = new OrderOutLocBoxCsUtilParam();
                    outLocBox.setBoxNo(box.getBoxNo());
                    outLocBox.setRoll(roll.getRollNo());
                    outLocBox.setMemo(roll.getMemo());
                    outLocBox.setOrderOneNo(orderNo);
                    outLocBox.setCstmrName(param.getCstmrName());
                    outLocBox.setDanger("随意");
                    OutLocBoxCs.add(outLocBox);
                }
            }

            if (!OutLocBoxCs.isEmpty()){
                OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,cstmrName,"","MES下发退货至二楼","退货至二楼",false);
                OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,param.getCstmrName(),"","MES下发拆包装检出库","拆包装检出库",false);
                return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
            }
        } catch (Exception e) {
            throw new CoolException("对应箱号："+param.getBoxNo()+"的物料退库至2楼失败"+e.getMessage());
            throw new CoolException("拆包装检出库退库至2楼失败"+e.getMessage());
        }
        return R.error("对应箱号："+param.getBoxNo()+"的物料退库至2楼失败");
        return R.error("拆包装检出库退库至2楼失败");
    }

    /*
@@ -1200,15 +1207,17 @@
        try{
            List<String[]> OutLocBoxCs = new ArrayList<>();
            String orderNo = "ZH" + snowflakeIdWorker.nextId();
            for (String batch:param.getBoxNoList()){
                String[] outLocBox = new String[]{batch,orderNo,param.getCstmrName(),"","合格"};
                OutLocBoxCs.add(outLocBox);
            for (OrderCargoBookingNoteParam.Box box : param.getBoxList()){
                for (OrderCargoBookingNoteParam.Box.Roll roll : box.getRollList()){
                    String[] outLocBox = new String[]{box.getBoxNo(),orderNo,param.getCstmrName(),roll.getMemo(),"合格"};
                    OutLocBoxCs.add(outLocBox);
                }
            }

            if (!OutLocBoxCs.isEmpty()){
                OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,param.getCstmrName(),"","MES下发计划组货单","计划组货单",true,param.getGroupGoodsNo());
//                return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
                return R.ok();
                return orderOutBatchUtil.setOrderOutBatchCargoBookingNote(OutLocBoxCs);
//                return R.ok();
            }
        } catch (Exception e) {
            throw new CoolException("组货单号："+param.getGroupGoodsNo()+"计划组货单接收失败！！！"+e.getMessage());