#

luxiaotao1123

2020-06-12 2226c83bff81543472286adea44638e8def2d1bf

#

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

@@ -6,6 +6,7 @@
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +17,7 @@
 * Created by vincent on 2020/6/10
 */
@RestController
public class WorkController {
public class WorkController extends BaseController {

    @Autowired
    private WorkService workService;
@@ -33,7 +34,7 @@
    @ManagerAuth(memo = "全板入库")
    public R start(@RequestBody FullStoreParam fullStoreParam) {
        System.out.println(JSON.toJSONString(fullStoreParam));
        workService.startupFullStore(fullStoreParam);
        workService.startupFullStore(fullStoreParam,getUserId());
        return R.ok();
    }


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

@@ -9,6 +9,6 @@

    List<Integer> getAvailableDevp();

    void checkSiteStatus(Integer devpNo);
    BasDevp checkSiteStatus(Integer devpNo);

}

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

@@ -8,6 +8,6 @@
     * 全板入库
     * @param param
     */
    void startupFullStore(FullStoreParam param);
    void startupFullStore(FullStoreParam param, Long userId);

}

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

@@ -23,7 +23,7 @@
    }

    @Override
    public void checkSiteStatus(Integer devpNo) {
    public BasDevp checkSiteStatus(Integer devpNo) {
        BasDevp station = selectById(devpNo);
        if (station == null){
            throw new CoolException("站点不存在");
@@ -40,5 +40,6 @@
        if(wrkMastService.getWorkingMast(devpNo)>0){
            throw new CoolException("同一站点不能同时生成两笔入库工作档");
        }
        return station;
    }
}

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

@@ -3,6 +3,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
@@ -13,6 +14,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;

/**
 * Created by vincent on 2020/6/11
@@ -29,13 +32,13 @@

    @Override
    @Transactional
    public void startupFullStore(FullStoreParam param) {
    public void startupFullStore(FullStoreParam param, Long userId) {
        // 参数非空判断
        if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
            throw new CoolException(BaseRes.PARAM);
        }
        // 源站点状态检测
        basDevpService.checkSiteStatus(param.getDevpNo());
        BasDevp staNo = basDevpService.checkSiteStatus(param.getDevpNo());
        // 生成工作号
        int workNo = commonService.getWorkNo(0);
        if (workNo == 0) {
@@ -49,11 +52,33 @@
        StartupDto dto = commonService.getLocNo(1, param.getDevpNo());
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        // todo
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(1L); // 工作状态：生成入库ID
        wrkMast.setIoType(1); // 入出库状态：1.入库
        wrkMast.setIoPri(10D); // 优先级：10
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("N");
        wrkMast.setCtnType(staNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeUser(userId);
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(new Date());
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("注入sql失败");
        }

        // 生成工作档明细

    }

}