*

lsh

19 小时以前 64781aac1c41bb8c4dda2deb4dc7ae98cace8315

*

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

@@ -305,6 +305,36 @@
        return R.ok();
    }



    /**
     * 添加出库单、正常退库至二楼包装
     */
    @PostMapping("/order/normalTransferToTheSecond-floorPackagingArea/v1")
    @AppAuth(memo = "正常退库至二楼包装")
    public synchronized R packagingAreaOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody QualityInspectionParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //判断param参数
        if (Cools.isEmpty(param.getBoxNo())){
            throw new CoolException("参数：箱号 boxNo为空");
        }
        //判断param参数
        if (Cools.isEmpty(param.getModel())){
            throw new CoolException("参数：卷号 Model为空");
        }
        //判断param参数
        if (Cools.isEmpty(param.getMemo())){
            throw new CoolException("参数：备注 Memo为空");
        }

        return openService.packagingAreaOrderCreate(param);
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/

}

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

@@ -96,6 +96,7 @@
    @RequestMapping("/plate/order/out/start")
    @ManagerAuth(memo = "手动订单出库作业")
    public R fullStoreTakeStartOrder(@RequestBody StockOutParam param) {
        param.setOrderName("手动出库单");
        workService.startupFullTakeStoreOrder(param, getUserId());
        return R.ok("出库启动成功");
    }

 src/main/java/com/zy/asrs/entity/param/StockOutParam.java

@@ -16,6 +16,7 @@
    private String orderNo;
    private String cstmrName;
    private Date nowTime;
    private String orderName;

    // 物料编号集合
    private List<LocDetl> locDetls;

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -1,5 +1,6 @@
package com.zy.asrs.service;

import com.core.common.R;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -59,5 +60,6 @@

    void cs2();
    void qualityInspection(QualityInspectionParam param);
    R packagingAreaOrderCreate(QualityInspectionParam param);

}

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

@@ -12,6 +12,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderOutBatchUtil;
import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocTypeDto;
@@ -1131,5 +1132,34 @@

    }

    /*
     * 正常退库至二楼包装
     * */
    @Override
    @Transactional
    public R packagingAreaOrderCreate(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下发退货至二楼","退货至二楼");
                return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
            }
        } catch (Exception e) {
            throw new CoolException("对应箱号："+param.getBoxNo()+"的物料退库至2楼失败"+e.getMessage());
        }
        return R.error("对应箱号："+param.getBoxNo()+"的物料退库至2楼失败");
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/
}

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

