#

LSH

2022-11-01 94dba00dbc6f351f5835d6f4a98d3126cedd9e80

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

@@ -10,10 +10,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.dto.WrkDetlWithCheck;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.*;
@@ -23,6 +25,16 @@

    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private MatService matService;
    @Autowired
    private CheckRecordService checkRecordService;

    @RequestMapping(value = "/wrkMast/{id}/auth")
    @ManagerAuth
@@ -166,4 +178,151 @@
    }


    /********************************边锋新增**************************/
    @GetMapping(value = "/wrkMast/checkDetl")
    public R pickDetl(String barcode) {
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        if (Cools.isEmpty(wrkMast)) {
            return R.error("无法通过托盘码找到对应工作档");
        }
        if (wrkMast.getIoType() != 107) {
            return R.error("工作档非捡料任务");
        }
        if (wrkMast.getWrkSts() != 17){
            return R.error("盘点任务正在执行中,请等待设备运行结束后进行操作");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());

        return R.ok(wrkDetls);
    }

    /**
     * 根据盘点修改库存
     * @return
     */
    @Transactional
    @PostMapping("/wrkMast/storeCheck")
    @ManagerAuth(memo = "根据盘点修改库存")
    public R storeCheck(@RequestBody List<WrkDetlWithCheck> wrkDetls){
        Date now = new Date();
        Integer confirmIsZero = 0;
        if (wrkDetls == null || wrkDetls.size() <= 0){
            return R.error("请传入数据");
        }
        if (Cools.isEmpty(wrkDetls.get(0).getBarcode())) {

            return R.error("托盘码[barcode]为空");
        }
        WrkMast wrkMast = wrkMastService.selectByBarcode(wrkDetls.get(0).getBarcode());

        for (WrkDetlWithCheck wrkDetl : wrkDetls) {
            if (Cools.isEmpty(wrkDetl.getBarcode())) {
                return R.error("托盘码[barcode]为空");
            }
            if (Cools.isEmpty(wrkDetl.getMatnr())) {
                return R.error("物料编码[matnr]为空");
            }
            Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
            if (Cools.isEmpty(mat)) {
                return R.error("物料编码[matnr]在物料档案找不到");

            }
            if (Cools.isEmpty(wrkDetl.getAnfme())) {
                return R.error("盘点前数量[anfme]为空");
            }
            if (wrkDetl.getConfirmQty() == null) {
                return R.error("盘点确认量[confirm]为空");
            }
            if (wrkDetl.getConfirmQty() == 0){
                confirmIsZero++;
            }

        }
        /**
         * 如果整个list里的confirmQty数量全是0, 表示整个库位无任何库存,删工作档, 库位改为O
         */
        if (confirmIsZero == wrkDetls.size()){
            locDetlService.delete(new EntityWrapper<LocDetl>()
                    .eq("loc_no",wrkMast.getSourceLocNo()));
            locMastService.updateLocSts(wrkMast.getSourceLocNo(),"O");
            wrkMastService.delete(new EntityWrapper<WrkMast>()
                    .eq("wrk_no",wrkMast.getWrkNo()));
            wrkDetlService.delete(new EntityWrapper<WrkDetl>()
                    .eq("wrk_no",wrkMast.getWrkNo()));
            return R.ok("库存清理成功");
        }else {
            locMastService.updateLocSts(wrkMast.getSourceLocNo(),"F");
            locDetlService.delete(new EntityWrapper<LocDetl>()
                    .eq("loc_no",wrkMast.getSourceLocNo()));
            for (WrkDetlWithCheck wrkDetl : wrkDetls) {
                LocDetl locDetl = new LocDetl();
                Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
                locDetl.sync(mat);
                locDetl.setZpallet(wrkMast.getBarcode());
                locDetl.setAnfme(wrkDetl.getConfirmQty());
                locDetl.setBatch(wrkDetl.getBatch());
                locDetl.setAppeTime(now);
                locDetl.setModiTime(now);
                locDetl.setAppeUser(getUserId());
                locDetl.setModiUser(getUserId());
                locDetl.setLocNo(wrkMast.getSourceLocNo());
                locDetlService.insert(locDetl);

                CheckRecord checkRecord = new CheckRecord();
                checkRecord.sync(mat);
                checkRecord.setAnfme(wrkDetl.getAnfme());
                checkRecord.setBarcode(wrkMast.getBarcode());
                checkRecord.setLocNo(wrkMast.getSourceLocNo());
                checkRecord.setCreateTime(now);
                checkRecord.setBatch(wrkDetl.getBatch());
                checkRecord.setConfirmQty(locDetl.getAnfme());
                checkRecordService.insert(checkRecord);

            }
        }

        return R.ok("库存更新已成功");
    }

    @GetMapping("/wrkMast/pickToFill")
    public R pickToFill(String barcode){
        Date now = new Date();
        if (Cools.isEmpty(barcode)) {
            return R.error("托盘码为空,请检查");
        }
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        if (Cools.isEmpty(wrkMast)) {
            return R.error("无法通过托盘码找到该工作档,请检查托盘码是否正确");
        }
        if (wrkMast.getIoType() != 103) {
            return R.error("仅有捡料出库可以使用该功能");
        }
        if (wrkMast.getWrkSts() != 17) {
            return R.error("捡料出库未完成,请等待设备运行完成");
        }
        wrkMast.setIoType(101);
        wrkMast.setMemo("捡料转全板工作档");
        wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
                .eq("wrk_no",wrkMast.getWrkNo()));
        wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
        for (LocDetl locDetl : locDetls) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setZpallet(wrkDetl.getBarcode());
            wrkDetl.setBarcode(wrkMast.getBarcode());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setAppeUser(1L);
            wrkDetl.setModiUser(1L);
            wrkDetlService.insert(wrkDetl);

        }
        locMastService.updateLocSts(wrkMast.getSourceLocNo(),"R");
        return R.ok();
    }


}