diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java new file mode 100644 index 0000000..d7812dd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java @@ -0,0 +1,46 @@ +package com.ruoyi.api.controller; + +import cn.hutool.json.JSONUtil; +import com.ruoyi.api.domain.ReMaterialParam; +import com.ruoyi.api.domain.RequestEnter; +import com.ruoyi.api.domain.WmsJobRequest; +import com.ruoyi.api.service.IToWmsService; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.log.domain.RequestLog; +import com.ruoyi.log.service.IRequestLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * 作业统计 Controller + */ +@RestController +@RequestMapping("/api2erp") +public class ToErpApiController { + + /** + * 入库完成回传 + */ + + + /** + * 出库完成回传 + */ + + /** + * 接收物料信息 + */ + + /** + * 接收客户信息 + */ + + /** + * 接收供应商信息 + */ +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java index 7a6462d..319a54d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java @@ -20,22 +20,6 @@ public class ToWcsApiController { @Autowired private IToWcsService toWcsService; - /** - * 推送CTU出库任务 - *//* - //@PostMapping("/pushOutMydoJob") - @Scheduled(fixedDelay=10000) - public void pushOutMydoJob() { - toWcsService.pushOutMydoJob(); - } - - *//** - * 推送CTU流利架空料箱入库任务 - *//* - @Scheduled(fixedDelay=10000) - public void pushInMydoJob() { - toWcsService.pushInMydoJob(); - }*/ /** * 推送agv搬运作业 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java index 3f7d46e..5991b09 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java @@ -108,4 +108,13 @@ public class ToWmsApiController { requestLogService.insertRequestLog(requestLog); return ajaxResult; } + + + /** + * 接收入库单据 + */ + + /** + * 接收出库单据 + */ } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/service/impl/BasProductCodeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/service/impl/BasProductCodeServiceImpl.java index 7bd821e..d2d2c8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/service/impl/BasProductCodeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProductCode/service/impl/BasProductCodeServiceImpl.java @@ -54,7 +54,7 @@ public class BasProductCodeServiceImpl implements IBasProductCodeService public int insertBasProductCode(BasProductCode basProductCode) { basProductCode.setCreateTime(DateUtils.getNowDate()); - basProductCode.setType("1"); + basProductCode.setType("2"); return basProductCodeMapper.insertBasProductCode(basProductCode); }