@@ -203,7 +203,7 @@
        if (Cools.isEmpty(param.getOrderNo())){
            throw new CoolException("订单号参数为空");
        }
        DocType docType = docTypeService.selectOrAdd("手动出库单", Boolean.FALSE);
        DocType docType = docTypeService.selectOrAdd(param.getOrderName(), Boolean.FALSE);
        Order order = orderService.selectByNo(param.getOrderNo());
        if (Cools.isEmpty(order)){
            Date now = new Date();

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

New file
@@ -0,0 +1,206 @@
package com.zy.asrs.utils;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WorkService;
import com.zy.common.model.LocDto;
import com.zy.common.properties.SlaveProperties;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;

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

import static org.reflections.Reflections.log;

public class OrderOutBatchUtil {
    private String errorMsgOrderLoc = "";
    private boolean sign = true;
    private String orderOneNo = null;
    private String cstmrName = null;
    private String ip = "";
    private String action = "";
    private String orderName = "";
    private Long userId = 9999L;


    public OrderOutBatchUtil() {
        this.sign = true;
        this.errorMsgOrderLoc = "";
    }

    public OrderOutBatchUtil(String orderOneNo, String cstmrName) {
        this.errorMsgOrderLoc = "";
        this.sign = true;
        this.orderOneNo = orderOneNo;
        this.cstmrName = cstmrName;
    }

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

    public R setOrderOutBatch() {
        return R.ok();
    }


    public R setOrderOutBatch(List<String[]> OutLocBoxCs) {
        int total = OutLocBoxCs.size();
        if (!Cools.isEmpty(OutLocBoxCs) && !OutLocBoxCs.isEmpty()) {
            LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
            LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
            SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
            WorkService workService = SpringUtils.getBean(WorkService.class);
            List<LocDto> locDtos = new ArrayList<>();
            List<String[]> outLocBoxCList = new ArrayList<>();
            List<String> outLocBoxCNew = new ArrayList<>();
            for (String[] outLocBoxC : OutLocBoxCs) {
                total--;
                if (!outLocBoxCNew.contains(outLocBoxC[0])) {
                    LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
                    if (Cools.isEmpty(locDetlSou)) {
                        sign = false;
                        errorMsgOrderLoc = errorMsgOrderLoc + "[===》" + "箱号：" + outLocBoxC[0] + " 未查询到数据！！！《===]";
                        continue;
//                        throw new CoolException("箱号："+outLocBoxC[0]+" 未查询到数据！！！");
                    }
//                    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;
                        errorMsgOrderLoc = errorMsgOrderLoc + "[===》" + "箱号：" + outLocBoxC[0] + " 所在库位不满足出库条件！！！未查询到此箱号所在库位" + "《===]";
                        continue;
                    }
                    if (!locMast.getLocSts().equals("F")) {
                        sign = false;
                        errorMsgOrderLoc = errorMsgOrderLoc + "[===》" + "箱号：" + outLocBoxC[0] + " 所在库位不满足出库条件！！！库位状态不为F！！！库位状态：" + locMast.getLocSts$() + "《===]";
                        continue;
                    }

                    // 目标库位 ===>> 浅库位
                    if (Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
                        String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast.getLocNo());
                        LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
                        if (!Cools.isEmpty(locMast2)) {
                            if (locMast2.getLocSts().equals("P") || locMast2.getLocSts().equals("R")) {
                                errorMsgOrderLoc = errorMsgOrderLoc + "[===》" + "箱号：" + outLocBoxC[0] + " 所在库位满足出库条件！！！但是深库位在出库中！！！因此会夹杂在前边订单执行！！！" + "《===]";
                            }
                        }
                    }

                    if (sign) {
                        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                                .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
                        for (LocDetl locDetl : locDetls) {
                            total++;
                            String[] locDetlNow = new String[5];
                            locDetlNow[0] = locDetl.getBatch();
                            locDetlNow[1] = outLocBoxC[1];
                            locDetlNow[2] = outLocBoxC[2];
                            locDetlNow[3] = outLocBoxC[3];
                            locDetlNow[4] = outLocBoxC[4];
                            outLocBoxCList.add(locDetlNow);
                            outLocBoxCNew.add(outLocBoxC[0]);
                        }
                    }
                }
            }
            for (String[] outLocBoxC : outLocBoxCList) {
                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
                if (Cools.isEmpty(locDetl)) {
                    total--;
                    continue;
                }

                if (!Cools.isEmpty(outLocBoxC[3])) {
                    String memo = Cools.isEmpty(locDetl.getMemo()) ? "" : locDetl.getMemo() + "，";
                    locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C) + "备注：" + outLocBoxC[3]);
                } else if (Cools.isEmpty(locDetl.getMemo())) {
                    locDetl.setMemo(outLocBoxC[3]);
                }
                LocDto locDto = new LocDto(locDetl);
                locDtos.add(locDto);
            }

            StockOutParam param = new StockOutParam();
            ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
            List<LocDto> locDtosList = new ArrayList<>();
            List<String> batchList = new ArrayList<>();
            for (LocDto locDto : locDtos) {
                if (!batchList.contains(locDto.getBatch())) {
                    batchList.add(locDto.getBatch());
                    locDtosList.add(locDto);
                }
            }
            for (LocDto locDto : locDtosList) {
                StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
                locDetl.setBrand(locDto.getBrand());
                locDetl.setLocNo(locDto.getLocNo());
                locDetl.setAnfme(locDto.getAnfme());
                locDetl.setMatnr(locDto.getMatnr());
                locDetl.setBatch(locDto.getBatch());
                locDetl.setModel(locDto.getModel());
                locDetl.setSpecs(locDto.getSpecs());
                locDetl.setZpallet(locDto.getZpallet());
                locDetl.setOrigin(locDto.getOrigin());
                locDetl.setWeight(locDto.getWeight());
                locDetl.setMemo(locDto.getMemo());
                locDetl.setDanger(locDto.getDanger());

                locDetls.add(locDetl);
            }
            param.setLocDetls(locDetls);
            param.setOrderNo(orderOneNo);
            param.setCstmrName(cstmrName);
            param.setOrderName(orderName);

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

            try {
                OperateLogService operateLogService = SpringUtils.getBean(OperateLogService.class);
                // 记录操作日志
                OperateLog operateLog = new OperateLog();
                operateLog.setAction(action);
                operateLog.setIp(ip);
                operateLog.setUserId(9999L);
                operateLog.setRequest("单号：" + orderOneNo + "、客户名：" + cstmrName);
                operateLog.setResponse(errorMsgOrderLoc.equals("") ? "正常" : (sign && total > 0) ? "成功:" + errorMsgOrderLoc : "失败:" + errorMsgOrderLoc);
                operateLogService.insert(operateLog);
            } catch (Exception e) {
                log.error("记录操作日志失败！" + e.getMessage());
            }

        }

        log.info("出库{}条箱号！", total);

        String requert = errorMsgOrderLoc.equals("") ? "正常" : (sign && total > 0) ? "成功:" + errorMsgOrderLoc : "失败:" + errorMsgOrderLoc;
        if (sign && total > 0) {
            return R.ok(requert.equals("正常")? "成功":requert);
        }
        return R.error(requert);
    }
}

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

@@ -232,6 +232,7 @@
            param.setLocDetls(locDetls);
            param.setOrderNo(orderOneNo);
            param.setCstmrName(cstmrName);
            param.setOrderName("手动出库单");

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