From 3502e5aa420a6309e82c93a9f37062a3d3b5d4d3 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期日, 05 三月 2023 16:05:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 25 ++++++++
src/main/resources/mapper/ViewWorkInMapper.xml | 7 ++
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 57 +++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 27 +++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 11 +++
6 files changed, 129 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4a9ee52..a7aa55e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -193,6 +193,31 @@
return R.ok("缁勬墭鎴愬姛");
}
+ /**
+ * 鍏ュ簱璁板綍鑾峰彇
+ */
+ @PostMapping("/inlog/v1")
+ public synchronized R inlogERP(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request){
+ auth(appkey,null, request);
+ if (Cools.isEmpty()) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok().add(openService.inlogERP());
+ }
+ /**
+ * 鍑哄簱璁板綍鑾峰彇
+ */
+ @PostMapping("/outlog/v1")
+ public synchronized R outlogERP(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request){
+ auth(appkey,null, request);
+ if (Cools.isEmpty()) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index ec3c79a..e5a0d64 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -125,9 +125,11 @@
@ApiModelProperty(value= "淇濊川鏈�")
private String dead_time;
+ private String deadTime=dead_time;
@ApiModelProperty(value= "棰勮澶╂暟")
private Integer dead_warn;
+ private Integer deadWarn=this.dead_warn;
@ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
@@ -153,6 +155,61 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ // 宸ヤ綔鍙�
+ private Integer wrkNo;
+ // 宸ヤ綔鏃堕棿
+ private Date ioTime;
+ //鍗曟嵁缂栧彿
+ private String orderNo;
+ //鍗曟嵁鏃堕棿
+ private String manuDate;
+ //鍝侀」鏁�
+ private String itemNum;
+ //瀹夊叏搴撳瓨閲�
+ private Double safeQty;
+ //涓夋柟缂栫爜
+ private String threeCode;
+ //渚涘簲鍟嗙紪鐮�
+ private String suppCode;
+ //鏄惁鎵规 1: 鏄� 0: 鍚�
+ private Integer beBatch;
+ // 淇敼浜哄憳
+ private Long modiUser;
+ // 淇敼鏃堕棿
+ private Object modiTime;
+ // 鍒涘缓鑰�
+ private Long appeUser;
+ // 娣诲姞鏃堕棿
+ private Object appeTime;
+ public void sype(){
+ // 宸ヤ綔鍙�
+ wrkNo=wrk_no;
+ // 宸ヤ綔鏃堕棿
+ ioTime=io_time;
+ //鍗曟嵁缂栧彿
+ orderNo=order_no;
+ //鍗曟嵁鏃堕棿
+ manuDate=manu_date;
+ //鍝侀」鏁�
+ itemNum=item_num;
+ //瀹夊叏搴撳瓨閲�
+ safeQty=safe_qty;
+ //涓夋柟缂栫爜
+ threeCode=three_code;
+ //渚涘簲鍟嗙紪鐮�
+ suppCode=supp_code;
+ //鏄惁鎵规 1: 鏄� 0: 鍚�
+ beBatch=be_batch;
+ // 淇敼浜哄憳
+ modiUser=modi_user;
+ // 淇敼鏃堕棿
+ modiTime=modi_time;
+ // 鍒涘缓鑰�
+ appeUser=appe_user;
+ // 娣诲姞鏃堕棿
+ appeTime=appe_time;
+ }
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modi_user);
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 6a804db..8ac825d 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -52,6 +52,8 @@
public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤
+ public List<ViewWorkInBean> getViewWorkInERP();
//鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index c203336..2108b95 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service;
+import com.zy.asrs.entity.ViewWorkInBean;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -49,4 +50,14 @@
*/
void combMes(CombParam param);
+ /**
+ * 鍏ュ簱璁板綍鑾峰彇
+ */
+ List<ViewWorkInBean> inlogERP();
+
+ /**
+ * 鍑哄簱璁板綍鑾峰彇
+ */
+ void outlogERP();
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 021c0ed..f84e478 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
@@ -56,6 +57,8 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
@Override
@Transactional
@@ -580,4 +583,28 @@
}
}
+ /**
+ * 鍏ュ簱璁板綍鑾峰彇
+ */
+ @Override
+ @Transactional
+ public List<ViewWorkInBean> inlogERP() {
+ List<ViewWorkInBean> viewWorkInERP = reportQueryMapper.getViewWorkInERP();
+ ArrayList<ViewWorkInBean> viewWorkInBeans = new ArrayList<>();
+ for (ViewWorkInBean viewWorkInBean:viewWorkInERP){
+ viewWorkInBean.sype();
+ viewWorkInBeans.add(viewWorkInBean);
+ }
+ return viewWorkInBeans;
+ }
+
+ /**
+ * 鍑哄簱璁板綍鑾峰彇
+ */
+ @Override
+ @Transactional
+ public void outlogERP() {
+
+ }
+
}
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index e63997b..cde2279 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -108,6 +108,13 @@
<include refid="viewWorkInConditionSql"></include>
</select>
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤 -->
+<select id="getViewWorkInERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+ select top 100 * from asr_wrkin_view
+ where 1=1
+ Order by io_time desc
+</select>
+
<!-- 鍑哄簱缁熻 -->
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
<select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
--
Gitblit v1.9.1