erp下发停止出库任务，wms取消wcs任务

zwl

20 小时以前 5d480903c47b8966a086fc6c9bb26151f695570a

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

@@ -17,7 +17,6 @@
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -425,7 +424,8 @@
     */
    @PostMapping("/comb/auth")
    public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
        List<MesToCombReturnParam> errorComb = Lists.newArrayList();
        List<MesToCombParam> errorComb = Lists.newArrayList();
        List<MesToCombParam> validComb = Lists.newArrayList();
        for (MesToCombParam mesToCombParam : param) {
//            if (mesToCombParam.getPalletId().length() != 8) {
//                return R.error(mesToCombParam.getPalletId()+"-该托盘码不为8位");
@@ -438,18 +438,18 @@
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId()));
//        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPalletId()));
            if (countLoc > 0 || countWrk > 0) {
                MesToCombReturnParam mesToCombReturnParam = new MesToCombReturnParam();
                Synchro.Copy(mesToCombParam, mesToCombReturnParam);
                errorComb.add(mesToCombReturnParam);
                errorComb.add(mesToCombParam);
//                return R.error(mesToCombParam.getPalletId()+"-工作档/库存条码数据已存在");
                continue;
            }
            // 判断是否有相同条码的数据
            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                    eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
            }
            validComb.add(mesToCombParam);
        }
        for (MesToCombParam mesToCombParam : param) {
        for (MesToCombParam mesToCombParam : validComb) {
            openService.mesToComb(mesToCombParam);
        }
        // TODO:待测试
@@ -466,20 +466,19 @@

    @PostMapping("/outOrder")
    public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
        List<OutTaskReturnParam> errorOutOrders = Lists.newArrayList();
        List<OutTaskParam> errorOutOrders = Lists.newArrayList();
        List<OutTaskParam> validOutOrders = Lists.newArrayList();
        for (OutTaskParam outTaskParam : params) {
            // TODO:待測試，校驗庫存信息，不存在則返回
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", outTaskParam.getPalletId()));
            if (countLoc == 0){
                OutTaskReturnParam outTaskReturnParam = new OutTaskReturnParam();
                Synchro.Copy(outTaskParam, outTaskReturnParam);
                errorOutOrders.add(outTaskReturnParam);

                params.remove(outTaskParam);
                errorOutOrders.add(outTaskParam);
                continue;
            }
            validOutOrders.add(outTaskParam);
        }

        for (OutTaskParam outTaskParam : params) {
        for (OutTaskParam outTaskParam : validOutOrders) {
            R r = openService.outOrder(outTaskParam);
            if (!r.get("code").equals(200)){
                return r;