From 4e0470a90f640f57d8f8af6708eb05f77bf561dd Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 27 十月 2025 21:58:46 +0800
Subject: [PATCH] #新增 1. rsf-server添加上报调用接口 2，rsf-server添加盘点调用接口
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java | 56 ++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java | 30 ++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java | 4 +
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 21 ++++++-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportParams.java | 26 ++++++++
5 files changed, 134 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
index b786e62..5774b2d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
+++ b/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);
+
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
new file mode 100644
index 0000000..ef75ae3
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
@@ -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;
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportParams.java
new file mode 100644
index 0000000..6d1e661
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportParams.java
@@ -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;
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
index 537e3a0..8fddacf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
+++ b/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);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index c575dc0..4ce9ebf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/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;
+ }
}
--
Gitblit v1.9.1