Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

Junjie

2023-10-13 7bd6e380475d1f4ec7a030dffcf0c217b879b0a5

 src/main/java/com/zy/common/web/WcsController.java

@@ -10,7 +10,6 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.service.erp.ErpService;
import com.zy.common.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
@@ -49,7 +48,13 @@
    @Autowired
    private MatService matService;
    @Autowired
    private ErpService erpService;
    private AgvWaitPakinService agvWaitPakinService;
    @Autowired
    private AgvWorkService agvWorkService;
    @Autowired
    private AgvBasDevpService agvBasDevpService;
//    @Autowired
//    private ErpService erpService;

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -299,11 +304,40 @@
    }

    /*
    四项库往AGV补货，wcs调用此接口
    四项库往AGV补货，生成AGV入库通知档
     */
    @PostMapping("/replenishment")
    @ResponseBody
    public R replenishment(@RequestBody ReplenishmentParam param){
        Date now = new Date();
        Integer wrkNo = param.getWrkNo();
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
        wrkDetls.forEach(wrkDetl -> {
            AgvWaitPakin agvWaitPakin = new AgvWaitPakin();
            BeanUtils.copyProperties(wrkDetl,agvWaitPakin);
            agvWaitPakin.setIoStatus("Y");
            agvWaitPakin.setModiTime(now);
            agvWaitPakin.setAppeTime(now);
            agvWaitPakinService.insert(agvWaitPakin);

        });

        return R.ok();
    }

    /*
    生成AGV工作档
     */
    @PostMapping("/start")
    @ResponseBody
    public R start(@RequestBody ReplenishmentParam param){

        //绑定站点
        agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",param.getContainerCode());

        //生成工作档
        List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
        agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null);


        return R.ok();