#

lsh

2024-01-23 6a31e3759855f9649a323d2a8dd0dfed0cc43319

 src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java

@@ -18,6 +18,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
@@ -49,6 +51,7 @@

    public ReturnT<String> start(int staNo) {
        try {
            Date now = new Date();
            BasDevp basDevp = basDevpService.selectById(staNo);
            Integer staOther = getStaOther(staNo);
            Integer staEnd = getStaEnd(staNo);
@@ -76,7 +79,22 @@
                if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
                    return FAIL;
                }
                SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
                List<WrkDetl> wrkDetlList = new ArrayList<>();
                String signOne = "";
                String signTwo = "";
                for (WrkDetl wrkDetl:wrkDetls){
                    if (wrkDetl.getOrigin().equals("1") && signOne.equals("")){
                        wrkDetlList.add(wrkDetl);
                        signOne = "1";
                    } else if (wrkDetl.getOrigin().equals("2") && signTwo.equals("")){
                        wrkDetlList.add(wrkDetl);
                        signTwo = "2";
                    }
                    if (!signOne.equals("") && !signTwo.equals("")){
                        break;
                    }
                }
                SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetlList);
                singleMountUnstackingCompleteParam.setStaStart(staNo);
                singleMountUnstackingCompleteParam.setStaEnd(staEnd);
                ReturnT<String> result = null;
@@ -101,10 +119,18 @@
//                    return SUCCESS;
//                }
                if (result.getCode()==200){
                    Date nowOne = new Date();
                    Date nowTwo = now;
                    for (WrkDetl wrkDetl:wrkDetls){
                        if (wrkDetl.getOrigin().equals("1")){
                            now = nowOne;
                        } else if (wrkDetl.getOrigin().equals("2")){
                            now = nowTwo;
                        }
                        WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
                        wrkDetlSingle.sync(wrkDetl);
                        wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
                        wrkDetlSingle.setIoTime(now);
                        wrkDetlSingleService.insert(wrkDetlSingle);
                    }
                    wrkMast.setSheetNo("1");