diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkOrderAdjustVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkOrderAdjustVO.java new file mode 100644 index 00000000..ae373431 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkOrderAdjustVO.java @@ -0,0 +1,16 @@ +package org.springblade.desk.produce.pojo.vo; + +import lombok.Data; +import org.springblade.desk.produce.pojo.entity.WorkOrderAdjust; + +/** + * 订单调整记录 视图实体类 + * + * @author litao + */ +@Data +public class WorkOrderAdjustVO extends WorkOrderAdjust { + + + +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java index 269f34bf..4b00e4b0 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java @@ -27,8 +27,10 @@ package org.springblade.erpdata.feign; import org.springblade.common.constant.LauncherConstant; +import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; /** * Feign接口类 @@ -49,14 +51,14 @@ public interface IErpDataPartClient { * 调用erp过程发送零件信息(烧结零件不同步erp) * @param dsPart */ - @PostMapping(SENDING_PART_GIVE_ERP) - void sendingPartGiveErp(org.springblade.desk.dashboard.pojo.entity.DsPartEntity dsPart); + @GetMapping(SENDING_PART_GIVE_ERP) + void sendingPartGiveErp(DsPartEntity dsPart); /** * 获取pdm图纸地址 * @param partCode * @return */ - @PostMapping(OPEN_PDM_DRAWING) - String openPdmDrawing(String partCode); + @GetMapping(OPEN_PDM_DRAWING) + String openPdmDrawing(@RequestParam String partCode); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataPartClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataPartClient.java index 296fbbd7..165092ab 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataPartClient.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataPartClient.java @@ -24,13 +24,11 @@ public class ErpDataPartClient implements IErpDataPartClient{ private final IErpPartService partService; @Override - @GetMapping(SENDING_PART_GIVE_ERP) public void sendingPartGiveErp(DsPartEntity dsPart) { partService.sendingPartGiveErp(dsPart); } @Override - @GetMapping(OPEN_PDM_DRAWING) public String openPdmDrawing(String partCode) { return partService.openPdmDrawing(partCode); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataProduceClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataProduceClient.java index e8d0a583..5d3b561d 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataProduceClient.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataProduceClient.java @@ -32,13 +32,11 @@ public class ErpDataProduceClient implements IErpDataProduceClient { private final IErpDataProduceService erpDataProduceService; @Override - @GetMapping(QUERY_BATCH) public R> queryBatch(String partCode) { return R.data(erpDataProduceService.queryBatch(partCode)); } @Override - @GetMapping(REWORK_ORDER) public R> loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size) { return R.data(erpDataProduceService.loadReworkOrder(reworkCode, partCode, batchNo, current, size)); }