#

lty

3 天以前 be5c6de69ba20049aba8a26591be1cd4a3934dca

#

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

@@ -74,19 +74,17 @@
                if (wrkMast.getIoType() == 1) {
                    // 入库通知单
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
//                        if(Cools.isEmpty(wrkMast.getPacked()){
//                            JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
//                            if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
//                                JSONObject data = res.getJSONObject("data");
//                                String tlocation = data == null ? null : data.getString("tlocation");
//                                if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) {
//                                    List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
//                                            .eq("loc_no", wrkMast.getLocNo()));
//                                    if (!Cools.isEmpty(detls)) {
//                                        for (LocDetl detl : detls) {
//                                            detl.setStandby1(tlocation);
//                                            locDetlService.updateById(detl);
//                                        }
//                        JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
//                        if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
//                            JSONObject data = res.getJSONObject("data");
//                            String tlocation = data == null ? null : data.getString("tlocation");
//                            if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) {
//                                List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
//                                        .eq("loc_no", wrkMast.getLocNo()));
//                                if (!Cools.isEmpty(detls)) {
//                                    for (LocDetl detl : detls) {
//                                        detl.setStandby1(tlocation);
//                                        locDetlService.updateById(detl);
//                                    }
//                                }
//                            }
@@ -119,19 +117,19 @@

            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 15) {
//                if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1){
//                    List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//                    WrkDetl wrkDetl = wrkDetls1.get(0);
//                    JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
//                    if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
//
//                    }
//                }else{
//                    JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),null);
//                    if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
//
//                    }
//                }
                if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && !Objects.isNull(wrkMast.getExitMk())){
                    List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                    WrkDetl wrkDetl = wrkDetls1.get(0);
                    JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
                    if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {

                    }
                }else if(Objects.isNull(wrkMast.getLocNo())){
                    JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),null);
                    if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {

                    }
                }
                
//                if (!Objects.isNull(wrkMast.getWrkCode())) {
//                    return FAIL;

 src/main/java/com/zy/common/service/CommonService.java

@@ -409,7 +409,7 @@
    }

    /**
     * 当回源库位不在本巷道时，出库至1070重新检索巷道根据1，2巷道之间分配，3，4巷道全局分配规则
     * 当回源库位不在本巷道时，重新检索巷道根据1，2巷道之间分配，3，4巷道全局分配规则
     */
    @Transactional
    public StartupDto getLocNoRunV2(Integer whsType, Integer staDescId, Integer sourceStaNo, WrkMast wrkMast, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {

 src/main/java/com/zy/common/web/WcsController.java

@@ -215,9 +215,9 @@
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
            case 1070:
                dto = startupFullPutStoreV2(param.getSourceStaNo(), wrkMastV2, locTypeDto);//1070
                break;
//            case 1070:
//                dto = startupFullPutStoreV2(param.getSourceStaNo(), wrkMastV2, locTypeDto);//1070
//                break;
            default:
                break;
        }