rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
@@ -1,9 +1,19 @@ package com.vincent.rsf.server.api.controller.erp; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.api.controller.erp.params.ReportParams; import com.vincent.rsf.server.api.service.ReportMsgService; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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.Objects; /** * @author Ryan @@ -17,4 +27,24 @@ @Api(tags = "上报信息接口管理器") public class ReportMsgController extends BaseController { @Autowired private ReportMsgService reportMsgService; @ApiOperation("完成订单上报") @PostMapping("/complete/orders") public R reportOrder(@RequestBody ReportParams params) { if (Objects.isNull(params)) { return R.error("参数不能为空！"); } if (Objects.isNull(params.getOrderType())) { return R.error("订单类型不能为空！！"); } if (Objects.isNull(params.getAction()) || params.getAction().isEmpty()) { return R.error("上报明细不能为空！！"); } return reportMsgService.reportOrders(params); } } rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
New file @@ -0,0 +1,56 @@ package com.vincent.rsf.server.api.controller.erp.params; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import java.util.Date; @Data @Accessors(chain = true) @ApiModel(value = "ReportDataParam", description = "上报参数详情") public class ReportDataParam { @ApiModelProperty("WMS单号") private String WMSNO; @ApiModelProperty("采购单号") private String PONO; @ApiModelProperty("入库日期") private String OrderDate; @ApiModelProperty("采购退货单号/生产单号/") private String OrderNO; @ApiModelProperty("现品票号") private String GoodsNO; @ApiModelProperty("盘点数量") private Double PDQty; @ApiModelProperty("是否不良：1 是， 0否") private String IsBad; @ApiModelProperty("盘点原因") private String Reason; @ApiModelProperty("品种号码") private String ItemCode; @ApiModelProperty("入库数量") private Double InQty; @ApiModelProperty("出库数量") private Double OutQty; @ApiModelProperty("编辑用户") private String EditUser; @ApiModelProperty("编辑时间") private Date EditDate; @ApiModelProperty("备注说明") private String MemoDtl; } rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportParams.java
New file @@ -0,0 +1,26 @@ package com.vincent.rsf.server.api.controller.erp.params; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; import java.util.List; @Data @Accessors(chain = true) @ApiModel(value = "ReportParams", description = "希日ERP上报参数") public class ReportParams implements Serializable { @ApiModelProperty("订单类型") private String OrderType; @ApiModelProperty("动作类型") private String Action = "Update"; @ApiModelProperty("数据") private List<ReportDataParam> Data; } rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
@@ -1,5 +1,7 @@ package com.vincent.rsf.server.api.service; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.api.controller.erp.params.ReportParams; import com.vincent.rsf.server.api.entity.dto.PoItemsDto; import java.util.List; @@ -14,4 +16,6 @@ public interface ReportMsgService { boolean reportInspectNotify(List<PoItemsDto> items); R reportOrders(ReportParams params); } rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.vincent.rsf.common.domain.CommonReponse; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.api.config.RemotesInfoProperties; import com.vincent.rsf.server.api.controller.erp.params.ReportParams; import com.vincent.rsf.server.api.entity.dto.PoItemsDto; import com.vincent.rsf.server.api.entity.params.ErpInspectItem; import com.vincent.rsf.server.api.entity.params.ErpInspectParams; @@ -46,19 +48,19 @@ @Autowired private PurchaseService purchaseService; @Autowired private RemotesInfoProperties.ApiInfo apiInfo; @Autowired private RestTemplate restTemplate; @Autowired private RemotesInfoProperties remotesInfoProperties; @Autowired private AsnOrderService asnOrderService; @Autowired private AsnOrderItemService asnOrderItemService; @Autowired private RemotesInfoProperties.RcsApi rcsApi; /** * @author Ryan * @description 上报质检列表 @@ -141,6 +143,7 @@ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>().in(WkOrderItem::getId, list).set(WkOrderItem::getNtyStatus, 1))) { throw new CoolException("ASN明细单据状态修改失败！！"); } /************************** 修改ASN主单数据 ******************************/ @@ -165,4 +168,16 @@ throw new CoolException(reponse.getMsg()); } } /** * 上报已完成订单明细 * @author Ryan * @date 2025/10/27 21:36 * @param params * @return com.vincent.rsf.framework.common.R */ @Override public R reportOrders(ReportParams params) { return null; } }
