no message

skyouc

5 天以前 2567eba7aff97393618e71337045345bdffdb856

no message

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

@@ -60,6 +60,7 @@
        List<LocDto> locDtos = checkOrderService.preview(orderId);
        return R.ok(locDtos);
    }

    @PostMapping(value = "/checkOrder/getTaskList/auth")
    @ManagerAuth(memo = "pda：获取盘点任务列表")
    public R checkOrderGetTaskList(@RequestBody CheckTaskListParam checkTaskListParam) {
@@ -145,9 +146,9 @@
            checkOrderDetl.setStatus(1);
            checkOrderDetl.setZpallet(locDetl.getZpallet());
            checkOrderDetl.setCreateBy(getUserId());
            checkOrderDetl.setCreateTime(now);
//            checkOrderDetl.setCreateTime(now);
            checkOrderDetl.setUpdateBy(getUserId());
            checkOrderDetl.setUpdateTime(now);
//            checkOrderDetl.setUpdateTime(now);
            if (!checkOrderDetlService.insert(checkOrderDetl)) {
                throw new CoolException("保存盘点单明细失败");
            }
@@ -195,9 +196,9 @@
            checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
            checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
            checkOrderDetl1.setCreateBy(getUserId());
            checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
//            checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
            checkOrderDetl1.setUpdateBy(getUserId());
            checkOrderDetl1.setUpdateTime(now);
//            checkOrderDetl1.setUpdateTime(now);
            if (!checkOrderDetlService.insert(checkOrderDetl1)) {
                throw new CoolException("保存盘点单明细失败");
            }

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

@@ -84,7 +84,7 @@
            return R.error("库位不存在");
        }
        cache.setSort(locCache.getSort());
        if (!locCacheService.updateById(cache)) {
        if (!locCacheService.update(cache, new EntityWrapper<LocCache>().eq("loc_no", cache.getLocNo()))) {
            return R.error("更新失败");
        }
        return R.ok();
@@ -94,7 +94,7 @@
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            locCacheService.deleteById(id);
//            locCacheService.deleteById(id);
        }
        return R.ok();
    }

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

@@ -223,7 +223,7 @@
     * @version 1.0
     */
    @PostMapping("/cache/out/call")
    @ApiOperation("呼叫AGV搬运")
    @ApiOperation("呼叫AGV搬运/缓存出库")
    @ManagerAuth
    public R OutCallAgv(@RequestBody AgvCallParams params) {
        if (Objects.isNull(params)) {
@@ -361,6 +361,20 @@
    }

    /**
     * 空板出库
     * @param params
     * @return
     */
    @RequestMapping("/empty/call/out")
    public R getEmptyOut(@RequestBody AgvCallParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return mobileService.getEmptyOutStock(params);
    }


    /**
     *
     * 获取捆包出库明细
     * @param params

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

@@ -11,8 +11,6 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasStationDetlServiceImpl;
import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -54,11 +52,9 @@
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private BasStationServiceImpl basStationService;
    private BasStationService basStationService;
    @Autowired
    private BasStationDetlService basStationDetlService;


    /**
     * 组托查询接口
     */