1

zhang

7 天以前 9afe7ca53c38f2aa1010c2ac2a778012d133160f

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

@@ -10,21 +10,19 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
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;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.*;

@RestController
@@ -36,6 +34,24 @@
    private LocDetlService locDetlService;
    @Autowired
    private BasWhsService basWhsService;

    @Resource
    private WrkMastService wrkMastService;

    @Resource
    private AdjDetlService adjDetlService;

    @Resource
    private LocDetlMapper locDetlMapper;

    @Resource
    private CommonService commonService;

    @Resource
    private WrkMastLogService wrkMastLogService;

    @Resource
    private WrkDetlLogService wrkDetlLogService;

    @RequestMapping(value = "/locMast/init/pwd")
    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -107,22 +123,106 @@
   @RequestMapping(value = "/locMast/update/auth")
   @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast){

        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("source_loc_no", locMast.getLocNo())
                .or().eq("loc_no", locMast.getLocNo()));
        if(!Cools.isEmpty(wrkMast)){
            return  R.error("该库位正在作业，请先处理工作档");
        }

        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
            return R.error("当前操作已被阻止，请联系管理员");
        }
        Date now = new Date();
        // 有物料时修改为空库位或者空板库位，则删除库存明细
        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F") || oldLocMast.getLocSts().equals("S")) {
            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                // 添加历史工作主档
                WrkMastLog wrkMastLog = new WrkMastLog();
                wrkMastLog.setWrkNo(commonService.getWorkNo(3));
                wrkMastLog.setIoTime(now);
                wrkMastLog.setWrkSts(5);
                wrkMastLog.setIoType(19);
                wrkMastLog.setIoPri(13D); // 优先级
                wrkMastLog.setCrnNo(locMast.getCrnNo());
                wrkMastLog.setSourceLocNo(locMast.getLocNo());
                wrkMastLog.setLocNo(locMast.getLocNo());
                wrkMastLog.setBarcode(locMast.getBarcode()); // 托盘码
                wrkMastLog.setFullPlt("Y"); // 满板：Y
                wrkMastLog.setPicking("N"); // 拣料
                wrkMastLog.setExitMk("N"); // 退出
                wrkMastLog.setEmptyMk("N"); // 空板
                wrkMastLog.setLinkMis("Y");
                // 操作人员数据
                wrkMastLog.setAppeTime(now);
                wrkMastLog.setModiTime(now);
                wrkMastLog.setAppeUser(getUserId());
                wrkMastLog.setModiUser(getUserId());
                boolean res = wrkMastLogService.insert(wrkMastLog);
                if (!res) {
                    throw new CoolException("保存工作档失败");
                }
                for (LocDetl locDetl : locDetls) {
                    // 保存调整记录
                    AdjDetl adjDetl = new AdjDetl();
                    adjDetl.setLocNo(locDetl.getLocNo());
                    adjDetl.setMatnr(locDetl.getMatnr());
                    adjDetl.setBatch(locDetl.getBatch());
                    adjDetl.setOriQty(locDetl.getAnfme());
                    adjDetl.setAdjQty(0.0D);
                    adjDetl.setModiTime(now);
                    adjDetl.setModiUser(getUserId());
                    adjDetl.setAppeTime(now);
                    adjDetl.setAppeUser(getUserId());
                    if (!adjDetlService.insert(adjDetl)) {
                        throw new CoolException("服务器错误，请联系管理员");
                    }

                    // 添加历史工作明细
                    WrkDetlLog wrkDetl = new WrkDetlLog();
                    wrkDetl.sync(locDetl);
                    wrkDetl.setWrkNo(wrkMastLog.getWrkNo());
                    wrkDetl.setIoTime(wrkMastLog.getIoTime());
                    wrkDetl.setAnfme(0.0);
                    wrkDetl.setAppeTime(now);
                    wrkDetl.setModiTime(now);
                    wrkMastLog.setAppeUser(getUserId());
                    wrkMastLog.setModiUser(getUserId());
                    if (!wrkDetlLogService.insert(wrkDetl)) {
                        throw new CoolException("保存工作明细失败");
                    }
                }
                if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()))) {
                    throw new CoolException("服务器错误，请联系管理员");
                }
                locMast.setBarcode("");
            }
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);
        locMast.setModiTime(now);
        AdjDetl adjDetl = new AdjDetl();
        adjDetl.setLocNo(locMast.getLocNo());
        adjDetl.setMatnr("原库位状态：" + oldLocMast.getLocSts());
        adjDetl.setBatch("更改库位状态为：" + locMast.getLocSts());
        adjDetl.setModiTime(now);
        adjDetl.setModiUser(getUserId());
        if (!adjDetlService.insert(adjDetl)) {
            throw new CoolException("库位调整记录失败");
        }
        // 库位冻结->冻结所有库存
        if (locMast.getFrozen() == 1 && oldLocMast.getFrozen() == 0 && locMast.getLocSts().equals("F") && oldLocMast.getLocSts().equals("F")) {
            locDetlMapper.updateDetlFrozenByLocNo(oldLocMast.getLocNo());
        }
        if(!locMastService.updateById(locMast)) {
            throw new CoolException("服务器错误，请联系管理员");
        }
        return R.ok();
    }

@@ -155,7 +255,7 @@
    public R query(String condition) {
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        wrapper.like("loc_no", condition);
        Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
        Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10000), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocMast locMast : page.getRecords()){
            Map<String, Object> map = new HashMap<>();