123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

@@ -10,10 +10,13 @@
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.core.exception.CoolException;
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 +26,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
@@ -53,14 +66,15 @@
        return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                wrapper.eq(entry.getKey(), val);
            }
        }
    }
@@ -80,12 +94,111 @@
   @ManagerAuth(memo = "工作档修改")
    public R update(WrkMast wrkMast){
        if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
            return R.error();
            return R.error("工作号异常");
        }else if (wrkMast.getWrkSts()==null){
            return R.error("修改状态异常");
        }
        wrkMast.setModiUser(getUserId());
        wrkMast.setModiTime(new Date());
        wrkMastService.updateById(wrkMast);
        WrkMast wrkMast1=null;
        try{
            wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
            if (Cools.isEmpty(wrkMast1) || null==wrkMast1.getWrkNo()){
                throw new CoolException("工作号"+wrkMast.getWrkNo()+"所属工作档查询失败");
            }else if (wrkMast1.getWrkSts()==null){
                throw new CoolException("工作号"+wrkMast.getWrkNo()+"所属工作档状态异常");
            }
        }catch (Exception e){
            return R.error("失败!!!请尝试刷新页面。"+"异常原因："+e);
        }
        if (wrkMast1.getWrkSts()-wrkMast.getWrkSts()==0){
            return R.error("所选状态与此工作档状态一致，无需修改");
        }
        if (juBge(wrkMast.getWrkSts(), wrkMast1)){
            return R.error("修改状态失败，请规范操作");
        }
        wrkMast1.setModiUser(getUserId());
        wrkMast1.setModiTime(new Date());
        wrkMast1.setWrkSts(wrkMast.getWrkSts());
        wrkMastService.updateById(wrkMast1);
        return R.ok();
    }

    public Boolean juBge(Long wrkSts1,WrkMast wrkMast1){
        if (wrkSts1>20){
            throw new CoolException("大于20的状态不能进行修改！！！");
        }
        switch (wrkMast1.getIoType()){
            case 1:
            case 10:
            case 53:
            case 54:
            case 57:
                if (wrkSts1>=1 && wrkSts1<=10){
                    if (wrkSts1==10){
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getLocNo()));
                        if (Cools.isEmpty(locMast) || locMast.getLocSts()==null){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位异常请维护库位数据");
                        }
                        if (locMast.getLocSts().equals("S")||locMast.getLocSts().equals("Q")){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态为"+locMast.getLocSts$()+"，请维护库位数据");
                        }else if (locMast.getLocSts().equals("F")){
                        }else {
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态异常，请维护库位数据");
                        }
                    }
                    return false;
                }
                return true;
            case 101:
            case 103:
            case 104:
            case 107:
            case 110:
                if (wrkSts1>=11 && wrkSts1<=18){
                    if (wrkSts1==18){
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getSourceLocNo()));
                        if (Cools.isEmpty(locMast) || locMast.getLocSts()==null){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位异常请维护库位数据");
                        }
                        if (locMast.getLocSts().equals("R")||locMast.getLocSts().equals("P")){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态为"+locMast.getLocSts$()+"，请维护库位数据");
                        }else if (locMast.getLocSts().equals("O")){
                        }else {
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态异常，请维护库位数据");
                        }
                    }
                    return false;
                }
                return true;
            case 11:
                return false;
            case 3:
            case 6:
            default:
                return true;
        }
    }
    private void doOut(WrkMast wrkMast,LocMast locMast){
        try{
            Date now = new Date();
            // 删除工作档源库位的库存明细
            if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
                throw new CoolException("删除库存明细失败:workNo="+wrkMast.getWrkNo()+"sourceLocNo="+wrkMast.getSourceLocNo());
            }
            // 修改源库位状态 R ===>> O
            if (locMast.getLocSts().equals("R")) {
                locMast.setLocSts("O");
                locMast.setBarcode("");
                locMast.setFrozen(0);
                locMast.setModiTime(now);
                locMast.setIoTime(now);
                locMast.setFrozenMemo("");
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("修改源库位状态失败:workNo="+wrkMast.getWrkNo()+"sourceLocNo="+wrkMast.getSourceLocNo());
                }
            }
        }catch (Exception e){
            throw new CoolException(e+"操作失败");
        }
    }

    @RequestMapping(value = "/wrkMast/delete/auth")
@@ -165,4 +278,153 @@
    }


    /********************************边锋新增**************************/

    @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);
            wrkDetl.setMatType(locDetl.getMatType());
            wrkDetlService.insert(wrkDetl);

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


}