From ca301e64c071ecbdf9e7442070fa7b9b80ca56e4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 259 +++++++++++++++++++++++++++------------------------
1 files changed, 135 insertions(+), 124 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2f210a5..0b847d5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -12,11 +12,14 @@
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.Review;
+import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.PostMesDataUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -24,8 +27,7 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
+import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -86,7 +88,9 @@
@Autowired
private WorkService workService;
@Autowired
- private UserService userService;//鍙煡璇� 鏃犱慨鏀规搷浣�
+ private PackQualifiedService packQualifiedService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
@Value("${mes.url}")
private String mesUrl;
@@ -106,7 +110,7 @@
@Value("${ren.startUpTestPACK}")
private String startUpTestPACK;
- @Value("${ren.startUpTestPACK}")
+ @Value("${ren.suspendTestPACK}")
private String suspendTestPACK;
@Value("${mes.inPath}")
@@ -637,83 +641,60 @@
@Transactional
public void startUpTestPACK(TestMast testMast) {
if(Cools.isEmpty(testMast.getLocNo())){
- throw new CoolException("搴撲綅鍙蜂负绌�");
- }else if(Cools.isEmpty(testMast.getChannel())){
- throw new CoolException("鐢ㄦ埛缂栫爜涓虹┖");
+ log.error("搴撲綅鍙蜂负绌�");
+ return;
}else if(Cools.isEmpty(testMast.getBarcode())){
- throw new CoolException("PACK鐮佷负绌�");
- }
- User user = userService.selectOne(new EntityWrapper<User>().eq("username", testMast.getChannel().toString()));
- if (!Cools.isEmpty(user)){
- testMast.setUserId(user.getMobile());
- }else {
- throw new CoolException("鏈煡鍒扮敤鎴风紪鍙凤細"+testMast.getChannel()+"鎵�灞炵敤鎴风爜");
+ log.error("PACK鐮佷负绌�");
+ return;
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", testMast.getLocNo())
.eq("loc_sts","F")
);
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鏈煡璇㈠埌搴撲綅鍙凤細"+testMast.getLocNo()+" 璇锋鏌ュ簱浣嶅彿鎴栬�呮鏌ュ簱浣嶇姸鎬佹槸鍚︽湭鍦ㄥ簱");
+ log.error("鏈煡璇㈠埌搴撲綅鍙凤細"+testMast.getLocNo()+" 璇锋鏌ュ簱浣嶅彿鎴栬�呮鏌ュ簱浣嶇姸鎬佹槸鍚︽湭鍦ㄥ簱");
+ return;
}
Date now = new Date();
- testMast.setStatus(1);
- testMast.setChannel(locMast.getChannel());
testMast.setModiTime(now);
testMast.setAppeTime(now);
// 鍚姩娴嬭瘯璇锋眰
ReturnT<String> result=startUpTestPACK1(testMast);
- if (!result.isSuccess()) {
+ if (Cools.isEmpty(result) || !result.isSuccess()) {
log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
- throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ return;
+ }
+ testMast.setStatus(3);
+
+ if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", testMast.getBarcode()))){
+ log.error("鏇存柊testMast澶辫触");
+ return;
}
- TestMast testMast1 = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("loc_no", testMast.getLocNo())
- .eq("barcode", testMast.getBarcode())
- .eq("user_id",testMast.getUserId())
- .eq("channel",locMast.getChannel().toString())
- .lt("status",4)
- );
- if (Cools.isEmpty(testMast1)){
- if (!testMastService.insert(testMast)){
- throw new CoolException("娣诲姞testMast澶辫触");
- }
- }else {
- if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
- .eq("loc_no", testMast.getLocNo())
- .eq("barcode", testMast.getBarcode())
- .eq("user_id",testMast.getUserId())
- .eq("channel",locMast.getChannel().toString())
- .lt("status",4))){
- throw new CoolException("鏇存柊testMast澶辫触");
- }
- }
-
- locMast.setPackStatus(1);
+ locMast.setPackStatus(2);
locMast.setModiTime(now);
-
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- postMesData(mesUrl,inpath,combParam);
-
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
- throw new CoolException("鐢宠娴嬭瘯澶辫触");
+ log.error("鐢宠娴嬭瘯澶辫触");
}
-// throw new CoolException("寮傚父锛侊紒锛佽瑙勮寖浣跨敤鎴栬仈绯荤鐞嗗憳");
+ //3.寮�濮嬫祴璇曚笂鎶�
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(testMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(0);
+ combParam.setStepSts(3);
+ combParam.setRequestTime(DateUtils.convert(now));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
@Override
@Transactional
- public void suspendTestPACK(String channel) {
+ public boolean suspendTestPACK(String channel) {
ReturnT<String> result=suspendTestPACK1(channel);
if (!result.isSuccess()) {
log.error("鏆傚仠娴嬭瘯澶辫触");
}
+ return result.isSuccess();
}
@Transactional
public ReturnT<String> startUpTestPACK1(TestMast testMast){
@@ -721,24 +702,26 @@
try {
Review review=new Review();
review.setLocNo(testMast.getLocNo());
- review.setUserId(testMast.getUserId());
review.setBarcode(testMast.getBarcode());
review.setChannel(testMast.getChannel().toString());
review.setRequestTime(DateUtils.convert(new Date()));
- if (testMast.getChannel()>=1 && testMast.getChannel()<=8){
+ if (testMast.getChannel()<1 || testMast.getChannel()>48){
+ log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
+ return null;
+ } else if (testMast.getChannel()<=8){
renUrl=renUrl1;
- }else if (testMast.getChannel()>=9 && testMast.getChannel()<=16){
+ }else if (testMast.getChannel()<=16){
renUrl=renUrl2;
- }else if (testMast.getChannel()>=17 && testMast.getChannel()<=24){
+ }else if (testMast.getChannel()<=24){
renUrl=renUrl3;
- }else if (testMast.getChannel()>=25 && testMast.getChannel()<=36){
+ }else if (testMast.getChannel()<=32){
renUrl=renUrl4;
- }else if (testMast.getChannel()>=37 && testMast.getChannel()<=40){
+ }else if (testMast.getChannel()<=40){
renUrl=renUrl5;
- }else if (testMast.getChannel()>=41 && testMast.getChannel()<=48){
+ }else if (testMast.getChannel()<=48){
renUrl=renUrl6;
}
- return postMesData(renUrl,startUpTestPACK,review);
+ return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,startUpTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -815,8 +798,10 @@
case "48":
renUrl=renUrl6;
break;
+ default:
+ log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
}
- return postMesData(renUrl,suspendTestPACK,review);
+ return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,suspendTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -825,70 +810,96 @@
}
}
- private ReturnT<String> postMesData(String URL,String Path,Object combParam){
- String name="";
- if (URL.equals(mesUrl)){
- name="mes绯荤粺";
- }else if (URL.equals(renUrl1)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl2)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl3)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl4)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl5)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl6)){
- name="娴嬭瘯绯荤粺";
- }
- if(combParam != null){
- String response = "";
- boolean success = false;
- try {
-// Map<String, Object> map = new HashMap<>();
-// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder()
-// .setHeaders(map)
- .setUri(URL)
- .setPath(Path)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
-// if (jsonObject.getDate("isComplete").equals(true)){
- success = true;
-// }else if (jsonObject.getDate("isComplete").equals(false)){
-// success = false;
-// }else {
-// log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+Path, JSON.toJSONString(combParam), response);
-// throw new CoolException("杩斿洖鍊煎嚭閿�");
-// }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+Path, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "涓婃姤"+name,
- URL +"/"+ Path,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
+ /*
+ * 娴嬭瘯搴撲俊鎭�
+ * */
+ @Override
+ @Transactional
+ public List<LocMast> packTestBasicInformation() {
+ List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
+ for (LocMast locMast:locMasts) {
+ LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
+ if(Cools.isEmpty(locDetl)){
+ locMast.setMk("鏃犱俊鎭�");
+ }else{
+ locMast.setMk(locDetl.getMatnr());
}
}
- return SUCCESS;
+ return locMasts;
+ }
+ /*
+ * 娴嬭瘯搴撲娇鐢ㄦ儏鍐�
+ * */
+ @Override
+ @Transactional
+ public List<PackUsageRate> packUsageRate() {
+ ArrayList<PackUsageRate> packUsageRates = new ArrayList<>();
+ for (int i = 0 ;i<5;i++){
+ PackUsageRate packUsageRate = new PackUsageRate();
+ packUsageRate.setTotal(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i)));
+ packUsageRate.setCurrentQuantity(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i).and().ne("loc_sts","O")));
+ packUsageRates.add(packUsageRate);
+ }
+ return packUsageRates;
+ }
+
+ @Data
+ public static class PackUsageRate{
+ private int total;
+ private int currentQuantity;
+ }
+
+ @Data
+ public static class PackUsageRate2{
+ private int total;
+ private int qualified;
+ private int unqualified;
+ private String week;
+ }
+ /*
+ * 娴嬭瘯搴撳悎鏍兼暟
+ * */
+ @Override
+ @Transactional
+ public List<PackUsageRate2> packQualified() {
+ Date now = new Date();
+ Date date7 = Utils.timeYesterday(now);
+ Date date14 = Utils.timeYesterday(date7);
+ ArrayList<PackUsageRate2> packUsageRates = new ArrayList<>();
+
+ PackUsageRate2 packUsageRate = new PackUsageRate2();
+ packUsageRate.setTotal(packQualifiedService.selectTotal(date7,now));
+ packUsageRate.setQualified(packQualifiedService.selectCurrentQuantity(true,date7,now));
+ packUsageRate.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date7,now));
+ packUsageRate.setWeek("鏈懆");
+ packUsageRates.add(packUsageRate);
+
+ PackUsageRate2 packUsageRate2 = new PackUsageRate2();
+ packUsageRate2.setTotal(packQualifiedService.selectTotal(date14,date7));
+ packUsageRate2.setQualified(packQualifiedService.selectCurrentQuantity(true,date14,date7));
+ packUsageRate2.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date14,date7));
+ packUsageRate2.setWeek("涓婂懆");
+ packUsageRates.add(packUsageRate2);
+
+ return packUsageRates;
+ }
+
+ /*
+ * 娴嬭瘯搴撳悎鏍兼暟
+ * */
+ @Override
+ @Transactional
+ public List<WorkChartAxis> chartAxisEvening() {
+ return reportQueryMapper.getChartAxisEvening();
+ }
+
+ /*
+ * 娴嬭瘯搴撳悎鏍兼暟
+ * */
+ @Override
+ @Transactional
+ public List<WorkChartAxis> chartAxisMorning() {
+ return reportQueryMapper.getChartAxisMorning();
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
--
Gitblit v1.9.1