From cc18b818b28445bf6e9da0363fde3703c21178f5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 18 九月 2024 11:00:11 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java | 95 ++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java | 95 ---------
zy-asrs-common/src/main/java/com/zy/asrs/common/model/MesPakoutParam.java | 71 +++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java | 4
zy-asrs-common/src/main/java/com/zy/asrs/common/model/MesPakinParam.java | 43 ++++
zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml | 50 +++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/OrderSyncScheduler.java | 53 +++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java | 3
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java | 83 +++++++++
11 files changed, 415 insertions(+), 88 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/model/MesPakinParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/model/MesPakinParam.java
new file mode 100644
index 0000000..e8f1656
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/model/MesPakinParam.java
@@ -0,0 +1,43 @@
+package com.zy.asrs.common.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/4/21
+ */
+@Data
+public class MesPakinParam {
+
+ // 鍏ュ簱鏃堕棿
+ private String pakinTime;
+
+ // 鏉ユ簮鍦� - 鍐欐
+ private String lgortFrom;
+
+ // 鐩殑鍦� - 鍐欐
+ private String lgortTo;
+
+ private List<Detl> list = new ArrayList<>();
+
+ @Data
+ public static class Detl {
+
+ // 鐗╂枡鏉＄爜
+ private String barcode;
+
+ // 鏁伴噺
+ private Double anfme;
+
+ public Detl() {
+ }
+
+ public Detl(String barcode, Double anfme) {
+ this.barcode = barcode;
+ this.anfme = anfme;
+ }
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/model/MesPakoutParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/model/MesPakoutParam.java
new file mode 100644
index 0000000..13408c2
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/model/MesPakoutParam.java
@@ -0,0 +1,71 @@
+package com.zy.asrs.common.model;
+
+import com.alibaba.fastjson.JSON;
+import com.zy.asrs.framework.common.DateUtils;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/4/21
+ */
+@Data
+public class MesPakoutParam {
+
+ // true: 璁㈠崟鍑�; false: 鎵嬪姩鍑�
+ private boolean tag;
+
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
+
+ // 鍑哄簱鏃堕棿
+ private String pakoutTime;
+
+ // 鏉ユ簮鍦� - 鍐欐
+ private String lgortFrom;
+
+ // 鐩殑鍦� - 鍐欐
+ private String lgortTo;
+
+ // 瀹㈡埛鍙�
+ private String kunnr;
+
+ private List<Detl> list = new ArrayList<>();
+
+ @Data
+ public static class Detl {
+
+ // 鐗╂枡鏉＄爜
+ private String barcode;
+
+ // 鏁伴噺
+ private Double anfme;
+
+ public Detl() {
+ }
+
+ public Detl(String barcode, Double anfme) {
+ this.barcode = barcode;
+ this.anfme = anfme;
+ }
+ }
+
+ public static void main(String[] args) {
+ MesPakoutParam param = new MesPakoutParam();
+ param.setTag(true);
+ param.setOrderNo("8135998");
+// param.setPakoutTime(DateUtils.convert(new Date()));
+ param.setLgortFrom("5006");
+ param.setLgortTo("1111");
+
+
+ Detl detl = new Detl(); param.getList().add(detl);
+ detl.setBarcode("1100146-10000-23132132");
+ detl.setAnfme(1.0D);
+
+ System.out.println(JSON.toJSONString(param));
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
index ed97eeb..dc22b9f 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
@@ -39,6 +39,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
index 9a02a9b..ebc9077 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
@@ -6,12 +6,16 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface OrderMapper extends BaseMapper<Order> {
void updateOrder1(Long orderId,@Param("userId")Long userId);
+ List<Order> selectComplete();
+
int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId, @Param("hostId") Long hostId);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
index 52897a7..160e422 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
@@ -26,4 +26,7 @@
List<OrderNameListDto> selectAllorderNo(Long hostId);
List<String> selectAllOutOrderNo(String orderNo,Long hostId);
+
+ List<Order> selectComplete();
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
index e5a4b96..87b1a5e 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
@@ -38,6 +38,11 @@
private DocTypeService docTypeService;
@Override
+ public List<Order> selectComplete() {
+ return this.baseMapper.selectComplete();
+ }
+
+ @Override
public List<OrderDetl> selectWorkingDetls(Long orderId) {
return orderDetlMapper.selectWorkingDetls(orderId);
}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
index 9d7c276..03e3868 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
@@ -2,6 +2,47 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.OrderMapper">
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.common.wms.entity.Order">
+ <id column="id" property="id" />
+ <result column="uuid" property="uuid" />
+ <result column="order_no" property="orderNo" />
+ <result column="order_time" property="orderTime" />
+ <result column="doc_type" property="docType" />
+ <result column="item_id" property="itemId" />
+ <result column="item_name" property="itemName" />
+ <result column="allot_item_id" property="allotItemId" />
+ <result column="def_number" property="defNumber" />
+ <result column="number" property="number" />
+ <result column="cstmr" property="cstmr" />
+ <result column="cstmr_name" property="cstmrName" />
+ <result column="tel" property="tel" />
+ <result column="oper_memb" property="operMemb" />
+ <result column="total_fee" property="totalFee" />
+ <result column="discount" property="discount" />
+ <result column="discount_fee" property="discountFee" />
+ <result column="other_fee" property="otherFee" />
+ <result column="act_fee" property="actFee" />
+ <result column="pay_type" property="payType" />
+ <result column="salesman" property="salesman" />
+ <result column="account_day" property="accountDay" />
+ <result column="post_fee_type" property="postFeeType" />
+ <result column="post_fee" property="postFee" />
+ <result column="pay_time" property="payTime" />
+ <result column="send_time" property="sendTime" />
+ <result column="ship_name" property="shipName" />
+ <result column="ship_code" property="shipCode" />
+ <result column="settle" property="settle" />
+ <result column="status" property="status" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+ <result column="host_id" property="hostId" />
+
+ </resultMap>
+
<update id="updateOrder1">
update wms_order
set settle = 6
@@ -26,5 +67,14 @@
and host_id = #{hostId}
</update>
+ <select id="selectComplete" resultMap="BaseResultMap">
+ select top 5 *
+ from man_order
+ where 1=1
+ and settle = 4
+ and status = 1
+ order by create_time asc
+ </select>
+
</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/OrderSyncScheduler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/OrderSyncScheduler.java
new file mode 100644
index 0000000..07905b6
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/OrderSyncScheduler.java
@@ -0,0 +1,53 @@
+package com.zy.asrs.wms.task;
+
+import com.zy.asrs.common.wms.entity.Order;
+import com.zy.asrs.common.wms.service.*;
+import com.zy.asrs.wms.task.handler.OrderSyncHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import com.zy.asrs.wms.task.core.ReturnT;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Slf4j
+@Component
+public class OrderSyncScheduler {
+
+ @Autowired
+ private OrderSyncHandler orderSyncHandler;
+ @Autowired
+ private OrderService orderService;
+// @Autowired
+// private ApiLogService apiLogService;
+
+// @Scheduled(cron = "0 0 1 * * ? ")
+ public void clearApiLog(){
+ try {
+// apiLogService.clearWeekBefore();
+ } catch (Exception e) {
+ log.error("绗笁鏂规帴鍙ｆ棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e);
+ }
+ }
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeAndReport(){
+// String erpReport = Parameter.get().getErpReport();
+ if (true) {
+ List<Order> orders = orderService.selectComplete();
+ for (Order order : orders) {
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }
+ }
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java
new file mode 100644
index 0000000..c53c911
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderSyncHandler.java
@@ -0,0 +1,95 @@
+package com.zy.asrs.wms.task.handler;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.openapi.service.ApiLogService;
+import com.zy.asrs.common.wms.entity.*;
+import com.zy.asrs.common.wms.service.DocTypeService;
+import com.zy.asrs.common.wms.service.OrderDetlService;
+import com.zy.asrs.common.wms.service.OrderService;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.wms.task.AbstractHandler;
+import com.zy.asrs.wms.task.core.ReturnT;
+import com.zy.asrs.wms.utils.PostMesDataUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Slf4j
+@Service
+public class OrderSyncHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Value("${erp.url}")
+ private String ERP_URL;
+
+ @Value("${erp.report}")
+ private String ERP_REPORT;
+
+ @Value("${erp.login}")
+ private String ERP_LOGIN;
+
+ @Transactional
+ public ReturnT<String> start(Order order) {
+ DocType docType = docTypeService.getById(order.getDocType());
+ if (null == docType) {
+ return new ReturnT<String>().setCode(500);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId,order.getId()));
+
+ //涓婃姤蹇靛垵ERP 銆� 涓婃姤涓夋柟骞冲彴 銆�
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+ String nowFormat = dateFormat.format(new Date());
+
+ ArrayList<LinkedHashMap<String, Object>> mats = new ArrayList<>();
+ String orderNo = order.getOrderNo();
+ for (OrderDetl orderDetl:orderDetls){
+ LinkedHashMap<String, Object> mat = new LinkedHashMap<>();
+ mat.put("GoodsCode", orderDetl.getMatnr());
+ mat.put("Num", orderDetl.getAnfme());
+ if (!Cools.isEmpty(orderDetl.getBatch())) {
+ mat.put("BatchNo", orderDetl.getBatch());
+ }
+ if (!Cools.isEmpty(orderDetl.getThreeCode())) {
+ mat.put("DepotName", orderDetl.getThreeCode());
+ }
+ if (!Cools.isEmpty(orderDetl.getSupp())) {
+ mat.put("FromDanCode", orderDetl.getSupp());
+ }
+ if (!Cools.isEmpty(orderDetl.getSuppCode())) {
+ mat.put("FromNo", orderDetl.getSuppCode());
+ }
+ mats.add(mat);
+ }
+ LinkedHashMap<String, Object> param = new LinkedHashMap<>();
+ param.put("Login", ERP_LOGIN);
+ param.put("DanType", order.getDocType$()+"SH");
+ param.put("Date", nowFormat);
+ param.put("DanCode", orderNo);
+ param.put("Data", mats);
+ ReturnT<String> mesReturn = new PostMesDataUtils().getMesData("涓婃姤MES", ERP_URL, ERP_REPORT, param);
+
+ return mesReturn;
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
index 2e6e52e..8229dd3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
@@ -73,7 +73,7 @@
while (iterator.hasNext()) {
WrkDetl wrkDetl = iterator.next();
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- wrkDetlsKeyOrder.add(wrkDetl);
+ orderService.checkComplete(wrkDetl.getOrderNo(),hostId);
iterator.remove();
}
}
@@ -118,87 +118,6 @@
}
}
- if (!wrkDetlsKeyOrder.isEmpty()) {
- //涓婃姤蹇靛垵ERP 銆� 涓婃姤涓夋柟骞冲彴 銆�
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
- String nowFormat = dateFormat.format(new Date());
-
- ArrayList<LinkedHashMap<String, Object>> mats = new ArrayList<>();
- String orderNo = "";
- for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
- orderNo = wrkDetl.getOrderNo();
- LinkedHashMap<String, Object> mat = new LinkedHashMap<>();
- mat.put("GoodsCode", wrkDetl.getMatnr());
- mat.put("Num", wrkDetl.getAnfme());
- if (!Cools.isEmpty(wrkDetl.getBatch())) {
- mat.put("BatchNo", wrkDetl.getBatch());
- }
- if (!Cools.isEmpty(wrkDetl.getThreeCode())) {
- mat.put("DepotName", wrkDetl.getThreeCode());
- }
- if (!Cools.isEmpty(wrkDetl.getSupp())) {
- mat.put("FromDanCode", wrkDetl.getSupp());
- }
- if (!Cools.isEmpty(wrkDetl.getSuppCode())) {
- mat.put("FromNo", wrkDetl.getSuppCode());
- }
- mats.add(mat);
- }
- Order order = orderService.selectByNo(orderNo, hostId);
- if (order != null) {
- LinkedHashMap<String, Object> param = new LinkedHashMap<>();
- param.put("Login", ERP_LOGIN);
- param.put("DanType", order.getDocType$()+"SH");
- param.put("Date", nowFormat);
- param.put("DanCode", orderNo);
- param.put("Data", mats);
-
- String response = "";
- try {
- response = new HttpHandler.Builder()
- .setUri(ERP_URL)
- .setPath(ERP_REPORT + Utils.ncErpDataEncode(param))
- .build()
- .doGet();
- JSONObject jsonObject = JSON.parseObject(response);
- JSONArray result = jsonObject.getJSONArray("result");
- Object object = result.get(0);
- JSONObject data = JSON.parseObject(object.toString());
- if (data.getBoolean("State")) {
- //涓婃姤鎴愬姛
- } else {
- //涓婃姤澶辫触
- exceptionHandle("涓婃姤ERP澶辫触[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- } catch (Exception e) {
- e.printStackTrace();
- //寮傚父涓婃姤澶辫触
- exceptionHandle("涓婃姤ERP寮傚父澶辫触[workNo={0}]澶辫触", wrkMast.getWrkNo());
- } finally {
- //璁板綍涓婃姤鏁版嵁
- OperateLog operateLog = new OperateLog();
- operateLog.setAction("涓婃姤ERP," + ERP_URL + ERP_REPORT);
- operateLog.setRequest(Utils.ncErpDataEncode(param));
- operateLog.setResponse(response);
- operateLog.setCreateTime(new Date());
- operateLog.setSystem("WMS");
- operateLog.setUserId(9527L);
- operateLog.setIp("127.0.0.1");
- operateLogService.save(operateLog);
- //璁板綍涓婃姤鏁版嵁
- OperateLog operateLog1 = new OperateLog();
- operateLog1.setAction("涓婃姤ERP," + ERP_URL + ERP_REPORT);
- operateLog1.setRequest(param.toString());
- operateLog1.setResponse(response);
- operateLog1.setCreateTime(new Date());
- operateLog1.setSystem("WMS");
- operateLog1.setUserId(9527L);
- operateLog1.setIp("127.0.0.1");
- operateLogService.save(operateLog1);
- }
- }
- }
-
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.saveToHistory(wrkMast.getId())) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -209,16 +128,16 @@
}
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (!wrkDetlLogService.saveToHistory(wrkMast.getWrkNo(), hostId)) {
-// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.remove(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId))) {
-// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
- // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
- for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
- orderService.checkComplete(wrkDetl.getOrderNo(), hostId);
- }
+// // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+// for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
+// orderService.checkComplete(wrkDetl.getOrderNo(), hostId);
+// }
} catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
new file mode 100644
index 0000000..04c6887
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -0,0 +1,83 @@
+package com.zy.asrs.wms.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.zy.asrs.common.sys.entity.OperateLog;
+import com.zy.asrs.common.utils.HttpHandler;
+import com.zy.asrs.common.utils.Utils;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.common.sys.service.OperateLogService;
+import com.zy.asrs.wms.task.AbstractHandler;
+import com.zy.asrs.wms.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+
+@Slf4j
+public class PostMesDataUtils extends AbstractHandler<String> {
+
+ public ReturnT<String> getMesData(String name,String URL,String mesPath, LinkedHashMap<String, Object> combParam){
+ if(combParam != null){
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(URL)
+ .setPath(mesPath + Utils.ncErpDataEncode(combParam))
+ .build()
+ .doGet();
+ System.out.println("response:"+response);
+ JSONObject jsonObject = JSON.parseObject(response);
+ JSONArray result = jsonObject.getJSONArray("result");
+ Object object = result.get(0);
+ JSONObject data = JSON.parseObject(object.toString());
+ if (data.getBoolean("State")) {
+ //涓婃姤鎴愬姛
+ success = true;
+ } else {
+ //涓婃姤澶辫触
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤"+name);
+ }
+ if (jsonObject.getInteger("code").equals(200) || jsonObject.getInteger("Code").equals(200)) {
+
+ } else {
+
+ }
+ } catch (Exception e) {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ OperateLogService operateLogService = SpringUtils.getBean(OperateLogService.class);
+ //璁板綍涓婃姤鏁版嵁
+ OperateLog operateLog = new OperateLog();
+ operateLog.setAction("涓婃姤ERP," + URL + mesPath);
+ operateLog.setRequest(Utils.ncErpDataEncode(combParam));
+ operateLog.setResponse(response);
+ operateLog.setCreateTime(new Date());
+ operateLog.setSystem("WMS");
+ operateLog.setUserId(9527L);
+ operateLog.setIp("127.0.0.1");
+ operateLogService.save(operateLog);
+ //璁板綍涓婃姤鏁版嵁
+ OperateLog operateLog1 = new OperateLog();
+ operateLog1.setAction("涓婃姤ERP," + URL + mesPath);
+ operateLog1.setRequest(combParam.toString());
+ operateLog1.setResponse(response);
+ operateLog1.setCreateTime(new Date());
+ operateLog1.setSystem("WMS");
+ operateLog1.setUserId(9527L);
+ operateLog1.setIp("127.0.0.1");
+ operateLogService.save(operateLog1);
+ } catch (Exception e) {
+ log.error("", e); }
+ }
+ }
+ return SUCCESS;
+ }
+}
--
Gitblit v1.9.1