From 1b7c03baf021e4896b296e2c0af277c4c57656e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 12 八月 2024 17:27:03 +0800
Subject: [PATCH] 空托入库到达入库码头请求入库更新条码

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 1455 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 1,427 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 529ad91..a2a9b82 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,28 +1,37 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
+import com.core.common.R;
 import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.*;
 import com.zy.asrs.entity.result.OpenOrderCompeteResult;
 import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.entity.result.ZphjcdgzVo;
+import com.zy.asrs.entity.result.ZphjcdwcVo;
+import com.zy.asrs.mapper.TagMapper;
 import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MatUtils;
+import com.zy.common.constant.MesConstant;
 import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocTypeDto;
+import com.zy.common.model.StartupDto;
+import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.NodeUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Created by vincent on 2022/4/9
@@ -43,6 +52,38 @@
     private MatService matService;
     @Autowired
     private LocDetlService locDetlService;
+    @Autowired
+    private PackService packService;
+    @Autowired
+    private TagService tagService;
+    @Autowired
+    private TagMapper tagMapper;
+    @Autowired
+    private WrkMastService wrkMastService;
+    @Autowired
+    private BasDevpService basDevpService;
+    @Autowired
+    private WrkDetlService wrkDetlService;
+    @Autowired
+    private WaitPakinService waitPakinService;
+    @Autowired
+    private CommonService commonService;
+    @Autowired
+    private LocDetlRullUpDetailService locDetlRullUpDetailService;
+    @Autowired
+    private WrkDetlSingleService wrkDetlSingleService;
+    @Autowired
+    private WrkMastLogService wrkMastLogService;
+    @Autowired
+    private WrkMastStaService wrkMastStaService;
+    @Autowired
+    private WrkMastStaLogService wrkMastStaLogService;
+    @Autowired
+    private StaDescService staDescService;
+    @Autowired
+    private LocMastService locMastService;
+    @Autowired
+    private ApiLogService apiLogService;
 
     @Override
     @Transactional
@@ -114,6 +155,7 @@
             OrderDetl orderDetl = new OrderDetl();
             orderDetl.sync(mat);
             orderDetl.setBatch(detlDto.getBatch());
+            orderDetl.setAnfme(detlDto.getAnfme());
             orderDetl.setOrderId(order.getId());
             orderDetl.setOrderNo(order.getOrderNo());
             orderDetl.setCreateBy(9527L);
@@ -132,25 +174,7 @@
     @Transactional
     public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
         List<OpenOrderCompeteResult> results = new ArrayList<>();
-        if (Cools.isEmpty(param.getOrderNo())) {
-            // 鎵�鏈夎鍗�
-            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
-            for (Order order : orders) {
-                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-                results.add(result);
-                result.setOrderNo(order.getOrderNo());
-                result.setOrderTime(order.getOrderTime());
-                result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-                for (OrderDetl orderDetl : orderDetls) {
-                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-                }
-                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                }
-            }
-        } else {
+        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
             // 鎸囧畾璁㈠崟
             Order order = orderService.selectByNo(param.getOrderNo());
             if (null != order) {
@@ -170,6 +194,158 @@
                     }
                 }
             }
+        } else {
+            // 鎵�鏈夎鍗�
+            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+            for (Order order : orders) {
+                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+                results.add(result);
+                result.setOrderNo(order.getOrderNo());
+                result.setOrderTime(order.getOrderTime());
+                result.setOrderType(order.getDocType$());
+                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+                for (OrderDetl orderDetl : orderDetls) {
+                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+                }
+                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                }
+            }
+        }
+        return results;
+    }
+
+    @Override
+    @Transactional
+    public void pakoutOrderCreate(OpenOrderPakoutParam param) {
+        Order order = orderService.selectByNo(param.getOrderNo());
+        // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
+        if (!Cools.isEmpty(order)) {
+            if (order.getSettle() > 1L) {
+                throw new CoolException(param.getOrderNo() + "姝e湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+            }
+            orderService.remove(order.getId());
+        }
+        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+        Date now = new Date();
+        // 鍗曟嵁涓绘。
+        order = new Order(
+                String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
+                param.getOrderNo(),    // 璁㈠崟缂栧彿
+                DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
+                docType.getDocId(),    // 鍗曟嵁绫诲瀷
+                null,    // 椤圭洰缂栧彿
+                null,    //
+                null,    // 璋冩嫧椤圭洰缂栧彿
+                null,    // 鍒濆绁ㄦ嵁鍙�
+                null,    // 绁ㄦ嵁鍙�
+                null,    // 瀹㈡埛缂栧彿
+                null,    // 瀹㈡埛
+                null,    // 鑱旂郴鏂瑰紡
+                null,    // 鎿嶄綔浜哄憳
+                null,    // 鍚堣閲戦
+                null,    // 浼樻儬鐜�
+                null,    // 浼樻儬閲戦
+                null,    // 閿�鍞垨閲囪喘璐圭敤鍚堣
+                null,    // 瀹炰粯閲戦
+                null,    // 浠樻绫诲瀷
+                null,    // 涓氬姟鍛�
+                null,    // 缁撶畻澶╂暟
+                null,    // 閭垂鏀粯绫诲瀷
+                null,    // 閭垂
+                null,    // 浠樻鏃堕棿
+                null,    // 鍙戣揣鏃堕棿
+                null,    // 鐗╂祦鍚嶇О
+                null,    // 鐗╂祦鍗曞彿
+                1L,    // 璁㈠崟鐘舵��
+                1,    // 鐘舵��
+                9527L,    // 娣诲姞浜哄憳
+                now,    // 娣诲姞鏃堕棿
+                9527L,    // 淇敼浜哄憳
+                now,    // 淇敼鏃堕棿
+                null    // 澶囨敞
+        );
+        if (!orderService.insert(order)) {
+            throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�");
+        }
+        // 鍗曟嵁鏄庣粏妗�
+        List<DetlDto> list = new ArrayList<>();
+        List<DetlDto> orderDetails = param.getOrderDetails();
+        for (DetlDto detail : orderDetails) {
+            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+            if (DetlDto.has(list, dto)) {
+                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
+                assert detlDto != null;
+                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+            } else {
+                list.add(dto);
+            }
+        }
+        for (DetlDto detlDto : list) {
+            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+            if (Cools.isEmpty(mat)) {
+                throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+            }
+            OrderDetl orderDetl = new OrderDetl();
+            orderDetl.sync(mat);
+            orderDetl.setBatch(detlDto.getBatch());
+            orderDetl.setAnfme(detlDto.getAnfme());
+            orderDetl.setOrderId(order.getId());
+            orderDetl.setOrderNo(order.getOrderNo());
+            orderDetl.setCreateBy(9527L);
+            orderDetl.setCreateTime(now);
+            orderDetl.setUpdateBy(9527L);
+            orderDetl.setUpdateTime(now);
+            orderDetl.setStatus(1);
+            orderDetl.setQty(0.0D);
+            if (!orderDetlService.insert(orderDetl)) {
+                throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
+            }
+        }
+    }
+
+    @Override
+    public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
+        List<OpenOrderCompeteResult> results = new ArrayList<>();
+        if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
+            // 鎸囧畾璁㈠崟
+            Order order = orderService.selectByNo(param.getOrderNo());
+            if (null != order) {
+                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+                results.add(result);
+                result.setOrderNo(order.getOrderNo());
+                result.setOrderTime(order.getOrderTime());
+                result.setOrderType(order.getDocType$());
+                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+                for (OrderDetl orderDetl : orderDetls) {
+                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+                }
+                if (order.getSettle() == 4L) {
+                    // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                    }
+                }
+            }
+        } else {
+            // 鎵�鏈夎鍗�
+            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+            for (Order order : orders) {
+                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
+                results.add(result);
+                result.setOrderNo(order.getOrderNo());
+                result.setOrderTime(order.getOrderTime());
+                result.setOrderType(order.getDocType$());
+                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+                for (OrderDetl orderDetl : orderDetls) {
+                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
+                }
+                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                }
+            }
         }
         return results;
     }
