From 7930d685829d7cc1e743e9a4cd9bd3924ad953fb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 13:39:56 +0800
Subject: [PATCH] 修改1.0 9.24
---
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 24 ++++++++
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 10 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 45 ++++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java | 3
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java | 8 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java | 7 +-
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java | 8 ++
inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java | 14 ++++
inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java | 5 +
9 files changed, 116 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
index e5331a8..f71ce6d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
@@ -34,6 +34,14 @@
@Resource
Jwt jwt;
+ @ApiOperation(value = "鏂板鍘熸潗鏂欐楠屽崟-->鏍规嵁鍘熸潗鏂欑紪鐮佸緱鍒癷fs涓殑鎶ユ鏁版嵁")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "code", value = "鍘熸潗鏂欑紪鐮�", dataTypeClass = String.class, required = true)
+ })
+ @PostMapping("/chooseIFS")
+ public Result chooseIFS(String code){
+ return Result.success(rawInspectService.chooseIFS(code));
+ }
@ApiOperation(value = "鏂板鍘熸潗鏂欐楠屽崟")
@PostMapping("/addRawInspects")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
index ded3510..1c48c67 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
@@ -32,7 +32,8 @@
//娓呯┖妫�楠岀粨璁�
void updById(Integer rawInspectId);
-
+ //鏍规嵁鍘熸潗鏂欑紪鐮佹煡璇㈡渶杩戜竴鏉℃暟鎹�
+ RawInspect selOneByCode(String code);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
index 32511d9..641d16d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.pojo;
+import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
@@ -101,8 +102,8 @@
/**
* 鏉ユ枡鏃ユ湡
*/
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date formTime;
@TableField(exist = false)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
index 50d0973..29e5378 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.pojo.vo;
+import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -23,9 +24,9 @@
* 鏉ユ枡鏃ユ湡
*/
@NotNull(message = "鏉ユ枡鏃ユ湡涓嶈兘涓虹┖!")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date formTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private DateTime formTime;
/**
* 鍨嬪彿瑙勬牸
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
index d75f8c6..0bce4a8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
@@ -18,6 +18,13 @@
public interface RawInspectService extends IService<RawInspect> {
/**
+ *鏂板鍘熸潗鏂欐楠屽崟-->鏍规嵁鍘熸潗鏂欑紪鐮佸緱鍒癷fs涓殑鎶ユ鏁版嵁
+ * @param code
+ * @return
+ */
+ RawInspectVo chooseIFS(String code);
+
+ /**
* 鏂板鍘熸潗鏂欐楠屽崟
* @param userId
* @param rawInspectVo
@@ -48,4 +55,5 @@
*/
String updateRawInspectsById(Integer id);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 175cb11..531a1eb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -1,9 +1,12 @@
package com.yuanchu.mom.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.Task.SyncOrder;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.pojo.vo.RawInsProductVo;
@@ -12,6 +15,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -38,6 +42,42 @@
@Resource
UserMapper userMapper;
+
+ //鏂板鍘熸潗鏂欐楠屽崟-->鏍规嵁鍘熸潗鏂欑紪鐮佸緱鍒癷fs涓殑鎶ユ鏁版嵁
+ @Override
+ public RawInspectVo chooseIFS(String code) {
+ RawInspectVo rawInspectVo = new RawInspectVo();
+ List<Map<String, Object>> mapList = SyncOrder.ifsInterfaces();
+ for (Map<String, Object> map : mapList) {
+ if (map.get("STATE").equals("宸叉帴鏀�")) {
+ if (map.get("PART_NO").toString().equals(code)) {
+ rawInspectVo.setCode(map.get("PART_NO").toString()); //鍘熸潗鏂欑紪鐮�
+ String[] split = map.get("PART_DESC").toString().split("锛�");
+ rawInspectVo.setName(split[0]); //鍘熸潗鏂欏悕绉�
+ rawInspectVo.setSpecifications(split[1]); //鍨嬪彿瑙勬牸
+ rawInspectVo.setUnit(map.get("BUY_UNIT_MEAS").toString()); //鍗曚綅
+ rawInspectVo.setNumber(Integer.parseInt(String.valueOf(map.get("QTY_TO_INSPECT")))); //鏁伴噺
+ rawInspectVo.setFormTime(DateUtil.parse(map.get("APPROVED_DATE").toString())); //鏉ユ枡鏃ユ湡
+ rawInspectVo.setSupplier(map.get("SUPPLIER_NAME").toString()); //渚涘簲鍟�
+ }
+ }
+ }
+ //鏌ヨ璇ュ師鏉愭枡鏄惁鏈夋楠岄」鐩褰�
+ RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
+ if (ObjectUtils.isNotEmpty(rawInspect)){
+ List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query().eq("raw_inspect_id", rawInspect.getId()));
+ List<RawInsProductVo> rawInsProductVos = rawInsProductList.stream().map(rawInsProduct -> {
+ RawInsProductVo rawInsProductVo = new RawInsProductVo();
+ rawInsProductVo.setName(rawInsProduct.getName());
+ rawInsProductVo.setUnit(rawInsProduct.getUnit());
+ rawInsProductVo.setRequired(rawInsProduct.getRequired());
+ rawInsProductVo.setInternal(rawInsProduct.getInternal());
+ return rawInsProductVo;
+ }).collect(Collectors.toList());
+ rawInspectVo.setRawInsProducts(rawInsProductVos);
+ }
+ return rawInspectVo;
+ }
//鏂板鍘熸潗鏂欐楠屽崟
@Override
@@ -67,10 +107,10 @@
String testValue = rawInsProduct.getTestValue();//妫�娴嬪��
char req = required.charAt(0);
List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
- int values=2;
+ int values = 2;
if (req == '>' || req == '<' || req == '=') {
values = checkValues(required, internal, s);
- }else {
+ } else {
values = conValues(required, internal, s);
}
return values;
@@ -157,6 +197,7 @@
}
return 0;
}
+
//濡傛灉鏄�> , < ,=鐨勬搷浣�
private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index b6f7a8c..ef7bb4f 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -124,4 +124,14 @@
and rp.state = 1
and r.id = #{id}
</select>
+
+ <!--鏍规嵁鍘熸潗鏂欑紪鐮佹煡璇㈡渶杩戜竴鏉℃暟鎹�-->
+ <select id="selOneByCode" resultType="com.yuanchu.mom.pojo.RawInspect">
+ select *
+ from mom_ocean.raw_inspect
+ where state = 1
+ and code = #{code}
+ order by id desc
+ limit 1
+ </select>
</mapper>
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java b/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
index 5ab2ee7..00cfc7d 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
@@ -27,6 +27,8 @@
private static final String DOWN_LOAD = "http://192.168.18.16:9999/order/otcService/download/";
+ private static final String IFS_URL="http://192.168.20.47:8008/PurchService.ashx?contract=ZTKJ&contractKey=4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=&procedureName=QUERY_POL_RECEIPT_STD&userId=mes_user&inAttr={\"ORDER_NO\":\"-2050314\"}";
+
private static final Map<String, String> GET_TOKEN_HEADER = new HashMap<>(2);
private static final Map<String, Object> USER_INFO = new HashMap<>(4);
@@ -88,4 +90,16 @@
.execute().body();
return result;
}
+
+ /**
+ * ifs
+ * @return
+ */
+ public static List<Map<String, Object>>ifsInterfaces(){
+ String result = HttpRequest.get(IFS_URL)
+ .header("Authorization", "Bearer " + getToken())
+ .execute().body();
+ Map<String, Object>map=JsonUtil.jsonToPojo(result,Map.class);
+ return JsonUtil.jsonToPojo(JsonUtil.jsonToString(map.get("LIST_INFO")),List.class);
+ }
}
diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
index cd45d30..43087a4 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -1,7 +1,9 @@
package com.yuanchu.mom;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.yuanchu.mom.Task.SyncOrder;
+import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.pojo.SaleMaterial;
import org.junit.jupiter.api.Test;
@@ -60,4 +62,26 @@
}
System.out.println(list);
}
+
+ @Test
+ void bb() {
+ List<Map<String, Object>> mapList = SyncOrder.ifsInterfaces();
+ List<RawInspect> rawInspectList = mapList.stream().map(map -> {
+ RawInspect rawInspect = new RawInspect();
+ if (map.get("PART_NO").toString().equals("A0410008010700")) {
+ rawInspect.setCode(map.get("PART_NO").toString()); //鍘熸潗鏂欑紪鐮�
+ String[] split = map.get("PART_DESC").toString().split("锛�");
+ rawInspect.setName(split[0]); //鍘熸潗鏂欏悕绉�
+ rawInspect.setSpecifications(split[1]); //鍨嬪彿瑙勬牸
+ rawInspect.setUnit(map.get("BUY_UNIT_MEAS").toString()); //鍗曚綅
+ rawInspect.setNumber(Integer.parseInt(String.valueOf(map.get("QTY_TO_INSPECT")))); //鏁伴噺
+ rawInspect.setInsState(0); //鏈楠�
+ rawInspect.setFormTime(DateUtil.parse(map.get("APPROVED_DATE").toString())); //鏉ユ枡鏃ユ湡
+ rawInspect.setSupplier(map.get("SUPPLIER_NAME").toString()); //渚涘簲鍟�
+ }
+ return rawInspect;
+ }).collect(Collectors.toList());
+ System.out.println(rawInspectList);
+ }
+
}
--
Gitblit v1.9.3