工单相关功能完善

pang.jiabao

1 天以前 6cd08fe4de88df0a21851f96bdc4e617c5d92e36

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.asrs.task.AbstractHandler;
@@ -16,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -56,6 +58,9 @@
    private TaskDetlService taskDetlService;
    @Autowired
    private BasStationServiceImpl basStationService;

    @Resource
    private LocDetlMapper locDetlMapper;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -421,6 +426,9 @@
                default:
                    break;
            }
            // 更新托盘物料是否齐套(托盘物料都是一个订单的)
            locDetlMapper.updateDangerByLocNo(locMast.getLocNo());

            // 修改工作主档状态
            wrkMast.setWrkSts(5L);
            wrkMast.setModiTime(now);
@@ -553,6 +561,8 @@
                default:
                    break;
            }
            // 更新托盘物料是否齐套(托盘物料都是一个订单的)
            locDetlMapper.updateDangerByLocNo(locMast.getLocNo());
            // 修改工作主档状态
            wrkMast.setWrkSts(15L);
            wrkMast.setModiTime(now);
@@ -689,8 +699,8 @@
                    .setSpecs(pakin.getSpecs())
                    .setColor(pakin.getColor())
                    .setLocNo(locCache.getLocNo())
                    .setAreaId(locCache.getAreaId())
                    .setAreaName(locCache.getAreaName())
//                    .setAreaId(locCache.getAreaId())
//                    .setAreaName(locCache.getAreaName())
                    .setUnit(pakin.getUnit())
                    .setBatch(pakin.getBatch());
            if (!locDetlService.insert(detl)) {