From fef3b0760b7394847f143151e8bdce238290e1dc Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 18 八月 2022 12:36:32 +0800
Subject: [PATCH] Revert "#"
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 194 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 189 insertions(+), 5 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 e063e4d..f9bc14d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,14 +4,20 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
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.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.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
@@ -20,13 +26,14 @@
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -34,7 +41,7 @@
*/
@Slf4j
@Service
-public class MobileServiceImpl implements MobileService {
+public class MobileServiceImpl extends AbstractHandler<String> implements MobileService{
@Autowired
private MatService matService;
@@ -68,6 +75,25 @@
private StaDescService staDescService;
@Autowired
private CommonService commonService;
+ @Autowired
+ private NodeService nodeService;
+ @Autowired
+ private ManLocDetlService manLocDetlService;
+ @Autowired
+ private TestMastService testMastService;
+ @Autowired
+ private WorkService workService;
+
+ @Value("${mes.url}")
+ private String mesUrl;
+
+ @Value("${mes.startUpTestPACK}")
+ private String startUpTestPACK;
+
+ @Value("${mes.startUpTestPACK}")
+ private String suspendTestPACK;
+
+
@Override
@Transactional
@@ -80,6 +106,13 @@
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0) {
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ }
+
Date now = new Date();
// 鏃犲崟缁勬墭
@@ -172,6 +205,39 @@
orderService.updateSettle(order.getId(), 2L, userId);
}
+ }
+
+ @Override
+ public void onSale(CombParam param) {
+ // 鑾峰彇搴撲綅鍙�
+ String locno = param.getLocno();
+ Node node = nodeService.selectByUuid(locno);
+ if (Cools.isEmpty(node)) {
+ throw new CoolException(param.getLocno() + ":搴撲綅涓嶅瓨鍦�");
+ }
+
+ // 鑾峰彇鍟嗗搧鍒楄〃
+ for(CombParam.CombMat combMat : param.getCombMats()){
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ if (Cools.isEmpty(mat)){
+ throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
+ }
+ if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme()==0){
+ throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
+ }
+ if (Cools.isEmpty(combMat.getBatch())){
+ throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
+ }
+ ManLocDetl manLocDetl = new ManLocDetl();
+ manLocDetl.setLocNo(locno);
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setMatnr(combMat.getMatnr());
+ manLocDetl.setBatch(combMat.getBatch());
+ manLocDetl.setAnfme(combMat.getAnfme());
+ if (!manLocDetlService.insert(manLocDetl)) {
+ throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
+ }
+ }
}
@Override
@@ -546,4 +612,122 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ @Override
+ @Transactional
+ public void startUpTestPACK(TestMast testMast) {
+
+ //鍚姩娴嬭瘯璇锋眰
+// ReturnT<String> result=startUpTestPACK1(testMast);
+// if (!result.isSuccess()) {
+// log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+// throw new CoolException("娴嬭瘯鐢宠澶辫触");
+// }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+
+ Date now = new Date();
+ testMast.setStatus(1);
+ testMast.setModiTime(now);
+ testMast.setAppeTime(now);
+ if (!testMastService.insert(testMast)){
+ throw new CoolException("娣诲姞testMast澶辫触");
+ }
+ locMast.setPackStatus(1);
+ locMast.setModiTime(now);
+ if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
+ throw new CoolException("鐢宠娴嬭瘯澶辫触");
+ }
+ }
+ @Override
+ @Transactional
+ public void suspendTestPACK() {
+ ReturnT<String> result=suspendTestPACK1();
+ if (!result.isSuccess()) {
+ log.error("鏆傚仠娴嬭瘯澶辫触");
+ }
+ }
+ @Transactional
+ public ReturnT<String> startUpTestPACK1(TestMast testMast){
+ try {
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(testMast.getLocNo());
+ combParam.setPackName(testMast.getUserId());
+ combParam.setLocno(testMast.getBarcode());
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(startUpTestPACK,combParam);
+ }catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ }
+ @Transactional
+ public ReturnT<String> suspendTestPACK1(){
+ try {
+ Review review=new Review();
+ review.setPause(true);
+ review.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(suspendTestPACK,review);
+ }catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ }
+
+ private ReturnT<String> postMesData(String mesPath,Object combParam){
+ 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(mesUrl)
+ .setPath(mesPath)
+ .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锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+ throw new CoolException("杩斿洖鍊煎嚭閿�");
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, 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(
+ "鎴愬搧搴撳叆搴撲笂鎶�",
+ MesConstant.URL + MesConstant.PAKIN_URL,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(combParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
+ }
+ return SUCCESS;
+ }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
--
Gitblit v1.9.1