#

zjj

2024-08-12 03317b6f54fe330f884578a0f1f01688ea6d3748

#

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

@@ -330,5 +330,15 @@
        return R.ok().add(valueVos);
    }

    @RequestMapping(value = "/mat/list/pda/page/auth")
    @ManagerAuth
    public R pdaPageList(@RequestParam(required = true)Long tagId,
                         @RequestParam(defaultValue = "1")Integer curr,
                         @RequestParam(defaultValue = "10")Integer limit){
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
//        wrapper.eq("tag_id", tagId);
        wrapper.orderBy("create_time", false);
        return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
    }

}

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

@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +58,17 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private CommonService commonService;

    @RequestMapping("/leftovers/out")
    @ManagerAuth
    public R leftoversOut(@RequestBody Map<String,Object> map) {
        mobileService.leftoversOut(map,getUserId());


        return R.ok();
    }

    // 商品上架
    @RequestMapping("/mat/onSale/auth")

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -506,4 +507,8 @@
        }
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

}

 src/main/java/com/zy/asrs/service/MobileService.java

@@ -9,6 +9,7 @@
import com.zy.asrs.entity.param.OffSaleParam;

import java.util.Date;
import java.util.Map;

public interface MobileService {

@@ -38,4 +39,6 @@

    void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
                  Double curOutQty, Integer ioType, Long userId, Date now);

    void leftoversOut(Map<String, Object> map, Long userId);
}

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

@@ -26,10 +26,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
 * 移动端服务核心类
@@ -561,6 +558,57 @@
    }

    @Override
//    @Transactional
    public void leftoversOut(Map<String, Object> map,Long userId) {

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", map.get("barcode")).eq("io_type", 103));
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException("未查询到拣料任务");
        }
        Date now = new Date();
        int workNo = commonService.getWorkNo(1);
        WrkMast wrkMast1 = new WrkMast();
        wrkMast1.sync(wrkMast);
        wrkMast1.setWrkNo(workNo);
        wrkMast1.setWrkSts(2L);
        wrkMast1.setIoType(200);
        wrkMast1.setSourceStaNo(wrkMast.getStaNo() == 113 ? 111 : 117);
        wrkMast1.setStaNo(map.get("floor").hashCode() == 2 ? 204:304);
        wrkMast1.setIoTime(now);
        wrkMast1.setIoPri(13D); // 优先级：13
        wrkMast1.setCrnNo(wrkMast.getCrnNo());
        wrkMast1.setSourceLocNo(wrkMast.getLocNo()); // 源库位
        wrkMast1.setFullPlt("Y"); // 满板：Y
        wrkMast1.setPicking("N"); // 拣料
        wrkMast1.setExitMk("N"); // 退出
        wrkMast1.setEmptyMk("N"); // 空板
        wrkMast1.setLinkMis("N");
        wrkMast1.setAppeUser(userId); // 操作人员数据
        wrkMast1.setAppeTime(now);
        wrkMast1.setModiUser(userId);
        wrkMast1.setModiTime(now);
        wrkMast1.setBarcode(wrkMast.getBarcode());
        if (!wrkMastService.insert(wrkMast1)) {
            throw new CoolException("保存工作档失败");
        }

        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", map.get("barcode")));
        if (Cools.isEmpty(wrkDetls)) {
            throw new CoolException("未查询到拣料任务明细");
        }

        for(WrkDetl wrkDetl : wrkDetls){
            WrkDetl wrkDetl1 = new WrkDetl();
            wrkDetl1.sync(wrkDetl);
            wrkDetl1.setWrkNo(workNo);
            wrkDetlService.insert(wrkDetl1);
        }



    }

    @Override
    @Transactional
    public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
                         Double curOutQty, Integer ioType, Long userId, Date now) {