#

luxiaotao1123

2022-04-15 222d6e2c408fafde98216b20bf8b5a8b2d20bcb2

#

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

@@ -8,6 +8,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
@@ -94,7 +95,11 @@
            if (wrkMast != null && wrkMast.getIoType() == 107) {
                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                if (!Cools.isEmpty(wrkDetls)) {
                    return R.ok().add(wrkDetls);
                    MobileAdjustResult result = new MobileAdjustResult();
                    result.setStaNo(staNo);
                    result.setWrkNo(wrkMast.getWrkNo());
                    result.setWrkDetls(wrkDetls);
                    return R.ok().add(result);
                }
            }
        }

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

@@ -13,6 +13,8 @@

    private Integer staNo;

    private Integer wrkNo;

    private List<WrkDetl> wrkDetls;

}

 src/main/java/com/zy/asrs/entity/result/MobileAdjustResult.java

New file
@@ -0,0 +1,20 @@
package com.zy.asrs.entity.result;

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

import java.util.List;

/**
 * Created by vincent on 2022/4/13
 */
@Data
public class MobileAdjustResult {

    private Integer staNo;

    private Integer wrkNo;

    private List<WrkDetl> wrkDetls;

}

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

@@ -4,10 +4,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.service.*;
@@ -37,6 +34,8 @@
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private BasDevpService basDevpService;

    @Override
    @Transactional
@@ -144,6 +143,13 @@

    @Override
    public void adjust(MobileAdjustParam param, Long userId) {
        BasDevp basDevp = basDevpService.selectById(param.getStaNo());
        if (null == basDevp || basDevp.getWrkNo() == null) {
            throw new CoolException(param.getStaNo() + "盘点站无效");
        }
        if (!param.getWrkNo().equals(basDevp.getWrkNo())) {
            throw new CoolException(param.getStaNo() + "盘点站更新，请重新检索");
        }

    }