@@ -180,4 +356,1227 @@
         return locDetlService.queryStockTotal();
     }
 
+    @Override
+    @Transactional
+    public void packageUp(PackParam param) {
+        if (Cools.isEmpty(param.getBarcode())) {
+            throw new CoolException("barcode涓嶈兘涓虹┖");
+        }
+        Mat analyse = MatUtils.analyseMat(param.getBarcode());
+        Pack pack = packService.selectByBarcode(param.getBarcode());
+        if (null != pack) {
+            throw new CoolException(param.getBarcode() + "閲嶅鎻愪氦");
+        }
+        Date now = new Date();
+        pack = new Pack(
+                param.getBarcode(),    // 鏉$爜[闈炵┖]
+                analyse.getMatnr(),    // 鍟嗗搧缂栧彿
+                analyse.getBarcode(),    // 搴忓垪鐮�
+                1L,    // 璁㈠崟鐘舵��
+                1,    // 鐘舵��
+                now,    // 娣诲姞鏃堕棿
+                null,    // 娣诲姞浜哄憳
+                now,    // 淇敼鏃堕棿
+                null,    // 淇敼浜哄憳
+                null    // 澶囨敞
+        );
+        if (!packService.insert(pack)) {
+            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+        }
+
+        Mat mat = matService.selectByMatnr(analyse.getMatnr());
+        if (mat == null) {
+            mat = new Mat();
+            // 鍒嗙被
+            Long tagId;
+            // 涓�绾у垎绫�
+            if (!Cools.isEmpty(param.getGroupCode()) && !Cools.isEmpty(param.getGroupName())) {
+                Tag priTag = tagService.selectByName(param.getGroupCode(), 2);
+                if (priTag == null) {
+                    Tag top = tagService.getTop();
+                    NodeUtils nodeUtils = new NodeUtils();
+                    nodeUtils.executePath(top.getId());
+                    priTag = new Tag(
+                            null,    // 缂栧彿
+                            param.getGroupCode(),    // 鍚嶇О
+                            top.getId(),    // 鐖剁骇
+                            top.getName(),    // 鐖剁骇鍚嶇О
+                            nodeUtils.path.toString(),    // 鍏宠仈璺緞
+                            nodeUtils.pathName.toString(),    // 鍏宠仈璺緞鍚�
+                            0,    // 绫诲瀷
+                            null,    // 璐熻矗浜�
+                            null,    // 鍥剧墖
+                            null,    // 绠�瑕佹弿杩�
+                            null,    // 鏁伴噺
+                            2,    // 绛夌骇
+                            null,    // 鎺掑簭
+                            1,    // 鐘舵��
+                            now,    // 娣诲姞鏃堕棿
+                            null,    // 娣诲姞浜哄憳
+                            now,    // 淇敼鏃堕棿
+                            null,    // 淇敼浜哄憳
+                            null    // 澶囨敞
+                    );
+                    if (tagMapper.insert(priTag) == 0) {
+                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                    }
+                }
+                // 浜岀骇鍒嗙被
+                Tag secTag = tagService.selectByName(param.getGroupName(), 3);
+                if (secTag == null) {
+                    NodeUtils nodeUtils = new NodeUtils();
+                    nodeUtils.executePath(priTag.getId());
+                    secTag = new Tag(
+                            null,    // 缂栧彿
+                            param.getGroupName(),    // 鍚嶇О
+                            priTag.getId(),    // 鐖剁骇
+                            priTag.getName(),    // 鐖剁骇鍚嶇О
+                            nodeUtils.path.toString(),    // 鍏宠仈璺緞
+                            nodeUtils.pathName.toString(),    // 鍏宠仈璺緞鍚�
+                            0,    // 绫诲瀷
+                            null,    // 璐熻矗浜�
+                            null,    // 鍥剧墖
+                            null,    // 绠�瑕佹弿杩�
+                            null,    // 鏁伴噺
+                            3,    // 绛夌骇
+                            null,    // 鎺掑簭
+                            1,    // 鐘舵��
+                            now,    // 娣诲姞鏃堕棿
+                            null,    // 娣诲姞浜哄憳
+                            now,    // 淇敼鏃堕棿
+                            null,    // 淇敼浜哄憳
+                            null    // 澶囨敞
+                    );
+                    if (tagMapper.insert(secTag) == 0) {
+                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                    }
+                }
+                tagId = secTag.getId();
+            } else {
+                tagId = tagService.getTop().getId();
+            }
+            mat.setTagId(tagId);
+            mat.setMatnr(analyse.getMatnr());
+            mat.setMaktx(param.getMaterialName());
+            mat.setSpecs(param.getConfigureDesc());
+            mat.setModel(analyse.getModel());
+            mat.setStatus(1);
+            mat.setCreateTime(now);
+            mat.setUpdateTime(now);
+            if (!matService.insert(mat)) {
+                throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+            } else {
+                log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+            }
+        }
+    }
+
+    @Override
+    @Transactional
+    public void syncMat(MatSyncParam param) {
+        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+            throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
+        }
+
+        for(MatSyncParam.MatParam matParam : param.getMatDetails()){
+            if(Cools.isEmpty(matParam.getMatnr())){
+                throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
+            }
+
+            Date now = new Date();
+            Mat mat = matService.selectByMatnr(matParam.getMatnr());
+            if (mat == null) {
+                mat = new Mat();
+                // 鍒嗙被
+                Long tagId;
+                // 涓�绾у垎绫�
+                if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
+                    Tag priTag = tagService.selectByName(matParam.getGroupCode(), 2);
+                    if (priTag == null) {
+                        Tag top = tagService.getTop();
+                        NodeUtils nodeUtils = new NodeUtils();
+                        nodeUtils.executePath(top.getId());
+                        priTag = new Tag(
+                                null,    // 缂栧彿
+                                matParam.getGroupCode(),    // 鍚嶇О
+                                top.getId(),    // 鐖剁骇
+                                top.getName(),    // 鐖剁骇鍚嶇О
+                                nodeUtils.path.toString(),    // 鍏宠仈璺緞
+                                nodeUtils.pathName.toString(),    // 鍏宠仈璺緞鍚�
+                                0,    // 绫诲瀷
+                                null,    // 璐熻矗浜�
+                                null,    // 鍥剧墖
+                                null,    // 绠�瑕佹弿杩�
+                                null,    // 鏁伴噺
+                                2,    // 绛夌骇
+                                null,    // 鎺掑簭
+                                1,    // 鐘舵��
+                                now,    // 娣诲姞鏃堕棿
+                                null,    // 娣诲姞浜哄憳
+                                now,    // 淇敼鏃堕棿
+                                null,    // 淇敼浜哄憳
+                                null    // 澶囨敞
+                        );
+                        if (tagMapper.insert(priTag) == 0) {
+                            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                        }
+                    }
+                    // 浜岀骇鍒嗙被
+                    Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+                    if (secTag == null) {
+                        NodeUtils nodeUtils = new NodeUtils();
+                        nodeUtils.executePath(priTag.getId());
+                        secTag = new Tag(
+                                null,    // 缂栧彿
+                                matParam.getGroupName(),    // 鍚嶇О
+                                priTag.getId(),    // 鐖剁骇
+                                priTag.getName(),    // 鐖剁骇鍚嶇О
+                                nodeUtils.path.toString(),    // 鍏宠仈璺緞
+                                nodeUtils.pathName.toString(),    // 鍏宠仈璺緞鍚�
+                                0,    // 绫诲瀷
+                                null,    // 璐熻矗浜�
+                                null,    // 鍥剧墖
+                                null,    // 绠�瑕佹弿杩�
+                                null,    // 鏁伴噺
+                                3,    // 绛夌骇
+                                null,    // 鎺掑簭
+                                1,    // 鐘舵��
+                                now,    // 娣诲姞鏃堕棿
+                                null,    // 娣诲姞浜哄憳
+                                now,    // 淇敼鏃堕棿
+                                null,    // 淇敼浜哄憳
+                                null    // 澶囨敞
+                        );
+                        if (tagMapper.insert(secTag) == 0) {
+                            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                        }
+                    }
+                    tagId = secTag.getId();
+                } else {
+                    tagId = tagService.getTop().getId();
+                }
+                mat.sync(param);
+//            mat.setMatnr(param.getMatnr());
+//            mat.setMaktx(param.getMaktx());
+//            mat.setSpecs(param.getSpecs());
+//            mat.setModel(param.getModel());
+
+                mat.setTagId(tagId);
+                mat.setStatus(1);
+                mat.setCreateTime(now);
+                mat.setUpdateTime(now);
+                if (!matService.insert(mat)) {
+                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                } else {
+                    log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+                }
+            } else {
+                mat.sync(param);
+                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+                    throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
+                }
+            }
+        }
+
+    }
+
+    /*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+    /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+
+    /*
+     * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+     * */
+    @Override
+    @Transactional
+    public LabellerMatParam labellerMat(LabellerMatParam param){
+        if (Cools.isEmpty(param.getDevNo())){
+            throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓虹┖");
+        }else if (Cools.isEmpty(param.getLabNo())){
+            throw new CoolException("鍙傛暟锛氳创鏍囨満鍙� labNo涓虹┖");
+        }
+        BasDevp basDevp = basDevpService.selectById(param.getDevNo());
+        if (Cools.isEmpty(basDevp)){
+            throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓嶅瓨鍦�");
+        }else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0){
+            throw new CoolException("绔欑偣:"+param.getDevNo()+" 涓嶅瓨鍦ㄥ伐浣滀腑浠诲姟");
+        }
+
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+        if (Cools.isEmpty(wrkMast)){
+            throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪,浠诲姟鍙凤細"+basDevp.getWrkNo());
+        }else if (!wrkMast.getWrkSts().equals(52L)){
+            throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔$姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
+        }
+
+        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
+        if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
+            throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪浠诲姟鏄庣粏,浠诲姟鍙凤細"+basDevp.getWrkNo());
+        }
+
+        LabellerMatParam labellerMatParam = new LabellerMatParam();
+        labellerMatParam.setDevNo(param.getDevNo());
+        labellerMatParam.setLabNo(param.getLabNo());
+        labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
+//        ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
+        ArrayList<LabellerMatParam.BoxNo> boxNos = new ArrayList<>();
+//        String orderNo = "";
+
+        for (WrkDetl wrkDetl:wrkDetls){
+            LabellerMatParam.BoxNo boxNo = new LabellerMatParam.BoxNo();
+            boxNo.setBoxNo(wrkDetl.getBatch());
+            boxNos.add(boxNo);
+        }
+        labellerMatParam.setBoxNos(boxNos);
+//        for (WrkDetl wrkDetl:wrkDetls){
+//            LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
+//            orderNo=wrkDetl.getOrderNo();
+//            combMat.setTemp1("1");
+//            combMats.add(combMat);
+//        }
+
+//        labellerMatParam.setCombMats(combMats);
+//        labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
+//        labellerMatParam.setLabTemplate("1");
+//        labellerMatParam.setOrderNo(orderNo);
+        wrkMast.setWrkSts(53L);
+        if (!wrkMastService.updateById(wrkMast)){
+            throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+        }
+        return labellerMatParam;
+    }
+
+    /*
+    * 璐存爣鏈鸿创鏍囧畬鎴�
+    * */
+    @Override
+    @Transactional
+    public void labellerComplete(LabellerCompleteParam param) {
+        if (Cools.isEmpty(param.getDevNo())){
+            throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓虹┖");
+        }else if (Cools.isEmpty(param.getLabNo())){
+            throw new CoolException("鍙傛暟锛氳创鏍囨満鍙� labNo涓虹┖");
+        }else if (Cools.isEmpty(param.getLabResult())){
+            throw new CoolException("鍙傛暟锛氳创鏍囩粨鏋� labResult涓虹┖");
+        }else if (Cools.isEmpty(param.getWrkNo())){
+            throw new CoolException("鍙傛暟锛氳创鏍囦换鍔″彿 wrkNo涓虹┖");
+        }
+        BasDevp basDevp = basDevpService.selectById(param.getDevNo());
+        if (Cools.isEmpty(basDevp)){
+            throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo="+param.getDevNo()+"涓嶅瓨鍦�");
+        }else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0 ){
+            throw new CoolException("绔欑偣:"+param.getDevNo()+" 涓嶅瓨鍦ㄥ伐浣滀腑浠诲姟");
+        }else if(!basDevp.getWrkNo().toString().equals(param.getWrkNo())){
+            throw new CoolException("绔欑偣:"+param.getDevNo()+" 杩涜涓换鍔″彿="+basDevp.getWrkNo()+" 涓庤创鏍囩粨鏋滆繑鍥炰换鍔″彿="+param.getWrkNo()+" 涓嶄竴鑷�");
+        }
+
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+        if (Cools.isEmpty(wrkMast)){
+            throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪,浠诲姟鍙凤細"+basDevp.getWrkNo());
+        }else if (!wrkMast.getWrkSts().equals(53L)){
+            throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔$姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
+        }
+
+        if (param.getLabResult().equals("OK")){
+            wrkMast.setWrkSts(54L);
+            wrkMast.setStaNo(144);
+            if (!wrkMastService.updateById(wrkMast)){
+                throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+            }
+        }else if (param.getLabResult().equals("NG")){
+            wrkMast.setWrkSts(52L);//閲嶆柊璐存爣
+            if (!wrkMastService.updateById(wrkMast)){
+                throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+            }
+        }else {
+            throw new CoolException("鍙傛暟锛氳创鏍囩粨鏋�:labResult"+param.getLabResult()+";璇锋寜瑙勫垯鍙戦�侊細鎴愬姛锛歄K 銆佸け璐�:NG");
+        }
+
+    }
+
+    /*
+     * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+     * */
+    @Override
+    @Transactional
+    public void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param) {
+        Long userId = 7777L;//涓帶
+        //鍒ゆ柇param鍙傛暟
+        if (Cools.isEmpty(param.getBarcode())){
+            throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+        }else if (Cools.isEmpty(param.getPalletizingNo())){
+            throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
+        }else if (Cools.isEmpty(param.getBoxType())){
+            throw new CoolException("鍙傛暟锛氭湪绠辩被鍨� boxType涓虹┖");
+        }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
+            throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
+        }
+
+        String matnrOne = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍¢獙  1銆佸乏
+        String matnrTwo = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍¢獙  2銆佸彸
+        ArrayList<String> boxNos = new ArrayList<>();   //鏈ㄧ鍞竴缂栫爜鏌ラ噸  锛坆atch锛�
+        //鍒ゆ柇matLists鍙傛暟
+        for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
+            if (Cools.isEmpty(matList.getMatnr())){
+                throw new CoolException("鍙傛暟锛氳鏍� matnr涓虹┖");
+            }else if (Cools.isEmpty(matList.getPosition())){
+                throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鐮佸灈浣嶇疆 position涓虹┖");
+            }else if (Cools.isEmpty(matList.getBatch())){
+                throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 batch涓虹┖");
+            }else if (Cools.isEmpty(matList.getModel())){
+                throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗峰彿 model涓虹┖");
+            }else if (Cools.isEmpty(matList.getBatch())){
+                throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 boxNo涓虹┖");
+            }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
+                throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍑�閲� weight涓虹┖");
+            }else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
+                throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight");
+            }else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
+                throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent");
+            }
+//            else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
+//                throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご鏁� joint");
+//            }
+
+            if (matList.getPosition().equals("1")){//1銆佸乏  2銆佸彸
+                if (!matnrOne.equals("")){
+                    if (!matnrOne.equals(matList.getMatnr())){
+                        throw new CoolException("鏈ㄧ浣嶇疆锛�"+matList.getPosition()+"瀛樺湪涓嶅悓瑙勬牸鍗蜂俊鎭�");
+                    }
+                }else {
+                    matnrOne=matList.getMatnr();
+                }
+            }else if (matList.getPosition().equals("2")){
+                if (!matnrTwo.equals("")){
+                    if (!matnrTwo.equals(matList.getMatnr())){
+                        throw new CoolException("鏈ㄧ浣嶇疆锛�"+matList.getPosition()+"瀛樺湪涓嶅悓瑙勬牸鍗蜂俊鎭�");
+                    }
+                }else {
+                    matnrTwo=matList.getMatnr();
+                }
+            }else {
+                throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ浣嶇疆閿欒锛�"+matList.getPosition());
+            }
+
+            if (!boxNos.contains(matList.getBatch())){
+                boxNos.add(matList.getBatch());
+            }else {
+                throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
+            }
+        }
+
+//        BasDevp basDevp = basDevpService.selectById(Integer.parseInt(param.getDevNo$()));
+//        if (Cools.isEmpty(basDevp)){
+//            throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo="+param.getPalletizingNo()+"涓嶅瓨鍦�");
+//        }
+//        if (Cools.isEmpty(basDevp.getAutoing()) || !basDevp.getAutoing().equals("Y")){
+//            throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄嚜鍔ㄧ姸鎬�");
+//        }
+//        if (Cools.isEmpty(basDevp.getLoading()) || !basDevp.getLoading().equals("Y")){
+//            throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄湁鐗╃姸鎬�");
+//        }
+//        if (Cools.isEmpty(basDevp.getCanining()) || !basDevp.getCanining().equals("Y")){
+//            throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄兘鍏ョ姸鎬�");
+//        }
+
+
+        if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
+            || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
+            || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
+            throw new CoolException("鎵樼洏鏉$爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭");
+        }
+
+
+        Date now = new Date();
+        for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
+            Mat mat = matService.selectByMatnr(matList.getMatnr());
+            if (Cools.isEmpty(mat)) {
+                mat = new Mat();
+                mat.setMatnr(matList.getMatnr());
+                mat.setMaktx(matList.getMatnr());
+                mat.setTagId(tagService.getTop().getId());
+                mat.setCreateBy(userId);
+                mat.setCreateTime(now);
+                mat.setUpdateBy(userId);
+                mat.setUpdateTime(now);
+                mat.setStatus(1);
+                if (!matService.insert(mat)) {
+                    throw new CoolException("瑙勬牸娣诲姞澶辫触锛岃鑱旂郴绠$悊鍛�");
+                }
+            }
+            WaitPakin waitPakin = new WaitPakin();
+            waitPakin.sync(mat);
+            waitPakin.setBatch(matList.getBatch());       //鏈ㄧ缂栫爜  //鎵规  鍞竴鍊�  绠卞彿
+            waitPakin.setModel(matList.getModel());       //鍗峰彿  鍞竴鍊�
+            waitPakin.setBrand(param.getBoxType());     //鏈ㄧ绫诲瀷
+            waitPakin.setZpallet(param.getBarcode());   //鎵樼洏鐮�
+            waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
+            waitPakin.setWeight(matList.getWeight());  //鍑�閲�
+            waitPakin.setVolume(matList.getRoughWeight());  //姣涢噸
+            waitPakin.setPrice(matList.getRollExtent());   //闀垮害
+            waitPakin.setSpecs(String.valueOf(matList.getJoint()));   //鎺ュご
+            waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
+            waitPakin.setAnfme(matList.getAnfme());  // 鏁伴噺
+            waitPakin.setStatus("Y");    // 鐘舵��
+            waitPakin.setAppeUser(userId);
+            waitPakin.setAppeTime(now);
+            waitPakin.setModiUser(userId);
+            waitPakin.setModiTime(now);
+            if (!waitPakinService.insert(waitPakin)) {
+                throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
+            }
+        }
+
+    }
+
+    /*
+     * 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+     * */
+    @Override
+    @Transactional
+    public void palletizingCompleteS(PalletizingCompleteParam param) {
+        //鍒ゆ柇param鍙傛暟
+        if (Cools.isEmpty(param.getBarcode())){
+            throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+        }
+
+        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+        if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=2){
+            log.error("閫�搴撶爜鍨涘畬鎴愶紝杩斿洖鎵樼洏鐮佹湭鏌ヨ鍒板伐浣滄。妗堬紒");
+            throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode鏈煡璇㈠埌宸ヤ綔妗f");
+        }
+        wrkMast.setSheetNo("4");
+        wrkMastService.updateById(wrkMast);
+    }
+
+
+    /*
+     *涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
+     * */
+    @Override
+    @Transactional
+    public void balconyComplete(LabellerMatParam param) {
+        if (Cools.isEmpty(param.getWrkNo())){
+            throw new CoolException("宸ヤ綔鍙蜂负绌猴紒");
+        }
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getWrkNo()));
+        if (Cools.isEmpty(wrkMast)){
+            throw new CoolException("宸ヤ綔鍙蜂负绌猴紒");
+        }
+        wrkMast.setWrkSts(57L);
+        wrkMastService.updateById(wrkMast);
+    }
+
+    /*
+     * 妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡
+     * */
+    @Override
+    @Transactional
+    public void singleUnstackingComplete(SingleUnstackingCompleteParam param) {
+        Long userId = 8888L;//妗佹灦涓婁綅杞欢
+        //鍒ゆ柇param鍙傛暟
+        if (Cools.isEmpty(param.getPalletizingNo())){
+            throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
+        }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
+            throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
+        }
+
+        ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
+        ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
+        //鍒ゆ柇matLists鍙傛暟
+        for (SingleUnstackingCompleteParam.MatList matList:param.getMatList()){
+            if (Cools.isEmpty(matList.getPosition())){
+                throw new CoolException("鍙傛暟锛氱爜鍨涗綅缃� position涓虹┖");
+            }else if (Cools.isEmpty(matList.getBoxNo())){
+                throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo涓虹┖");
+            }
+            WrkDetlSingle wrkDetlSingleOne = wrkDetlSingleService.selectOne(new EntityWrapper<WrkDetlSingle>().eq("batch", matList.getBoxNo()));
+            List<WrkDetlSingle> wrkDetlSingles = wrkDetlSingleService.selectList(new EntityWrapper<WrkDetlSingle>()
+                    .eq("wrk_no", wrkDetlSingleOne.getWrkNo()).eq("io_time", wrkDetlSingleOne.getIoTime()));
+            boolean sign=true;
+            for (WrkDetlSingle wrkDetlSingle:wrkDetlSingles){
+                WrkDetl wrkDetl = new WrkDetl();
+                wrkDetl.sync(wrkDetlSingle);
+                wrkDetlsNew.add(wrkDetl);
+                wrkDetlsOld.add(wrkDetlSingle);
+                sign=false;
+                break;
+            }
+            if (sign){
+                throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo鏈煡璇㈠埌瀵瑰簲鐨勫伐浣滄槑缁嗭紒");
+            }
+        }
+
+        // 鐢熸垚宸ヤ綔鍙�
+        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(202));
+        Date now = new Date();
+
+        // 鐢熸垚宸ヤ綔妗�
+        WrkMast wrkMast = new WrkMast();
+        wrkMast.setWrkNo(workNo);
+        wrkMast.setIoTime(now);
+        wrkMast.setWrkSts(51L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+        wrkMast.setIoType(202); // 鍏ュ嚭搴撶姸鎬侊細202.鎷嗗灈鍚庡嚭搴�
+        wrkMast.setIoPri(99D); // 浼樺厛绾�
+        wrkMast.setSourceStaNo(param.getDevNo$());
+        wrkMast.setStaNo(144); //璐存爣绔欑偣  鐩存帴鍒板熬绔�
+        // 鎿嶄綔浜哄憳鏁版嵁
+        wrkMast.setAppeUser(userId);
+        wrkMast.setAppeTime(now);
+        wrkMast.setModiUser(userId);
+        wrkMast.setModiTime(now);
+        if (!wrkMastService.insert(wrkMast)) {
+            throw new CoolException("鐢熸垚宸ヤ綔妗eけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟鎷嗗灈瀹屾垚閫氱煡");
+        }
+
+        for (WrkDetl wrkDetl : wrkDetlsNew){
+            wrkDetl.setWrkNo(wrkMast.getWrkNo());
+            wrkDetl.setIoTime(wrkMast.getIoTime());
+            wrkDetl.setAppeTime(now);
+            wrkDetl.setModiTime(now);
+            if (!wrkDetlService.insert(wrkDetl)) {
+                throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟鎷嗗灈瀹屾垚閫氱煡");
+            }
+        }
+
+        for (WrkDetlSingle wrkDetlSingle : wrkDetlsOld) {
+            wrkDetlSingleService.delete(new EntityWrapper<WrkDetlSingle>()
+                    .eq("batch",wrkDetlSingle.getBatch())
+                    .eq("wrk_no",wrkDetlSingle.getWrkNo())
+                    .eq("io_time",wrkDetlSingle.getIoTime()));
+        }
+
+    }
+
+    /*
+     * 妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡
+     * */
+    @Override
+    @Transactional
+    public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
+//        Long userId = 8888L;//妗佹灦涓婁綅杞欢
+        //鍒ゆ柇param鍙傛暟
+        if (Cools.isEmpty(param.getBarcode())){
+            throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+        }
+        WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
+        if (Cools.isEmpty(wrkMastMatrix)){
+            throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗eけ璐ワ細"+param.getBarcode());
+        }
+
+        wrkMastMatrix.setSheetNo("2");
+        if (!wrkMastService.updateById(wrkMastMatrix)){
+            throw new CoolException("鏇存柊宸ヤ綔妗eけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
+        }
+    }
+
+    /*
+     *
+     * */
+    @Override
+    @Transactional
+    public void cs2() {
+//        int[] staNos =new int[]{122};
+//        for (Integer staNo:staNos){
+//            int[] crnNos =new int[]{6};
+//            for (Integer crnNo:crnNos){
+//                descSta(staNo,crnNo);
+//            }
+//        }
+
+    }
+
+    @Override
+    @Transactional
+    public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {
+
+        if (Cools.isEmpty(param)) {
+            throw new CoolException("璇锋眰鍙傛暟鏈夎锛�" + param);
+        }
+        if (!Cools.isEmpty(param.getBarcode())) {
+            int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+            if (zpalletCount > 0) {
+                throw new CoolException("搴撳瓨鎵樼洏鐮佸凡瀛樺湪锛�" + param.getBarcode());
+            }
+
+            int barcodeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+            if (barcodeCount > 0) {
+                throw new CoolException("宸ヤ綔妗e凡瀛樺湪璇ユ墭鐩樼爜锛�" + param.getBarcode());
+            }
+        }
+        LocTypeDto locTypeDto = new LocTypeDto();
+        locTypeDto.setLocType1((short)1);
+        int iotype = 1;
+        if (Cools.isEmpty(param.getMatList())) {
+            iotype = 10;
+        }
+        // 鏍规嵁婧愮珯鐐瑰鎵惧簱浣�
+//        StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo(), null,null,null, locTypeDto);
+        StartupDto dto = commonService.getLocNo(iotype, param.getPalletizingNo(), locTypeDto,0);
+
+        // 杩斿洖GWCS鐩爣淇℃伅
+        pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo());
+
+
+        int workNo = dto.getWorkNo();
+        Date now = new Date();
+        // 鐢熸垚宸ヤ綔妗�
+        WrkMast wrkMast = new WrkMast();
+        wrkMast.setWrkNo(workNo);
+        wrkMast.setIoTime(new Date());
+        wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
+        wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+        wrkMast.setIoPri(13D); // 浼樺厛绾�
+        wrkMast.setCrnNo(dto.getCrnNo());
+        wrkMast.setSourceStaNo(param.getPalletizingNo());
+        wrkMast.setStaNo(dto.getStaNo());
+        wrkMast.setLocNo(dto.getLocNo());
+        wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+        wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+        wrkMast.setPicking("N"); // 鎷f枡
+        wrkMast.setExitMk("N"); // 閫�鍑�
+        wrkMast.setEmptyMk("N"); // 绌烘澘
+        wrkMast.setLinkMis("Y");
+        wrkMast.setCtnType(1); // 瀹瑰櫒绫诲瀷
+        // 鎿嶄綔浜哄憳鏁版嵁
+        wrkMast.setAppeTime(now);
+        wrkMast.setModiTime(now);
+        boolean res = wrkMastService.insert(wrkMast);
+        if (!res) {
+            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
+        }
+
+        if (!Cools.isEmpty(param.getMatList())) {
+            List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
+            for (GwmsGenerateInventoryDto.MatList obj :matList) {
+                WrkDetl wrkDetl = new WrkDetl();
+                wrkDetl.setWrkNo(wrkMast.getWrkNo());
+                obj.getRolls().forEach(roll -> {
+//                Mat mat = matService.selectByMatnr(roll.getSpecs());
+//                if (mat == null) {
+//                    mat = new Mat();
+//                    mat.setTagId(6L);
+//                    mat.setMatnr(roll.getSpecs());
+//                    mat.setMaktx(roll.getSpecs());
+//                    mat.setSpecs(roll.getSpecs());
+//                    mat.setStatus(1);
+//                    mat.setCreateTime(now);
+//                    mat.setUpdateTime(now);
+//                    if (!matService.insert(mat)) {
+//                        throw new CoolException("鐗╂枡瀵煎叆澶辫触锛�");
+//                    }
+//                }
+                    wrkDetl.setWrkNo(wrkMast.getWrkNo());
+                    wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸
+                    wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸
+                    wrkDetl.setBatch(roll.getBoxNo()); // 绠卞彿
+                    wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿
+                    wrkDetl.setBrand(obj.getPackageGroupNo()); // 鍖呰缁勫彿
+                    wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鍚�
+                    wrkDetl.setOrigin(obj.getBoxPos()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
+                    wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲�
+                    wrkDetl.setVolume(roll.getGrossWeight()); // 姣涢噸
+                    wrkDetl.setPrice(roll.getLength());
+                    wrkDetl.setSpecs(String.valueOf(roll.getSplices()));
+                    wrkDetl.setAnfme(1.0);
+                    wrkDetl.setIoTime(now);
+                    wrkDetl.setAppeTime(now);
+                    wrkDetl.setModiTime(now);
+                    if (!wrkDetlService.insert(wrkDetl)) {
+                        throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+                    }
+                });
+            }
+        }
+
+
+        // 鏇存柊鐩爣搴撲綅鐘舵��
+        LocMast locMast = locMastService.selectById(dto.getLocNo());
+        if (locMast.getLocSts().equals("O")){
+            locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+            locMast.setModiTime(now);
+            if (!locMastService.updateById(locMast)){
+                throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+            }
+        } else {
+            throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+        }
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public String crnExecute(CrnExecuteParam param) {
+        if (Cools.isEmpty(param.getStaNo(),param.getWorkNo())){
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛�" + param);
+        }
+
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getWorkNo()));
+        if (wrkMast == null) {
+            throw new CoolException("涓嶅瓨鍦ㄨ宸ヤ綔鍙凤細" + param.getWorkNo());
+        }
+
+        wrkMast.setWrkSts(2L);
+        if(wrkMast.getIoType() == 10){
+            wrkMast.setBarcode(param.getBarcode());
+        }
+        wrkMastService.updateById(wrkMast);
+
+        return "璇锋眰鎴愬姛";
+    }
+
+    @Override
+    @Transactional
+    public String zwmsOutLocWork(ZwmsOutLocWorkDto param) {
+
+        Order order = orderService.selectByNo(param.getOrderNo());
+        if (!Cools.isEmpty(order)) {
+            throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+        }
+
+        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+        Date now = new Date();
+        // 鍗曟嵁涓绘。
+        order = new Order(
+                String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
+                param.getOrderNo(),    // 璁㈠崟缂栧彿
+                DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
+                docType.getDocId(),    // 鍗曟嵁绫诲瀷
+                null,    // 椤圭洰缂栧彿
+                null,    //
+                null,    // 璋冩嫧椤圭洰缂栧彿
+                null,    // 鍒濆绁ㄦ嵁鍙�
+                null,    // 绁ㄦ嵁鍙�
+                null,    // 瀹㈡埛缂栧彿
+                null,    // 瀹㈡埛
+                null,    // 鑱旂郴鏂瑰紡
+                null,    // 鎿嶄綔浜哄憳
+                null,    // 鍚堣閲戦
+                null,    // 浼樻儬鐜�
+                null,    // 浼樻儬閲戦
+                null,    // 閿�鍞垨閲囪喘璐圭敤鍚堣
+                null,    // 瀹炰粯閲戦
+                null,    // 浠樻绫诲瀷
+                null,    // 涓氬姟鍛�
+                null,    // 缁撶畻澶╂暟
+                null,    // 閭垂鏀粯绫诲瀷
+                null,    // 閭垂
+                null,    // 浠樻鏃堕棿
+                null,    // 鍙戣揣鏃堕棿
+                null,    // 鐗╂祦鍚嶇О
+                null,    // 鐗╂祦鍗曞彿
+                1L,    // 璁㈠崟鐘舵��
+                1,    // 鐘舵��
+                9527L,    // 娣诲姞浜哄憳
+                now,    // 娣诲姞鏃堕棿
+                9527L,    // 淇敼浜哄憳
+                now,    // 淇敼鏃堕棿
+                null    // 澶囨敞
+        );
+        if (!orderService.insert(order)) {
+            throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠$悊鍛�");
+        }
+        // 鍗曟嵁鏄庣粏妗�
+        List<DetlDto> list = new ArrayList<>();
+        List<ZwmsOutLocWorkDto.Rolls> orderDetails = param.getMatDetails();
+        for (ZwmsOutLocWorkDto.Rolls detail : orderDetails) {
+            DetlDto dto = new DetlDto(detail.getRollNo(), detail.getBoxNo(), 1.0);
+            dto.setOrderNo(detail.getSpecs());
+            dto.setSplices(detail.getSplices());
+            if (DetlDto.has(list, dto)) {
+                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
+                assert detlDto != null;
+                detlDto.setAnfme(detlDto.getAnfme() + 1);
+            } else {
+                list.add(dto);
+            }
+        }
+        for (DetlDto detlDto : list) {
+//            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+            OrderDetl orderDetl = new OrderDetl();
+//            if (Cools.isEmpty(mat)) {
+//                throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+//            } else {
+//                orderDetl.sync(mat);
+//            }
+            orderDetl.setSpecs(String.valueOf(detlDto.getSplices()));
+            orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
+            orderDetl.setModel(detlDto.getMatnr());
+            orderDetl.setMatnr(detlDto.getOrderNo());
+            orderDetl.setMaktx(detlDto.getOrderNo());
+            orderDetl.setAnfme(detlDto.getAnfme());
+            orderDetl.setOrderId(order.getId());
+            orderDetl.setOrderNo(order.getOrderNo());
+            orderDetl.setCreateBy(9527L);
+            orderDetl.setCreateTime(now);
+            orderDetl.setUpdateBy(9527L);
+            orderDetl.setUpdateTime(now);
+            orderDetl.setStatus(1);
+            orderDetl.setQty(0.0D);
+            if (!orderDetlService.insert(orderDetl)) {
+                throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public String outLocResultReport(GhjtApiParam param) {
+
+        if (Cools.isEmpty(param.getOutLocResult(),param.getWorkNo())) {
+            throw new CoolException("鍏ュ弬涓嶈兘涓虹┖锛�" + param);
+        }
+
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getWorkNo()));
+        if (wrkMast == null) {
+            throw new CoolException("璇ュ伐浣滄。涓嶅瓨鍦紝浠诲姟鍙凤細" + param.getWorkNo());
+        } else if(wrkMast.getWrkSts() != 2) {
+            throw new CoolException("宸ヤ綔妗e綋鍓嶇姸鎬佷笉绗﹀悎锛屼换鍔″彿锛�" + param.getWorkNo() + "锛屽伐浣滄。鐘舵�侊細" + wrkMast.getWrkSts());
+        }
+
+        // 鍒拌揪鍑哄簱鍙g‘璁や负1锛屾洿鏂板伐浣滄。鐘舵�佷负57.鍑哄簱瀹屾垚
+        if (param.getOutLocResult() == 1) {
+            wrkMast.setWrkSts(20L);
+            // 绌烘墭鐩樺埌浣嶇洿鎺ユ洿鏂板伐浣滄。鐘舵�佷负14.宸插嚭搴撴湭纭锛岀┖鎵樻棤闇�澶嶆牳纭
+            if (wrkMast.getIoType() == 110) {
+                wrkMast.setWrkSts(14L);
+            }
+            wrkMastService.updateById(wrkMast);
+        }
+
+        return "鍑哄簱缁撴灉涓婃姤鎴愬姛";
+    }
+
+    @Autowired
+    private BasCrnpService basCrnpService;
+
+    @Override
+    @Transactional
+    public String emptyOutLoc(GhjtApiParam param) {
+//        3102/3009/3008/3006/3003/3002鈫�3047/3112
+        // 鑾峰彇妯″紡涓虹數鑴戞ā寮忥紝鏃犱换鍔$殑鍫嗗灈鏈哄垪琛�:闃叉鍒嗛厤鍒板爢鍨涙満涓嶅彲鐢�
+        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3)
+                .eq("wrk_no",0));
+        if (basCrnps.isEmpty()) {
+            // 閮芥湁浠诲姟鍒欒幏鍙栫數鑴戞ā寮忕殑鍫嗗灈鏈哄垪琛�
+            basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3));
+        }
+        if (basCrnps.isEmpty()) {
+            throw new CoolException("娌℃湁鍙敤鍫嗗灈鏈�,鍫嗗灈鏈哄仠姝㈡垨寮傚父");
+        }
+        // 鍙敤鍫嗗灈鏈哄垪琛�
+        List<Integer> crnNoList = basCrnps.stream().map(BasCrnp::getCrnNo).collect(Collectors.toList());
+        // 瀵绘壘绌烘墭鐩樺簱浣嶏紝鍏堟壘娴呭簱浣�
+        List<LocMast> locMasts;
+            locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","D")
+                    .orderAsc(Arrays.asList("row1","lev1","bay1")).in("crn_no",crnNoList).in("row1",3,4,6,7,10,11,14,15,18,19,22,23));
+            if (locMasts.isEmpty()) {
+                locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","D")
+                        .orderAsc(Arrays.asList("row1","lev1","bay1")).in("crn_no",crnNoList).in("row1",1,4,5,8,9,12,13,16,17,20,21,24));
+            }
+
+        if (locMasts.isEmpty()) {
+            throw new CoolException("娌℃湁鎵惧埌绌烘墭鐩橈紝绔欑偣锛�" + param.getStaNo());
+        }
+
+        // 鍙栫涓�涓┖搴撲綅
+        LocMast locMast = locMasts.get(0);
+
+        // 鑾峰彇宸ヤ綔璺緞
+        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 110).eq("stn_no",
+                param.getStaNo()).eq("crn_no", locMast.getCrnNo()));
+
+        if (staDesc == null) {
+            throw new CoolException("璺緞涓嶅瓨鍦�");
+        }
+
+        //2.鐢熸垚绌烘墭鐩樺嚭搴撳伐浣滄。
+        Date now = new Date();
+        WrkMast wrkMast = new WrkMast();
+        wrkMast.setWrkNo(commonService.getWorkNo(WorkNoType.PAKOUT.type));
+        wrkMast.setIoTime(now);
+        wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+        wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
+        wrkMast.setIoPri(10D);
+        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+        wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+        wrkMast.setCrnNo(locMast.getCrnNo());
+        wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+        wrkMast.setBarcode(locMast.getBarcode());
+        wrkMast.setFullPlt("N"); // 婊℃澘锛歒
+        wrkMast.setPicking("N"); // 鎷f枡
+        wrkMast.setExitMk("N"); // 閫�鍑�
+        wrkMast.setEmptyMk("Y"); // 绌烘澘
+        wrkMast.setLinkMis("N");
+        wrkMast.setAppeUser(9999L);
+        wrkMast.setAppeTime(now);
+        wrkMast.setModiUser(9999L);
+        wrkMast.setModiTime(now);
+        if (!wrkMastService.insert(wrkMast)) {
+            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
+        }
+
+        // 3.鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
+        if (locMast.getLocSts().equals("D")) {
+            locMast.setLocSts("R");
+            locMast.setModiUser(9999L);
+            locMast.setModiTime(now);
+            if (!locMastService.updateById(locMast)) {
+                throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
+            }
+        }
+
+        return "鍑哄簱鎴愬姛";
+    }
+
+    @Override
+    @Transactional
+    public R zphjDw(ZphjckdwParam param) {
+        // 鏍规嵁浠诲姟鍙峰緱鍒板伐浣滀富妗�
+        if (Cools.isEmpty(param.getWorkNo())) {
+            throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒");
+        }
+        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
+        if (wrkMast == null) {
+            throw new CoolException("宸ヤ綔妗d笉瀛樺湪锛�");
+        }
+        if (wrkMast.getWrkSts() != 2 || wrkMast.getIoType() != 103) {
+            throw new CoolException("宸ヤ綔妗e綋鍓嶇姸鎬佷笉涓�2/鍑哄簱绫诲瀷涓嶄负鎷f枡锛�");
+        }
+        // 鏇存柊宸ヤ綔妗g姸鎬�2.璁惧涓婅蛋->42.绛夊緟鐮佸灈
+        wrkMast.setWrkSts(42L);
+        wrkMastService.updateById(wrkMast);
+
+        // 鏌ヨ瑕佹媶鐨勪綅缃紝鍙湁涓�涓�
+        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+        List<String> collect = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
+        String position = collect.get(0);
+
+        // 杩斿洖鎷嗗灈瑙勫垯
+        ZphjcdgzVo zphjcdgzVo = new ZphjcdgzVo();
+        zphjcdgzVo.setWorkNo(wrkMast.getWrkNo());
+        zphjcdgzVo.setPosition(position);
+
+        return R.ok(zphjcdgzVo);
+    }
+
+    @Override
+    @Transactional
+    public R zphjCdwc(ZphjcdwcParam param) {
+
+        if (Cools.isEmpty(param.getWorkNo())) {
+            throw new CoolException("宸ヤ綔鍙蜂笉鑳戒负绌猴紒");
+        }
+        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
+        if (wrkMast == null) {
+            throw new CoolException("宸ヤ綔妗d笉瀛樺湪锛�");
+        }
+        if (wrkMast.getWrkSts() != 42 || wrkMast.getIoType() != 103) {
+            throw new CoolException("宸ヤ綔妗e綋鍓嶇姸鎬佷笉涓�42/鍑哄簱绫诲瀷涓嶄负鎷f枡锛�");
+        }
+
+        // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+            throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
+        }
+        // 鑾峰彇鐩爣绔�
+        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+                .eq("type_no", wrkMast.getIoType() - 50)
+                .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
+                .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
+        StaDesc staDesc = staDescService.selectOne(wrapper);
+        if (Cools.isEmpty(staDesc)) {
+            throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+        }
+        // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
+        Integer staNo = staDesc.getCrnStn();
+        // 鏇存柊宸ヤ綔绫诲瀷103->53
+        wrkMast.setIoType(53);
+        wrkMast.setWrkSts(52L); // 宸ヤ綔鐘舵��42->52.璁惧涓婅蛋锛堟媶鍨涘畬鎴愶級
+        // 鐩爣绔欑偣婧愮珯鐐硅浆鎹�
+        wrkMast.setSourceStaNo(wrkMast.getStaNo());
+        wrkMast.setStaNo(staNo);
+        // 鐩爣搴撲綅=婧愬簱浣�
+        wrkMast.setLocNo(wrkMast.getSourceLocNo());
+        // 婧愬簱浣嶆竻闄�
+        wrkMast.setSourceLocNo("");
+        wrkMast.setModiTime(new Date());
+
+        int outStaNo = 0; // 鍑哄簱婧愮珯鐐�
+        if (staNo == 3044 || staNo == 3045) {
+             outStaNo = 3046;
+        } else if(staNo == 3040 || staNo == 3041) {
+             outStaNo = 3042;
+        }
+        if (outStaNo == 0) {
+            throw new CoolException("鍑哄簱婧愮珯鐐硅浆鎹㈡湁璇細" + staNo);
+        }
+
+        // 鑾峰彇鍑哄簱鐗╂枡
+        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+        int descFlag = getType(wrkDetls);
+
+        // get0鍘熸墭鐩樺洖娴佷俊鎭紝get1鎷嗗灈鍑烘潵鐗╂枡鍑哄簱淇℃伅
+        List<ZphjcdwcVo> zphjcdwcVos = new ArrayList<>();
+        ZphjcdwcVo zphjcdwcVo1 = new ZphjcdwcVo();
+        zphjcdwcVo1.setWorkNo(wrkMast.getWrkNo());
+        zphjcdwcVo1.setStaNo(wrkMast.getStaNo());
+        zphjcdwcVo1.setSourceStaNo(wrkMast.getSourceStaNo());
+        zphjcdwcVos.add(zphjcdwcVo1);
+
+        ZphjcdwcVo zphjcdwcVo2 = new ZphjcdwcVo();
+        zphjcdwcVo2.setSourceStaNo(outStaNo);
+        zphjcdwcVo2.setStaNo(3106); // 3106/3077
+        zphjcdwcVo2.setDescFlag(descFlag);
+        zphjcdwcVos.add(zphjcdwcVo2);
+
+        // 鏇存柊宸ヤ綔涓绘。
+        wrkMastService.updateById(wrkMast);
+        // 淇敼搴撲綅鐘舵�� Q.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+        locMast.setLocSts("Q");
+        locMast.setModiTime(new Date());
+        if (!locMastService.updateById(locMast)) {
+            throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+        }
+
+        // 涓嬪彂鍥炲簱鐨勭洰鏍囩珯鐐瑰拰鎷嗗灈鐨勫嚭搴撶洰鏍囩珯鐐圭粰gwcs
+        return R.ok(zphjcdwcVos);
+    }
+
+    /**
+     * 鏍规嵁鍑哄簱鐗╂枡鏄庣粏鍒ゆ柇鏄惁鍘昏创鏍�(鍗曞嵎璐存爣锛屽鍗蜂笉璐存爣)
+     * @param wrkDetls 鐗╂枡鏄庣粏
+     * @return 0.澶氬嵎涓嶈创鏍囪矾寰勶紝1.鍗曞嵎璐存爣璺緞
+     */
+    private int getType(List<WrkDetl> wrkDetls) {
+        return wrkDetls.size() > 1 ? 0 : 1; // 涓�鏉¤褰曞氨鏄竴鍗�
+    }
+
+    public void pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo) {
+        boolean success = false;
+        // 鑾峰彇璇锋眰澶�
+        Map<String, Object> headers = getHeaders();
+
+        // 鏋勯�犺姹備綋
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("workNo", workNo);
+        jsonObject.put("staNo", staNo);
+        jsonObject.put("sourceStaNo", palletizingNo);
+        String body = jsonObject.toJSONString();
+        String response = "";
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(MesConstant.GWCS_IP_PORT)
+                    .setPath(MesConstant.GWCS_FPKW_URL)
+                    .setHeaders(headers)
+                    .setJson(body)
+                    .build()
+                    .doPost();
+            if (!Cools.isEmpty(response)) {
+                success = true;
+//                // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+//                if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                }
+            } else {
+                log.error("zmws鎺ㄩ�佸叆搴撶爜澶寸珯鐐规帴鍙eけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
+                throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+            }
+        } catch (Exception e) {
+            log.error("鍏ュ簱璇锋眰鎺ュ彛澶辫触锛歿}", e.getMessage());
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return FAIL.setMsg(e.getMessage());
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "鍏ュ簱",
+                        MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL,
+                        null,
+                        "127.0.0.1",
+                        body,
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+    }
+
+    Map<String, Object> getHeaders(){
+        Map<String,Object> headers = new HashMap<>();
+        headers.put("digi-type","sync ");
+        headers.put("digi-protocol","raw");
+        headers.put("digi-datakey"," XCommon.ImportData");
+
+        return headers;
+    }
+
+
+    private void descSta(Integer staNo,Integer crnNo){
+//        int[] typeNos =new int[]{1,10,53,101,103,110};
+        int[] typeNos =new int[]{10,110};
+        for (Integer typeNo:typeNos){
+            descSta3(staNo,crnNo,typeNo);
+        }
+    }
+
+    private void descSta3(Integer staNo,Integer crnNo,Integer typeNo){
+        StaDesc staDesc = new StaDesc();
+        staDesc.setTypeNo(typeNo);
+        staDesc.setStnNo(staNo);
+        staDesc.setCrnNo(crnNo);
+        staDesc.setCrnStn(CrnNoRC(crnNo,staDesc.getTypeNo()>100));
+        descSta2(staDesc);
+    }
+
+    private void descSta2(StaDesc staDesc){
+        Date now = new Date();
+        //鍏ュ簱
+        int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+                .eq("type_no", staDesc.getTypeNo())
+                .eq("stn_no", staDesc.getStnNo())
+                .eq("crn_no", staDesc.getCrnNo())
+                .eq("crn_stn", staDesc.getCrnStn()));
+        if (sameRes == 0) {
+            staDesc.setModiUser(9527L);
+            staDesc.setModiTime(now);
+            staDesc.setAppeUser(9527L);
+            staDesc.setAppeTime(now);
+            staDescService.insert(staDesc);
+        }
+    }
+
+    private Integer CrnNoRC(Integer crnNo,boolean sign){
+        Integer crnStn = 0;
+        switch (crnNo){
+            case 1:
+                crnStn = 102;
+                break;
+            case 2:
+                crnStn = 105;
+                break;
+            case 3:
+                crnStn = 108;
+                break;
+            case 4:
+                crnStn = 111;
+                break;
+            case 5:
+                crnStn = 114;
+                break;
+            case 6:
+                crnStn = 117;
+                break;
+        }
+        if (sign){
+            return crnStn-2;
+        }
+        return crnStn;
+    }
+
+    /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
 }

--
Gitblit v1.9.1