#

lty

6 小时以前 8c2dbd922448b88b1c28b5e87c26a31b882c28ac

#

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

@@ -203,6 +203,16 @@
        return R.ok().add(openService.mesInventorySummary(param));
    }

    @PostMapping("/MES/orderReport")
    public synchronized R orderReport(@RequestBody(required = false) OrderReportParam param,
                                              HttpServletRequest request) throws IOException {
        auth(null, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        return R.ok().add(openService.orderReport(param));
    }


    /**
     * 添加入库单

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

New file
@@ -0,0 +1,14 @@
package com.zy.asrs.entity.param;

import com.zy.asrs.entity.OrderDetl;
import lombok.Data;

import java.util.List;

@Data
public class OrderReportParam {
    private String orderNo;
    private String warehouseId;
    private String wkType;
    List<OrderDetl> orderDetls;
}

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

@@ -53,4 +53,6 @@
    List<Map<String, Object>> mesInventoryDetails(Map<String, Object> param) throws IOException;

    List<Map<String, Object>> mesInventorySummary(Map<String, Object> param) throws IOException;

    Map<String, Object> orderReport(OrderReportParam param) throws IOException;
}

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

@@ -20,6 +20,7 @@
import com.zy.common.utils.NodeUtils;
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.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
@@ -33,8 +34,10 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

/**
 * Created by vincent on 2022/4/9
@@ -71,6 +74,27 @@
    private ApiLogService apiLogService;
    @Autowired
    private PlatformTransactionManager transactionManager;

    @Value("${mes-wk.base-url.test:http://192.168.0.41}")
    private String mesWkBaseUrlTest;

    @Value("${mes-wk.base-url.prod:http://192.168.0.42}")
    private String mesWkBaseUrlProd;

    @Value("${mes-wk.auth.ent-code:lfd}")
    private String mesWkEntCode;

    @Value("${mes-wk.auth.username:TL002}")
    private String mesWkUsername;

    @Value("${mes-wk.auth.password-md5:e10adc3949ba59abbe56e057f20f883e}")
    private String mesWkPasswordMd5;

    @Value("${mes-wk.auth.token-valid-minutes:30}")
    private Integer mesWkTokenValidMinutes;

    private final Map<String, MesWkTokenInfo> mesWkTokenCache = new ConcurrentHashMap<>();

    @Override
    @Transactional
    public void pakinOrderCreate(OpenOrderPakinParam param) {
@@ -949,6 +973,72 @@
        return result;
    }

    @Override
    public Map<String, Object> orderReport(OrderReportParam param) throws IOException {
        if (param == null) {
            throw new CoolException("参数不能为空");
        }
        if (Cools.isEmpty(param.getWkType())) {
            throw new CoolException("参数[wkType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetls())) {
            throw new CoolException("参数[orderDetls]不能为空");
        }

        String baseUrl = resolveMesWkBaseUrl(param);
        MesWkBizType bizType = resolveMesWkBizType(param.getWkType());

        String token = getMesWkToken(baseUrl);
        Map<String, Object> headers = new HashMap<>();
        headers.put("Authorization", token);

        String path;
        String bizDesc;
        Map<String, Object> payload;

        if (bizType == MesWkBizType.PURCHASE_IN_STOCK) {
            path = "/purchaseInStock/lkPurchaseInStockAdd";
            bizDesc = "立库采购入库";
            payload = buildPurchaseInStockPayload(param.getOrderDetls());
        } else if (bizType == MesWkBizType.PRODUCT_ISSUE) {
            path = "/productIssue/lkProductIssueAdd";
            bizDesc = "立库生产发料";
            payload = buildProductBizPayload(param.getOrderDetls(), "productIssueDtls", "productIssueBoms");
        } else if (bizType == MesWkBizType.PRODUCT_FEED) {
            path = "/productFeed/lkProductFeedAdd";
            bizDesc = "立库生产补料";
            payload = buildProductBizPayload(param.getOrderDetls(), "productFeedDtls", "productFeedBoms");
        } else if (bizType == MesWkBizType.PRODUCT_RETURN) {
            path = "/productReturn/lkProductReturnAdd";
            bizDesc = "立库生产退料";
            payload = buildProductBizPayload(param.getOrderDetls(), "productReturnDtls", "productReturnBoms");
        } else {
            throw new CoolException("不支持的wkType：" + param.getWkType());
        }

        try {
            Map<String, Object> res = callMesWkApi(baseUrl, path, headers, payload, bizDesc);
            Map<String, Object> out = new HashMap<>();
            out.put("wkType", param.getWkType());
            out.put("baseUrl", baseUrl);
            out.put("path", path);
            out.put("result", res);
            return out;
        } catch (MesWkAuthException e) {
            mesWkTokenCache.remove(baseUrl);
            String newToken = getMesWkToken(baseUrl);
            headers.put("Authorization", newToken);
            Map<String, Object> res = callMesWkApi(baseUrl, path, headers, payload, bizDesc);
            Map<String, Object> out = new HashMap<>();
            out.put("wkType", param.getWkType());
            out.put("baseUrl", baseUrl);
            out.put("path", path);
            out.put("result", res);
            out.put("tokenRefreshed", true);
            return out;
        }
    }

    private String getWarehouseBaseUrl(String wareHouseId) {
        if (Cools.isEmpty(wareHouseId)) {
            return null;
@@ -1037,6 +1127,239 @@
        }
    }

    private String resolveMesWkBaseUrl(OrderReportParam param) {
        String raw = param != null ? param.getWarehouseId() : null;
        if (!Cools.isEmpty(raw)) {
            String v = raw.trim();
            if (v.startsWith("http://") || v.startsWith("https://")) {
                return v;
            }
            if (v.matches("^\\d{1,3}(\\.\\d{1,3}){3}(:\\d+)?$")) {
                return "http://" + v;
            }
        }

        String wkType = param != null ? param.getWkType() : null;
        String norm = wkType == null ? "" : wkType.trim().toLowerCase();
        if (norm.contains("test") || norm.contains("41") || norm.contains("测试")) {
            return normalizeHttpBaseUrl(mesWkBaseUrlTest);
        }
        return normalizeHttpBaseUrl(mesWkBaseUrlProd);
    }

    private String normalizeHttpBaseUrl(String baseUrl) {
        if (Cools.isEmpty(baseUrl)) {
            return null;
        }
        String v = baseUrl.trim();
        if (v.startsWith("http://") || v.startsWith("https://")) {
            return v;
        }
        return "http://" + v;
    }

    private MesWkBizType resolveMesWkBizType(String wkType) {
        String v = wkType == null ? "" : wkType.trim().toLowerCase();
        if (v.contains("purchase") || v.contains("purch") || v.contains("cg") || v.contains("采购") || v.equals("1")) {
            return MesWkBizType.PURCHASE_IN_STOCK;
        }
        if (v.contains("issue") || v.contains("fl") || v.contains("发料") || v.equals("2")) {
            return MesWkBizType.PRODUCT_ISSUE;
        }
        if (v.contains("feed") || v.contains("bl") || v.contains("补料") || v.equals("3")) {
            return MesWkBizType.PRODUCT_FEED;
        }
        if (v.contains("return") || v.contains("tl") || v.contains("退料") || v.equals("4")) {
            return MesWkBizType.PRODUCT_RETURN;
        }
        throw new CoolException("无法识别wkType：" + wkType);
    }

    private synchronized String getMesWkToken(String baseUrl) throws IOException {
        if (Cools.isEmpty(baseUrl)) {
            throw new CoolException("服务器地址未配置");
        }
        long now = System.currentTimeMillis();
        MesWkTokenInfo cached = mesWkTokenCache.get(baseUrl);
        if (cached != null && !Cools.isEmpty(cached.token) && now < cached.expireAt) {
            return cached.token;
        }

        String path = "/acco/login";
        Map<String, Object> payload = new HashMap<>();
        payload.put("entCode", mesWkEntCode);
        payload.put("username", mesWkUsername);
        payload.put("password", mesWkPasswordMd5);
        String requestJson = JSON.toJSONString(payload);
        String url = baseUrl + path;

        String response = new HttpHandler.Builder()
                .setUri(baseUrl)
                .setPath(path)
                .setJson(requestJson)
                .build()
                .doPost();

        if (Cools.isEmpty(response)) {
            callApiDetlLogSave("立库接口登录", url, requestJson, "接口无响应", false);
            throw new CoolException("立库接口登录无响应");
        }

        JSONObject json = JSON.parseObject(response);
        if (json == null) {
            callApiDetlLogSave("立库接口登录", url, requestJson, response, false);
            throw new CoolException("立库接口登录响应格式错误");
        }

        Integer code = json.getInteger("code");
        if (code == null || (code != 200 && code != 0)) {
            callApiDetlLogSave("立库接口登录", url, requestJson, response, false);
            throw new CoolException("立库接口登录失败：" + response);
        }

        String token = json.getString("data");
        if (Cools.isEmpty(token)) {
            callApiDetlLogSave("立库接口登录", url, requestJson, response, false);
            throw new CoolException("立库接口登录未返回token");
        }

        callApiDetlLogSave("立库接口登录", url, requestJson, response, true);
        long expireAt = now + (mesWkTokenValidMinutes == null ? 30 : mesWkTokenValidMinutes) * 60L * 1000L;
        mesWkTokenCache.put(baseUrl, new MesWkTokenInfo(token, expireAt));
        return token;
    }

    private Map<String, Object> callMesWkApi(String baseUrl, String path, Map<String, Object> headers, Map<String, Object> payload, String bizDesc) throws IOException {
        String url = baseUrl + path;
        String requestJson = JSON.toJSONString(payload == null ? new HashMap<>() : payload);
        String response;
        try {
            response = new HttpHandler.Builder()
                    .setUri(baseUrl)
                    .setPath(path)
                    .setHeaders(headers)
                    .setJson(requestJson)
                    .build()
                    .doPost();
        } catch (Exception e) {
            callApiDetlLogSave(bizDesc, url, requestJson, e.getMessage(), false);
            throw e;
        }

        if (Cools.isEmpty(response)) {
            callApiDetlLogSave(bizDesc, url, requestJson, "接口无响应", false);
            throw new CoolException("接口无响应");
        }

        JSONObject json = JSON.parseObject(response);
        if (json == null) {
            callApiDetlLogSave(bizDesc, url, requestJson, response, false);
            throw new CoolException("接口响应格式错误");
        }

        Integer code = json.getInteger("code");
        if (code != null && (code == 200 || code == 0)) {
            callApiDetlLogSave(bizDesc, url, requestJson, response, true);
            return JSON.parseObject(response, Map.class);
        }

        String err = json.getString("error");
        String msg = json.getString("msg");
        String text = !Cools.isEmpty(err) ? err : (!Cools.isEmpty(msg) ? msg : "未知错误");
        callApiDetlLogSave(bizDesc, url, requestJson, response, false);
        if (text.toLowerCase().contains("token") || text.toLowerCase().contains("unauthor")) {
            throw new MesWkAuthException(text);
        }
        throw new CoolException(text);
    }

    private Map<String, Object> buildPurchaseInStockPayload(List<OrderDetl> orderDetls) {
        List<Map<String, Object>> dtls = new ArrayList<>();
        for (OrderDetl d : orderDetls) {
            if (d == null) {
                continue;
            }
            if (Cools.isEmpty(d.getBatch())) {
                throw new CoolException("orderDetls.batch不能为空");
            }
            if (d.getAnfme() == null) {
                throw new CoolException("orderDetls.anfme不能为空");
            }
            Map<String, Object> one = new HashMap<>();
            one.put("batchNum", d.getBatch());
            one.put("quantity", d.getAnfme());
            dtls.add(one);
        }
        Map<String, Object> payload = new HashMap<>();
        payload.put("purchaseInStockDtls", dtls);
        return payload;
    }

    private Map<String, Object> buildProductBizPayload(List<OrderDetl> orderDetls, String dtlsKey, String bomsKey) {
        Map<String, List<OrderDetl>> bySku = new LinkedHashMap<>();
        for (OrderDetl d : orderDetls) {
            if (d == null) {
                continue;
            }
            if (Cools.isEmpty(d.getSku())) {
                throw new CoolException("orderDetls.sku不能为空");
            }
            bySku.computeIfAbsent(d.getSku(), k -> new ArrayList<>()).add(d);
        }

        List<Map<String, Object>> dtls = new ArrayList<>();
        for (Map.Entry<String, List<OrderDetl>> entry : bySku.entrySet()) {
            String sku = entry.getKey();
            List<OrderDetl> list = entry.getValue();

            List<Map<String, Object>> boms = new ArrayList<>();
            for (OrderDetl d : list) {
                if (Cools.isEmpty(d.getBatch())) {
                    throw new CoolException("orderDetls.batch不能为空");
                }
                if (d.getAnfme() == null) {
                    throw new CoolException("orderDetls.anfme不能为空");
                }
                Map<String, Object> bom = new HashMap<>();
                bom.put("batchNum", d.getBatch());
                bom.put("quantity", d.getAnfme());
                boms.add(bom);
            }

            Map<String, Object> one = new HashMap<>();
            one.put("planSpNo", sku);
            one.put(bomsKey, boms);
            dtls.add(one);
        }

        Map<String, Object> payload = new HashMap<>();
        payload.put(dtlsKey, dtls);
        return payload;
    }

    private enum MesWkBizType {
        PURCHASE_IN_STOCK,
        PRODUCT_ISSUE,
        PRODUCT_FEED,
        PRODUCT_RETURN
    }

    private static class MesWkTokenInfo {
        private final String token;
        private final long expireAt;

        private MesWkTokenInfo(String token, long expireAt) {
            this.token = token;
            this.expireAt = expireAt;
        }
    }

    private static class MesWkAuthException extends RuntimeException {
        private MesWkAuthException(String message) {
            super(message);
        }
    }

    // 模拟调用仓库1接口
    private String syncOrderToWarehouse1(ErpOrder order, List<ErpOrderDetl> details, Integer orderType) {
        log.info("Calling Warehouse 1 API for order: {}", order.getOrderNo());

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

@@ -12,7 +12,12 @@
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.*;
import com.zy.common.model.enums.IoWorkType;
@@ -20,11 +25,14 @@
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.web.WcsController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -70,6 +78,8 @@
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private ConfigService configService;
    @Autowired
    private WcsController wcsController;
    @Autowired
    private RowLastnoService rowLastnoService;
@@ -77,6 +87,27 @@
    private SlaveProperties slaveProperties;
    @Autowired
    private WaitPakinService waitPakinService;

    @Autowired
    private WorkMastHandler workMastHandler;

    @Autowired
    private LocOwnerService locOwnerService;

    @Autowired
    private ManLocDetlService manLocDetlService;

    @Resource
    private LocMastMapper locMastMapper;

    @Resource
    private OrderPakoutService orderPakOutService;

    @Resource
    private BasAgvLocDetlService basAgvLocDetlService;

    @Resource
    private BasAgvWrkDetlService basAgvWrkDetlService;

    @Override
    @Transactional
@@ -90,8 +121,13 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
//        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
//        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(param.getList().get(0));
        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), findLocNoAttributeVo,locTypeDto);
        if (Cools.isEmpty(dto)){
            throw new CoolException("查询库位失败！！==》startupFullPutStore ==》 commonService.getLocNo");
        }
        // 生成工作号
        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -122,9 +158,9 @@
        // 生成工作档明细
        List<DetlDto> detlDtos = new ArrayList<>();
        param.getList().forEach(elem -> {
            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
            if (DetlDto.has(detlDtos, detlDto)) {
                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(),detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3());
                assert detlDto1 != null;
                detlDto1.setAnfme(detlDto1.getAnfme() + detlDto.getAnfme());
            } else {
@@ -157,26 +193,117 @@
    @Override
    @Transactional
    public void startupFullTakeStore(StockOutParam param, Long userId) {
        // 目标站点状态检测
        BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
        // 获取库位明细
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
        try{
            // 目标站点状态检测
            BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
            // 获取库位明细
            List<LocDetlDto> locDetlDtos = new ArrayList<>();
            for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
                if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                    LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getBrand()
                            ,paramLocDetl.getStandby1(),paramLocDetl.getStandby2(),paramLocDetl.getStandby3(),paramLocDetl.getBoxType1(),paramLocDetl.getBoxType2(),paramLocDetl.getBoxType3());
                    if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
                }
            }
            if (!locDetlDtos.isEmpty()) {
                // 库位号集合
                List<String> locNoList = param.getLocDetls().stream().map(StockOutParam.LocDetl::getLocNo).distinct().collect(Collectors.toList());
                String firstFrozenLocNo = locMastMapper.findFirstFrozenLocNo(locNoList);
                if (firstFrozenLocNo != null) {
                    throw new CoolException(firstFrozenLocNo + "库位已被冻结!");
                }
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
                if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
                    // 启动出库开始 101.出库
                    stockOut(staNo,param.getOutStaArea(), locDetlDtos, null, userId);

//                    stockOut(staNo, locDetlDtos, null, userId);
                }else {
                    throw new CoolException("所选库位存在状态不为F、D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
                }
            } else {
                throw new CoolException("库存不存在");
            }
        } catch (Exception e){
            throw new CoolException(e.getMessage());
        }
        if (!locDetlDtos.isEmpty()) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
            if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
                // 启动出库开始 101.出库
                stockOut(staNo, locDetlDtos, null, userId);
            }else {
                throw new CoolException("所选库位存在状态不为F、D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
    }

    @Override
    @Transactional
    public void turnOverOut(EmptyPlateOutParam param, Long userId) {
        try {
            if (Cools.isEmpty(param.getOwnerId())) {
                throw new CoolException("客户名称不能为空");
            }else if (param.getLocDetls().size()<=0){
                throw new CoolException("请提取明细");
            }
        } else {
            throw new CoolException("库存不存在");
            ArrayList<String> locNos = new ArrayList<>();
            String[][] locNos2 =new String[param.getLocDetls().size()][4];
            int i=0;
            for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){
                if (!locNos.contains(locDetl.getLoc_no())){
                    locNos.add(locDetl.getLoc_no());
                    locNos2[i][0]=locDetl.getLoc_no();
                    locNos2[i][1]=locDetl.getManu();
                    locNos2[i][2] = locDetl.getMatnr();
                    locNos2[i][3] = locDetl.getBatch();
                    i++;
                }
            }
            LocOwner locOwner = locOwnerService.selectById(param.getOwnerId());
            param.setOwner(locOwner.getOwner());
            String lgort = "";
            String owner="";
            List<DetlDto> detlDtos = new ArrayList<>();
            for (String[] locNo1 : locNos2) {
                String locNo = locNo1[0];
                if (locNo1[1].equals("平库")){
                    List<ManLocDetl> manLocDetls = new ArrayList<>();
                    if (locNo1[3] == null){
                        manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",locNo1[2]));
                    }else {
                        manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",locNo1[2]).eq("batch",locNo1[3]));
                    }
                    for (ManLocDetl manLocDetl:manLocDetls){
                        if (Cools.isEmpty(owner)) {
                            owner = manLocDetl.getOwner$();
                        }
//                        detlDtos.add(new DetlDto(manLocDetl.getMatnr(), manLocDetl.getBatch(),manLocDetl.getBrand(),
//                                manLocDetl.getStandby1(),manLocDetl.getStandby2(),manLocDetl.getStandby3(),
//                                manLocDetl.getBoxType1(),manLocDetl.getBoxType2(),manLocDetl.getBoxType3(), manLocDetl.getAnfme()));
                        manLocDetl.setOwner(param.getOwnerId());
                        try{
                            manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",manLocDetl.getMatnr()));
                        }catch (Exception e){
                            throw new Exception("更新库存明细拥有者字段信息出错了");
                        }
                    }
                }else if (locNo1[1].equals("立库")){
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locNo1[2]).eq("batch",locNo1[3]));
                    for (LocDetl locDetl:locDetls){
                        if (Cools.isEmpty(lgort)) {
                            lgort = locDetl.getOrigin();
                        }
                        if (Cools.isEmpty(owner)) {
                            owner = locDetl.getOwner$();
                        }
                        detlDtos.add(new DetlDto(locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(),
                                locDetl.getStandby1(),locDetl.getStandby2(),locDetl.getStandby3(),
                                locDetl.getBoxType1(),locDetl.getBoxType2(),locDetl.getBoxType3(), locDetl.getAnfme()));
                        locDetl.setOwner(param.getOwnerId());
                        try{
                            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()));
                        }catch (Exception e){
                            throw new Exception("更新库存明细拥有者字段信息出错了");
                        }
                    }
                }else {
                    throw new Exception("更新库位拥有者字段信息出错了");
                }
            }
        }catch (Exception e){
            throw new CoolException("移交作业出错了："+e);
        }
    }

@@ -201,6 +328,8 @@
                dtos.add(new OutLocDto(locNo, locDetlDto));
            }
        }
        Config configAutoMPArea = configService.selectConfigByCode("AutoMPArea");

        Integer ioType = null;
        // 生成工作档
        for (OutLocDto dto : dtos) {
@@ -222,6 +351,10 @@

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
//            if(ioType.equals(107)){
//                staDesc = staDescService.queryCrnStnCheck(ioType, locMast.getCrnNo(), outSta);
//            }

            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
@@ -235,12 +368,33 @@
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setBarcode(locMast.getBarcode());
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());
            wrkMast.setTakeNone("0");  //0非自动

            List<BasAgvWrkDetl> basAgvWrkDetls = null;
            List<BasAgvLocDetl> basAgvLocDetls = null;
            try{
                if (Boolean.parseBoolean(configAutoMPArea.getValue())){
                    if (wrkMast.getStaNoAgvSign()){
                        if (ioType==101){
                            // 全板出库
                            basAgvLocDetls = new ArrayList<>();
                        } else {
                            // 拣料出库
                            basAgvWrkDetls = new ArrayList<>();
                        }
                        wrkMast.setTakeNone("1"); //等待下发
                    } else {
                        wrkMast.setTakeNone("3");  //无需AGV搬运
                    }
                }
            } catch (Exception e) {}  //配置项不存在，不做处理
            wrkMast.setAppeUser(userId); // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
@@ -248,6 +402,7 @@
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号："+dto.getLocNo());
            }

            // 生成工作档明细
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
@@ -262,13 +417,48 @@
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
                wrkDetl.setModiUser(userId);

                try{
                    if (basAgvWrkDetls != null){
                        BasAgvWrkDetl basAgvWrkDetl = new BasAgvWrkDetl();
                        basAgvWrkDetl.sync(wrkDetl);
                        basAgvWrkDetls.add(basAgvWrkDetl);
                    }
                } catch (Exception e) {}  //配置项不存在，不做处理

                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
            }
//            if(locMastRgv !=null){
//                if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //若有空库位且配置允许则绑定其备料库位号
//                    //修改agv备料区状态
//                    if(locMastRgv.getLocSts().equals("O") && ioType != 107){
//                        locMastRgv.setLocSts("S");
//                        locMastRgv.setModiUser(userId);
//                        locMastRgv.setModiTime(now);
//                        if (!locMastService.updateById(locMastRgv)) {
//                            throw new CoolException("预约agv备料区库位状态失败，库位号："+locMastRgv.getLocNo());
//                        }
//                    }
//                }
//            }

            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
            locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("F")) {

                try{
                    if (basAgvLocDetls != null){
                        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                        for (LocDetl locDetl : locDetlList) {
                            BasAgvLocDetl basAgvLocDetl = new BasAgvLocDetl();
                            basAgvLocDetl.sync(locDetl);
                            basAgvLocDetls.add(basAgvLocDetl);
                        }
                    }
                } catch (Exception e) {}  //配置项不存在，不做处理

                locMast.setLocSts(ioType==101?"R":"P");
                locMast.setModiUser(userId);
                locMast.setModiTime(now);
@@ -276,11 +466,222 @@
                    throw new CoolException("预约库位状态失败，库位号："+dto.getLocNo());
                }
            } else {
                log.error(dto.getLocNo() + "库位不是在库状态");
                throw new CoolException(dto.getLocNo() + "库位不是在库状态");
            }

            try{
                // 增加AGV库存中转数量
                if (basAgvLocDetls != null){
                    for (BasAgvLocDetl basAgvLocDetl : basAgvLocDetls) {
                        try{
                            basAgvLocDetlService.insert(basAgvLocDetl);
                        } catch (Exception e){
                            log.error("增加AGV库存中转数量失败");
                        }
                    }
                }
                if (basAgvWrkDetls != null){
                    for (BasAgvWrkDetl basAgvWrkDetl : basAgvWrkDetls) {
                        try{
                            basAgvWrkDetlService.insert(basAgvWrkDetl);
                        } catch (Exception e){
                            log.error("增加AGV库存中转数量失败");
                        }
                    }
                }

            }catch (Exception e){}
        }
    }
    @Override
    @Transactional
    public void stockOut(BasDevp staNo,Integer outStaArea, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
        Date now = new Date();
        // 合并同类项
        Set<String> locNos = new HashSet<>();
        List<OutLocDto> dtos = new ArrayList<>();
        for (LocDetlDto locDetlDto : locDetlDtos) {
            String locNo = locDetlDto.getLocDetl().getLocNo();
            if (locNos.contains(locNo)) {
                for (OutLocDto dto : dtos) {
                    if (dto.getLocNo().equals(locNo)) {
                        dto.getLocDetlDtos().add(locDetlDto);
                        break;
                    }
                }
            } else {
                locNos.add(locNo);
                dtos.add(new OutLocDto(locNo, locDetlDto));
            }
        }
        Config configAutoMPArea = configService.selectConfigByCode("AutoMPArea");

        Integer ioType = null;
        // 生成工作档
        for (OutLocDto dto : dtos) {
            // 判断入出库类型：101.全板出库 or 103.拣料出库
            if (ioWorkType == null) {
                ioType = dto.isAll() ? 101 : 103;
            } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
                ioType = 107;
            }
            assert ioType != null;
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            Integer outSta = staNo.getDevNo();
//            //2号堆垛机全板出库站指定为204站，拣料站指定为202
//            if(locMast.getCrnNo()==2){
//                outSta = ioType == 101 ? 204 : 202;
//            }

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
//            if(ioType.equals(107)){
//                staDesc = staDescService.queryCrnStnCheck(ioType, locMast.getCrnNo(), outSta);
//            }

            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(ioType); // 入出库状态
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setBarcode(locMast.getBarcode());
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setCtnKind(outStaArea);//
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());
            wrkMast.setTakeNone("0");  //0非自动

            List<BasAgvWrkDetl> basAgvWrkDetls = null;
            List<BasAgvLocDetl> basAgvLocDetls = null;
            try{
                if (Boolean.parseBoolean(configAutoMPArea.getValue())){
                    if (wrkMast.getStaNoAgvSign()){
                        if (ioType==101){
                            // 全板出库
                            basAgvLocDetls = new ArrayList<>();
                        } else {
                            // 拣料出库
                            basAgvWrkDetls = new ArrayList<>();
                        }
                        wrkMast.setTakeNone("1"); //等待下发
                    } else {
                        wrkMast.setTakeNone("3");  //无需AGV搬运
                    }
                }
            } catch (Exception e) {}  //配置项不存在，不做处理
            wrkMast.setAppeUser(userId); // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号："+dto.getLocNo());
            }

            // 生成工作档明细
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(detlDto.getLocDetl());
                wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
                wrkDetl.setAnfme(anfme); // 数量
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
                wrkDetl.setModiUser(userId);

                try{
                    if (basAgvWrkDetls != null){
                        BasAgvWrkDetl basAgvWrkDetl = new BasAgvWrkDetl();
                        basAgvWrkDetl.sync(wrkDetl);
                        basAgvWrkDetls.add(basAgvWrkDetl);
                    }
                } catch (Exception e) {}  //配置项不存在，不做处理

                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
            }
//            if(locMastRgv !=null){
//                if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) {  //若有空库位且配置允许则绑定其备料库位号
//                    //修改agv备料区状态
//                    if(locMastRgv.getLocSts().equals("O") && ioType != 107){
//                        locMastRgv.setLocSts("S");
//                        locMastRgv.setModiUser(userId);
//                        locMastRgv.setModiTime(now);
//                        if (!locMastService.updateById(locMastRgv)) {
//                            throw new CoolException("预约agv备料区库位状态失败，库位号："+locMastRgv.getLocNo());
//                        }
//                    }
//                }
//            }

            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
            locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("F")) {

                try{
                    if (basAgvLocDetls != null){
                        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                        for (LocDetl locDetl : locDetlList) {
                            BasAgvLocDetl basAgvLocDetl = new BasAgvLocDetl();
                            basAgvLocDetl.sync(locDetl);
                            basAgvLocDetls.add(basAgvLocDetl);
                        }
                    }
                } catch (Exception e) {}  //配置项不存在，不做处理

                locMast.setLocSts(ioType==101?"R":"P");
                locMast.setModiUser(userId);
                locMast.setModiTime(now);
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("预约库位状态失败，库位号："+dto.getLocNo());
                }
            } else {
                log.error(dto.getLocNo() + "库位不是在库状态");
                throw new CoolException(dto.getLocNo() + "库位不是在库状态");
            }

            try{
                // 增加AGV库存中转数量
                if (basAgvLocDetls != null){
                    for (BasAgvLocDetl basAgvLocDetl : basAgvLocDetls) {
                        try{
                            basAgvLocDetlService.insert(basAgvLocDetl);
                        } catch (Exception e){
                            log.error("增加AGV库存中转数量失败");
                        }
                    }
                }
                if (basAgvWrkDetls != null){
                    for (BasAgvWrkDetl basAgvWrkDetl : basAgvWrkDetls) {
                        try{
                            basAgvWrkDetlService.insert(basAgvWrkDetl);
                        } catch (Exception e){
                            log.error("增加AGV库存中转数量失败");
                        }
                    }
                }

            }catch (Exception e){}
        }
    }
    @Override
    @Transactional
    public void stockOut(BasDevp staNo, TaskDto taskDto, Long userId) {
@@ -291,11 +692,25 @@
                throw new CoolException("订单出库异常，请联系管理员");
            }
        }
        Config configAutoMPArea = configService.selectConfigByCode("AutoMPArea");

        // 获取库位
        LocMast locMast = locMastService.selectById(taskDto.getLocNo());
        // 获取路径
        int ioType = taskDto.isAll() ? 101 : 103;
        // 判断是否是盘点单
        String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
        OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
        int ioType = orderPakout.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);
        StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
        List<LocMast> list = locMastMapper.selectList(
                new EntityWrapper<LocMast>()
                        .eq("whs_type", 5)
                        .eq("loc_sts", "O")
        );
        LocMast locMastRgv = list.isEmpty() ? null : list.get(0);




        // 生成工作号
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
        // 生成工作档
@@ -306,9 +721,31 @@
        wrkMast.setIoType(ioType); // 入出库状态
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setBarcode(locMast.getBarcode());
        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setSourceLocNo(taskDto.getLocNo()); // 源库位
        wrkMast.setTakeNone("0");  //0非自动

        List<BasAgvWrkDetl> basAgvWrkDetls = null;
        List<BasAgvLocDetl> basAgvLocDetls = null;
        try{
            if (Boolean.parseBoolean(configAutoMPArea.getValue())){
                if (wrkMast.getStaNoAgvSign()){
                    if (ioType==101){
                        // 全板出库
                        basAgvLocDetls = new ArrayList<>();
                    } else {
                        // 拣料出库
                        basAgvWrkDetls = new ArrayList<>();
                    }
                    wrkMast.setTakeNone("1"); //等待下发
                } else {
                    wrkMast.setTakeNone("3");  //无需AGV搬运
                }
            }
        } catch (Exception e) {}  //配置项不存在，不做处理

        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
@@ -325,10 +762,14 @@
        // 生成工作档明细
        for (LocDto locDto : taskDto.getLocDtos()) {
            if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
            if (orderDetl == null) {
                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
            }
//            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
            OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getBrand()
                    ,locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3());
//            if (orderDetl == null) {
////                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
//                orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null);
//
//            }
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(orderDetl);
            wrkDetl.setZpallet(wrkMast.getBarcode());
@@ -341,18 +782,55 @@
            wrkDetl.setAppeUser(userId);
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(userId);

            try{
                if (basAgvWrkDetls != null){
                    BasAgvWrkDetl basAgvWrkDetl = new BasAgvWrkDetl();
                    basAgvWrkDetl.sync(wrkDetl);
                    basAgvWrkDetls.add(basAgvWrkDetl);
                }
            } catch (Exception e) {}  //配置项不存在，不做处理

            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }
            // 修改订单明细
            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
                throw new CoolException("修改订单明细数量失败");
//            // 修改订单明细
//            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
//                throw new CoolException("修改订单明细数量失败");
//            }
//            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
            OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE,orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
                    orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
                    orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3()
                    , locDto.getAnfme());
            OrderInAndOutUtil.updateOrder(Boolean.FALSE,orderDetl.getOrderId(), 2L, userId);
        }
        //修改agv备料区状态
        if(locMastRgv.getLocSts().equals("O")){
            locMastRgv.setLocSts("S");
            locMastRgv.setModiUser(userId);
            locMastRgv.setModiTime(now);
            if (!locMastService.updateById(locMastRgv)) {
                throw new CoolException("预约agv备料区库位状态失败，库位号："+locMastRgv.getLocNo());
            }
            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
        }else{
            throw new CoolException(locMastRgv.getLocNo() + "备料区不是空库位状态");

        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        locMast = locMastService.selectById(taskDto.getLocNo());
        if (locMast.getLocSts().equals("F")) {
            try{
                if (basAgvLocDetls != null){
                    List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                    for (LocDetl locDetl : locDetlList) {
                        BasAgvLocDetl basAgvLocDetl = new BasAgvLocDetl();
                        basAgvLocDetl.sync(locDetl);
                        basAgvLocDetls.add(basAgvLocDetl);
                    }
                }
            } catch (Exception e) {}  //配置项不存在，不做处理

            locMast.setLocSts(ioType==101?"R":"P");
            locMast.setModiUser(userId);
            locMast.setModiTime(now);
@@ -362,6 +840,23 @@
        } else {
            throw new CoolException(taskDto.getLocNo() + "库位不是在库状态");
        }



        try{
            // 增加AGV库存中转数量
            if (basAgvLocDetls != null){
                for (BasAgvLocDetl basAgvLocDetl : basAgvLocDetls) {
                    basAgvLocDetlService.insert(basAgvLocDetl);
                }
            }
            if (basAgvWrkDetls != null){
                for (BasAgvWrkDetl basAgvWrkDetl : basAgvWrkDetls) {
                    basAgvWrkDetlService.insert(basAgvWrkDetl);
                }
            }

        }catch (Exception e){}
    }

    @Override
@@ -371,7 +866,9 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();

        StartupDto dto = commonService.getLocNo( 10, devpNo, findLocNoAttributeVo, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -428,6 +925,13 @@
        if (Cools.isEmpty(param.getOutSite())) {
            throw new CoolException("站点不存在");
        }

        // 库位冻结不能出库
        String firstFrozenLocNo = locMastMapper.findFirstFrozenLocNo(param.getLocNos());
        if (firstFrozenLocNo != null) {
            throw new CoolException(firstFrozenLocNo + "库位已被冻结!");
        }

        for (String locNo : param.getLocNos()) {
            // 获取工作号
            int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
@@ -559,15 +1063,22 @@
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getBrand()
                        ,paramLocDetl.getStandby1(),paramLocDetl.getStandby2(),paramLocDetl.getStandby3(),paramLocDetl.getBoxType1(),paramLocDetl.getBoxType2(),paramLocDetl.getBoxType3());
                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
            }
        }
        if (!locDetlDtos.isEmpty()) {
            // 库位号集合
            List<String> locNoList = param.getLocDetls().stream().map(StockOutParam.LocDetl::getLocNo).distinct().collect(Collectors.toList());
            String firstFrozenLocNo = locMastMapper.findFirstFrozenLocNo(locNoList);
            if (firstFrozenLocNo != null) {
                throw new CoolException(firstFrozenLocNo + "库位已被冻结!");
            }
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
            if (locMast.getLocSts().equals("F")){
                // 启动出库开始 107.盘点出库
                stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
                stockOut(staNo,param.getOutStaArea(), locDetlDtos, IoWorkType.CHECK_OUT, userId);
            }else {
                throw new CoolException("所选库位存在状态不为F的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
            }
@@ -588,6 +1099,19 @@
        if (Cools.isEmpty(loc)){
            throw new CoolException("未找到库位");
        }
        // 判断库位是否冻结
        String sourceLocFrozen = locMastMapper.findFirstFrozenLocNo(Arrays.asList(sourceLoc.getLocNo(),loc.getLocNo()));
        if (sourceLocFrozen != null) {
            throw new CoolException(sourceLocFrozen + "库位已被冻结!");
        }

        // 判断库存是否冻结
        Optional<LocDetl> first = locDetls.stream().filter(locDetl -> locDetl.getFrozen() == 1).findFirst();
        if (first.isPresent()) {
            LocDetl locDetl = first.get();
            throw new CoolException(locDetl.getLocNo() + "," + locDetl.getMatnr() + "," + locDetl.getBatch() + "库存明细已被冻结!");
        }

        if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))){
            throw new CoolException("库位状态已改变");
        }
@@ -662,90 +1186,6 @@

    @Override
    @Transactional
    public void locMove(String sourceLocNo, Long userId) {
        LocMast sourceLoc = locMastService.selectById(sourceLocNo);
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
        if (Cools.isEmpty(sourceLoc)){
            throw new CoolException("未找到库位");
        }
//        LocMast loc = locMastService.selectById(locNo);
//        if (Cools.isEmpty(loc)){
//            throw new CoolException("未找到库位");
//        }
//        if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))){
//            throw new CoolException("库位状态已改变");
//        }
//        if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
//            throw new CoolException("移转库位属于不同堆垛机");
//        }
        Date now = new Date();
        // 获取工作号
        int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
        // 保存工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
        wrkMast.setIoType(111); // 入出库状态： 111.库格移载(原)
        wrkMast.setIoPri(10D);
        wrkMast.setCrnNo(sourceLoc.getCrnNo());
        wrkMast.setSourceLocNo(sourceLocNo); // 源库位
        wrkMast.setLocNo(sourceLocNo); // 目标库位
        wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 空板
        wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setAppeUser(userId);
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        // 工作档明细保存
        for (LocDetl locDetl : locDetls) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(now);
            wrkDetl.setAnfme(locDetl.getAnfme());
            wrkDetl.setAppeTime(now);
            wrkDetl.setAppeUser(userId);
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(userId);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }
        }
        // 修改源库位状态
        if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
            sourceLoc.setLocSts("R"); // R.出库预约
            sourceLoc.setModiUser(userId);
            sourceLoc.setModiTime(now);
            if (!locMastService.updateById(sourceLoc)){
                throw new CoolException("更新源库位状态失败");
            }
        } else {
            throw new CoolException("源库位出库失败，状态："+sourceLoc.getLocSts$());
        }
//        // 修改目标库位状态
//        if (loc.getLocSts().equals("O")) {
//            loc.setLocSts("S"); // S.入库预约
//            loc.setModiTime(now);
//            loc.setModiUser(userId);
//            if (!locMastService.updateById(loc)) {
//                throw new CoolException("更新目标库位状态失败");
//            }
//        } else {
//            throw new CoolException("移转失败，目标库位状态："+loc.getLocSts$());
//        }
    }

    @Override
    @Transactional
    public void completeWrkMast(String workNo, Long userId) {
        WrkMast wrkMast = wrkMastService.selectById(workNo);
        if (Cools.isEmpty(wrkMast)){
@@ -754,8 +1194,14 @@
        if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
            throw new CoolException("当前工作档已完成");
        }

        ReturnT<String> returnT = workMastHandler.completeTask(wrkMast);
        if (!returnT.isSuccess()) {
            throw new CoolException(returnT.getMsg());
        }

        // 入库 + 库位转移
        if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && (wrkMast.getIoType() == 11) || wrkMast.getIoType() == 111)) {
        if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
            wrkMast.setWrkSts(4L);
        // 出库
        } else if (wrkMast.getWrkSts() > 10) {
@@ -767,7 +1213,7 @@
        wrkMast.setModiTime(now);
        wrkMast.setModiUser(userId);
        // 完成操作人员记录
        wrkMast.setManuType("手动完成");
        wrkMast.setManuType("手动申请完成");
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException("修改工作档失败");
        }
@@ -790,6 +1236,31 @@

        List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();

        // 添加历史工作主档
        WrkMastLog wrkMast = new WrkMastLog();
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(5);
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setSourceLocNo(locMast.getLocNo());
        wrkMast.setLocNo(locMast.getLocNo());
        wrkMast.setBarcode(locMast.getBarcode()); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setAppeUser(userId);
        wrkMast.setModiUser(userId);

        // 增删改只创建一次工作主档
        boolean updateFlag = true;
        boolean deleteFlag = true;
        boolean addFlag = true;

        // 修改数量
        Iterator<LocDetl> iterator = locDetls.iterator();
        while (iterator.hasNext()) {
@@ -803,7 +1274,8 @@
                    if (!locDetl.getAnfme().equals(adjust.getCount())) {
                        // todo 盘点记录
                        // 修改库存
                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {
                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(),
                                locDetl.getStandby1(),locDetl.getStandby2(),locDetl.getStandby3(),locDetl.getBoxType1(),locDetl.getBoxType2(),locDetl.getBoxType3())) {
                            throw new CoolException(locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "批号修改数量失败");
                        }
                        // 保存调整记录
@@ -818,6 +1290,30 @@
                        adjDetl.setAppeTime(now);
                        adjDetl.setAppeUser(userId);
                        adjDetlService.save(adjDetl, userId);

                        if (updateFlag) {
                            wrkMast.setWrkNo(commonService.getWorkNo(3));
                            wrkMast.setIoType(23);
                            boolean res = wrkMastLogService.insert(wrkMast);
                            if (!res) {
                                throw new CoolException("库存调整-修改 保存工作档失败");
                            }
                            updateFlag = false;
                        }

                        // 添加历史工作明细
                        WrkDetlLog wrkDetl = new WrkDetlLog();
                        wrkDetl.sync(locDetl);
                        wrkDetl.setWrkNo(wrkMast.getWrkNo());
                        wrkDetl.setIoTime(wrkMast.getIoTime());
                        wrkDetl.setAnfme(adjust.getCount());
                        wrkDetl.setAppeTime(now);
                        wrkDetl.setModiTime(now);
                        wrkMast.setAppeUser(userId);
                        wrkMast.setModiUser(userId);
                        if (!wrkDetlLogService.insert(wrkDetl)) {
                            throw new CoolException("保存工作明细失败");
                        }
                    }
                    iterator.remove();
                    iterator1.remove();
@@ -828,7 +1324,8 @@
        // 删除库存
        for (LocDetl locDetl : locDetls) {
            // todo 盘点记录
            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {
            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(),
                    locDetl.getStandby1(),locDetl.getStandby2(),locDetl.getStandby3(),locDetl.getBoxType1(),locDetl.getBoxType2(),locDetl.getBoxType3())) {
                throw new CoolException("删除" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "批号库存明细失败");
            }
            // 保存调整记录
@@ -843,6 +1340,30 @@
            adjDetl.setAppeTime(now);
            adjDetl.setAppeUser(userId);
            adjDetlService.save(adjDetl, userId);

            if (deleteFlag) {
                wrkMast.setWrkNo(commonService.getWorkNo(3));
                wrkMast.setIoType(22);
                boolean res = wrkMastLogService.insert(wrkMast);
                if (!res) {
                    throw new CoolException("库存调整-删除 保存工作档失败");
                }
                deleteFlag = false;
            }

            // 添加历史工作明细
            WrkDetlLog wrkDetl = new WrkDetlLog();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAnfme(0.0);
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkMast.setAppeUser(userId);
            wrkMast.setModiUser(userId);
            if (!wrkDetlLogService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        }

        // 添加库存
@@ -853,6 +1374,7 @@
            locDetl.sync(mat);
            locDetl.setBatch(adjust.getBatch());
            locDetl.setLocNo(locMast.getLocNo());
            locDetl.setZpallet(locMast.getBarcode());
            locDetl.setAnfme(adjust.getCount()); // 数量
            locDetl.setModiUser(userId); // 操作人员信息
            locDetl.setModiTime(now);
@@ -873,6 +1395,30 @@
            adjDetl.setAppeTime(now);
            adjDetl.setAppeUser(userId);
            adjDetlService.save(adjDetl, userId);

            if (addFlag) {
                wrkMast.setWrkNo(commonService.getWorkNo(3));
                wrkMast.setIoType(21);
                boolean res = wrkMastLogService.insert(wrkMast);
                if (!res) {
                    throw new CoolException("库存调整-新增 保存工作档失败");
                }
                addFlag = false;
            }

            // 添加历史工作明细
            WrkDetlLog wrkDetl = new WrkDetlLog();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAnfme(adjust.getCount());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkMast.setAppeUser(userId);
            wrkMast.setModiUser(userId);
            if (!wrkDetlLogService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        }
        // 修改库位状态
        int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
@@ -947,6 +1493,11 @@
            throw new CoolException("当前工作状态无法取消");
        }

        ReturnT<String> returnT = workMastHandler.cancelTask(wrkMast);
        if (!returnT.isSuccess()) {
            throw new CoolException(returnT.getMsg());
        }

        //取消入库工作档时，查询组托表，如果有将状态改为待处理
        if(wrkMast.getIoType() == 1) {
            List<WaitPakin> waitPakins=waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
@@ -955,7 +1506,8 @@
                    waitPakin.setIoStatus("N");
                    waitPakin.setLocNo("");
                    waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
                            .eq("order_no", waitPakin.getOrderNo())
//                            .eq("order_no", waitPakin.getOrderNo())
                            .eq("zpallet",waitPakin.getZpallet())
                            .eq("matnr", waitPakin.getMatnr())
                            .eq("batch", waitPakin.getBatch()));
                }
@@ -965,30 +1517,46 @@
        //取消出库工作档时，查询单据管理表，回滚作业中数量
        if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            if(wrkMast.getLocNo() != null){
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                locMast.setLocSts("O");
                locMast.setModiTime(now);
                locMast.setModiUser(userId);
                boolean locMastRes = locMastService.updateById(locMast);
                if (!locMastRes) {
                    throw new CoolException("保存数据失败");
                }
            }
            for (WrkDetl wrkDetl : wrkDetls) {
                if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                    if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
                        throw new CoolException("订单数据回滚失败");
                    }
//                    if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
//                        throw new CoolException("订单数据回滚失败");
//                    }
                    OrderInAndOutUtil.decrease(Boolean.FALSE,wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),
                            wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),
                            wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme());

                    //修改订单主表状态,没有作业数量时才可以修改
                    boolean flag = true;
                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
//                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
                    Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
                    List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
                    for(OrderDetl orderDetl : orderDetls){
                        if(orderDetl.getWorkQty() > 0){
                            flag = false;
                        }
                    }
                    if(flag){
                        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
//                        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
                        if(!Cools.isEmpty(order) && order.getSettle()==2){
                            order.setSettle(1L);
                            order.setUpdateBy(userId);
                            order.setUpdateTime(now);
                        }
                        if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
                            throw new CoolException("修改订单状态失败");
                        }
//                        if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
//                            throw new CoolException("修改订单状态失败");
//                        }
                        OrderInAndOutUtil.updateOrder(Boolean.FALSE,order.getId(),order.getSettle(),userId);
                    }
                }
            }
@@ -1008,7 +1576,7 @@
//        }

        // 取消操作人员记录
        wrkMast.setManuType("手动取消");
        wrkMast.setManuType("手动申请取消");
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        if (!wrkMastService.updateById(wrkMast)) {
@@ -1032,15 +1600,17 @@

        // 修改库位状态
        LocMast locMast = locMastService.selectById(locNo);
        if (Cools.isEmpty(locMast)) {
        if (Cools.isEmpty(locMast) && wrkMast.getIoType() != 12) {
            throw new CoolException("取消工作档失败，库位不存在:"+ locNo);
        }
        locMast.setLocSts(locSts);
        locMast.setModiTime(now);
        locMast.setModiUser(userId);
        boolean locMastRes = locMastService.updateById(locMast);
        if (!wrkMastRes || !locMastRes) {
            throw new CoolException("保存数据失败");
        if(wrkMast.getIoType() != 12){
            locMast.setLocSts(locSts);
            locMast.setModiTime(now);
            locMast.setModiUser(userId);
            boolean locMastRes = locMastService.updateById(locMast);
            if (!wrkMastRes || !locMastRes) {
                throw new CoolException("保存数据失败");
            }
        }
    }