From bf945f3086a3d0334dbff0ef1d64d6a1d87dffc9 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 16 十二月 2025 08:24:52 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 45 ++++++++++
src/main/java/com/zy/api/service/KopenApiService.java | 14 ++
src/main/resources/mapper/LocDetlMapper.xml | 16 ----
src/main/java/com/zy/api/entity/PubOrderParams.java | 17 ++++
src/main/java/com/zy/api/entity/ReportOrderParam.java | 18 ++++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 17 ++++
src/main/java/com/zy/api/controller/KopenApiController.java | 31 ++++++-
src/main/java/com/zy/api/entity/ReportOrderParams.java | 48 ++++++++++++
src/main/java/com/zy/api/entity/OrderParams.java | 5
9 files changed, 180 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index 2d52128..1d62be6 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -1,11 +1,12 @@
package com.zy.api.controller;
-import com.alibaba.fastjson.JSON;
+
import com.core.common.R;
import com.zy.api.entity.OrderParams;
+import com.zy.api.entity.PubOrderParams;
+import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.service.KopenApiService;
-import com.zy.asrs.entity.Mat;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -13,8 +14,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-import java.util.Map;
import java.util.Objects;
@RestController
@@ -33,8 +32,8 @@
* @return com.core.common.R
*/
@ApiOperation("涓婃灦娲惧伐鍗�")
- @PostMapping("/order/add")
- public R receiveOrders(@RequestBody OrderParams params) {
+ @PostMapping("/sendInDispatch")
+ public R receiveOrders(@RequestBody PubOrderParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -53,7 +52,7 @@
* @return com.core.common.R
*/
@ApiOperation("闆朵欢淇℃伅鏁版嵁鏇存柊")
- @PostMapping("/sync/mat")
+ @PostMapping("/sendPartsMaster")
public R basMatUpdate(@RequestBody SyncMatParmas params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -66,5 +65,23 @@
}
+ /**
+ * 涓婃灦娲惧伐鍗曞弽棣�
+ * @author Ryan
+ * @date 2025/11/24 15:20
+ * @param params
+ * @return com.core.common.R
+ */
+ @ApiOperation("涓婃灦娲惧伐鍗曞弽棣�")
+ @PostMapping("/getInDispatchResult")
+ public R getInDispatchResult(@RequestBody ReportOrderParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
+ return R.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
+ }
+ return kopenApiService.getInDispatchResult(params);
+ }
}
diff --git a/src/main/java/com/zy/api/entity/OrderParams.java b/src/main/java/com/zy/api/entity/OrderParams.java
index 1e084cf..20d63ba 100644
--- a/src/main/java/com/zy/api/entity/OrderParams.java
+++ b/src/main/java/com/zy/api/entity/OrderParams.java
@@ -35,8 +35,9 @@
@ApiModelProperty("鍏ュ簱閫氱煡鍗曞彿")
private String inv_no;
- @ApiModelProperty("鍏ュ簱鐗╂枡鍒楄〃")
- List<OrderItemsParam> details;
+ @ApiModelProperty("鐩爣搴撳尯")
+ private String target_location;
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/zy/api/entity/PubOrderParams.java b/src/main/java/com/zy/api/entity/PubOrderParams.java
new file mode 100644
index 0000000..aa0af92
--- /dev/null
+++ b/src/main/java/com/zy/api/entity/PubOrderParams.java
@@ -0,0 +1,17 @@
+package com.zy.api.entity;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "PubOrderParams", description = "鍙戝竷璁㈠崟淇℃伅")
+public class PubOrderParams extends OrderParams{
+
+ @ApiModelProperty("鍏ュ簱鐗╂枡鍒楄〃")
+ List<OrderItemsParam> details;
+}
diff --git a/src/main/java/com/zy/api/entity/ReportOrderParam.java b/src/main/java/com/zy/api/entity/ReportOrderParam.java
new file mode 100644
index 0000000..139cdce
--- /dev/null
+++ b/src/main/java/com/zy/api/entity/ReportOrderParam.java
@@ -0,0 +1,18 @@
+package com.zy.api.entity;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ReportOrderParam", description = "涓婃姤璁㈠崟淇℃伅")
+public class ReportOrderParam extends OrderParams{
+
+ @ApiModelProperty("涓婃姤璁㈠崟鍒楄〃")
+ List<ReportOrderParams> details;
+
+}
diff --git a/src/main/java/com/zy/api/entity/ReportOrderParams.java b/src/main/java/com/zy/api/entity/ReportOrderParams.java
new file mode 100644
index 0000000..848c55b
--- /dev/null
+++ b/src/main/java/com/zy/api/entity/ReportOrderParams.java
@@ -0,0 +1,48 @@
+package com.zy.api.entity;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel("涓婃姤璁㈠崟鍙傛暟")
+public class ReportOrderParams implements Serializable {
+
+ @ApiModelProperty("BS Code")
+ private String total_serial;
+
+ @ApiModelProperty("浜у搧绫诲瀷")
+ private String pro_type;
+
+ @ApiModelProperty("闆朵欢浠ｇ爜")
+ private String pro_komcode;
+
+ @ApiModelProperty("渚涘簲鍟咺D")
+ private String pro_id;
+
+ @ApiModelProperty("瀹瑰櫒缂栫爜")
+ private String location_no;
+
+ @ApiModelProperty("璐т綅绫诲瀷")
+ private String location_type;
+
+ @ApiModelProperty("涓婃灦鏃ユ湡")
+ private String sj_date;
+
+ @ApiModelProperty("涓婃灦浜�")
+ private String sj_emp;
+
+ @ApiModelProperty("涓婃灦鏁伴噺")
+ private Integer pick_qty;
+
+ @ApiModelProperty("鐮存崯鏁伴噺")
+ private Integer damage_qty;
+
+ @ApiModelProperty("宸紓鏁伴噺")
+ private Integer diff_qty;
+
+}
diff --git a/src/main/java/com/zy/api/service/KopenApiService.java b/src/main/java/com/zy/api/service/KopenApiService.java
index 113bb03..f6ea29c 100644
--- a/src/main/java/com/zy/api/service/KopenApiService.java
+++ b/src/main/java/com/zy/api/service/KopenApiService.java
@@ -1,7 +1,8 @@
package com.zy.api.service;
import com.core.common.R;
-import com.zy.api.entity.OrderParams;
+import com.zy.api.entity.PubOrderParams;
+import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;
public interface KopenApiService {
@@ -14,7 +15,7 @@
* @param params
* @return com.core.common.R
*/
- R receiveOrders(OrderParams params);
+ R receiveOrders(PubOrderParams params);
/**
* 鍩虹闆朵欢鍙樻洿
@@ -31,5 +32,12 @@
* @author Ryan
* @date 2025/11/24 15:33
*/
- void addOrUpdateOrders(OrderParams params, String type) ;
+ void addOrUpdateOrders(PubOrderParams params, String type) ;
+
+ /**
+ * 涓婃灦娲惧伐鍗曞弽棣�
+ * @param params
+ * @return
+ */
+ R getInDispatchResult(ReportOrderParam params);
}
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 09c3ea4..6e881a9 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -6,6 +6,9 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.entity.OrderParams;
+import com.zy.api.entity.ReportOrderParam;
+import com.zy.api.entity.PubOrderParams;
+import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.enums.MatLocType;
import com.zy.api.enums.MatType;
@@ -22,6 +25,7 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.utils.Utils;
+import com.zy.common.utils.HttpHandler;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -52,12 +56,47 @@
* @return com.core.common.R
*/
@Override
- public R receiveOrders(OrderParams params) {
+ public R receiveOrders(PubOrderParams params) {
if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) {
return R.error("褰撳墠绫诲瀷涓嶆槸涓婃灦娲惧伐鍗曪紒锛�");
}
addOrUpdateOrders(params, "add");
return R.ok("鍗曟嵁涓嬪彂鎴愬姛锛侊紒");
+ }
+
+ /**
+ * 涓婃灦娲惧伐鍗曞弽棣�
+ * @author Ryan
+ * @date 2025/11/24 15:33
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R getInDispatchResult(ReportOrderParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri("127.0.0.1:8081")
+ .setPath("/wms/order/getInDispatchResult")
+ .setJson(JSONObject.toJSONString(params))
+ .build()
+ .doPost();
+ if (Objects.isNull(response) || response.trim().isEmpty()) {
+ return R.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
+ }
+ JSONObject jsonObject = JSONObject.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (!Objects.isNull(code) && code.equals(1)) {
+ return R.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
+ } else {
+ String msg = jsonObject.getString("message");
+ return R.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
+ }
+ } catch (Exception e) {
+ return R.error(e.getMessage());
+ }
}
/**
@@ -121,7 +160,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void addOrUpdateOrders(OrderParams params, String type) {
+ public void addOrUpdateOrders(PubOrderParams params, String type) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -161,7 +200,7 @@
* @param params
*/
@Transactional(rollbackFor = Exception.class)
- public void generateOrders(OrderParams params) {
+ public void generateOrders(PubOrderParams params) {
// 灏嗘暟鎹綋鏂拌鍗曟彃鍏�
Order newOrder = new Order();
if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index d89b147..a4b3d7d 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -5,6 +5,8 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
+import com.zy.api.entity.ReportOrderParam;
+import com.zy.api.service.KopenApiService;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
@@ -47,6 +49,8 @@
private OrderPakinService orderPakinService;
@Autowired
private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private KopenApiService kopenApiService;
@Transactional
public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -208,6 +212,16 @@
OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
return SUCCESS;
}
+
+
+
+ /**
+ * 鍗曟嵁涓婃姤
+ * @author Ryan
+ * @date 2025/12/15 16:14
+ * @param order
+ * @return com.zy.asrs.task.core.ReturnT<java.lang.String>
+ */
@Transactional
public ReturnT<String> startOrderReport(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
@@ -233,6 +247,9 @@
String response = "";
boolean success = false;
try {
+ ReportOrderParam orderParam = new ReportOrderParam();
+
+ kopenApiService.getInDispatchResult(orderParam);
// response = new HttpHandler.Builder()
// .setUri(MesConstant.URL)
// .setPath(MesConstant.PAKIN_URL)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index eb99aa4..f8ecfc8 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -531,14 +531,6 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- <!-- <choose>-->
- <!-- <when test="batch != null and batch != ''">-->
- <!-- and a.batch = #{batch}-->
- <!-- </when>-->
- <!-- <otherwise>-->
- <!-- and (a.batch IS NULL OR a.batch = '')-->
- <!-- </otherwise>-->
- <!-- </choose>-->
<if test="orderNo != null and orderNo != ''">
and a.order_no = #{orderNo}
</if>
@@ -625,14 +617,6 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- <!-- <choose>-->
- <!-- <when test="batch != null and batch != ''">-->
- <!-- and a.batch = #{batch}-->
- <!-- </when>-->
- <!-- <otherwise>-->
- <!-- and (a.batch IS NULL OR a.batch = '')-->
- <!-- </otherwise>-->
- <!-- </choose>-->
<if test="orderNo != null and orderNo != ''">
and a.order_no = #{orderNo}
</if>
--
Gitblit v1.9.1