From 68de8850d0c2fb4e5efef77ad92275ff05686708 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:03:12 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 238 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 140 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index ea153f8..9b0d1aa 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -5,6 +5,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
+import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.MesBuyPakinReportParam;
@@ -31,18 +33,25 @@
public class AgvWrkMastHandler extends AbstractHandler<String> {
//鍏ュ簱绫诲瀷鏁扮粍
- private static final List<Integer> IN_TYPE_LIST = new ArrayList<Integer>(){{
+ private static final List<Integer> IN_TYPE_LIST = new ArrayList<Integer>() {{
add(1);
}};
//private static final int[] IN_TYPE_ARRAY = {1};
//鍑哄簱绫诲瀷鏁扮粍
- private static final List<Integer> OUT_TYPE_List = new ArrayList<Integer>(){{
+ private static final List<Integer> OUT_TYPE_List = new ArrayList<Integer>() {{
// add(101);
}};
//private static final int[] OUT_TYPE_ARRAY = {101};
//绉诲簱绫诲瀷鏁扮粍
- private static final List<Integer> MOVE_TYPE_List = new ArrayList<Integer>(){{
- add(11);add(101); add(12); add(53); add(101); add(108); add(111); add(112);
+ private static final List<Integer> MOVE_TYPE_List = new ArrayList<Integer>() {{
+ add(11);
+ add(101);
+ add(12);
+ add(53);
+ add(101);
+ add(108);
+ add(111);
+ add(112);
}};
@@ -98,12 +107,21 @@
private DocTypeService docTypeService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private FlowLogService flowLogService;
@Transactional
public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
//鐢ㄤ簬涓婃姤mes鐨勫伐浣滄。鏄庣粏
List<AgvWrkDetl> agvWrkDetlListOld = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+ try {
+ long flowId = snowflakeIdWorker.nextId();
+ Date now = new Date();
try{
int wrkNo = agvWrkMast.getWrkNo();
String barcode = agvWrkMast.getBarcode();
@@ -130,29 +148,29 @@
agvWrkDetlLogService.save(wrkNo);
}
- switch (agvWrkMast.getIoType()){
+ switch (agvWrkMast.getIoType()) {
case 1:
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
//鏇存柊鐩爣搴撲綅鏄庣粏
log.info("鏇存柊鐩爣搴撲綅鏄庣粏 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo);
- agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(),wrkNo);
+ agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(), wrkNo);
//鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗�
boolean save = agvWaitPakinLogService.save(barcode);
//鍒犻櫎鍏ュ簱閫氱煡妗�
log.info("鍒犻櫎鍏ュ簱閫氱煡妗� supp_code: " + barcode);
- agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",barcode));
+ agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code", barcode));
break;
case 10:
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
break;
case 11:
case 12:
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
//鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
+ agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
//淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
break;
case 53:
//淇敼宸ヤ綔鍏氭槑缁�
@@ -162,16 +180,43 @@
AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
if (!Cools.isEmpty(agvLocDetl)) {
double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
+// OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode());
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(String.valueOf(agvWrkMast.getWrkNo()));
+// flowLog.setLocNo(agvWrkMast.getLocNo());
+// flowLog.setSpare1(agvWrkDetl.getSuppCode());
+// flowLog.setOpType(53L);
+// flowLog.setOrderNo(agvWrkDetl.getOrderNo());
+// flowLog.setThreeCode(agvWrkDetl.getThreeCode());
+// flowLog.setMatnr(agvWrkDetl.getMatnr());
+// flowLog.setMaktx(agvWrkDetl.getMaktx());
+//
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(updateAnfme);
+// flowLog.setQtyChanged(agvWrkDetl.getAnfme());
+//
+// flowLog.setLocPrevious(agvLocDetl.getAnfme());
+// flowLog.setLocCurrent(updateAnfme);
+// flowLog.setLocChanged(agvWrkDetl.getAnfme());
+//
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
agvLocDetlService.updateAnfme(updateAnfme,agvLocDetl.getLocNo(),agvLocDetl.getMatnr(),agvLocDetl.getBatch(),agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
}
//AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
});
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
break;
case 57:
- Date now = new Date();
// 鏇存柊搴撳瓨鏄庣粏
List<AgvWrkDetl> wrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
wrkDetlList.forEach(agvWrkDetl -> {
@@ -290,12 +335,12 @@
if(!isJSON(orderNo)){
//妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
- orderService.checkComplete(orderNo);
- }else{
+ orderService.checkComplete(orderNo, agvWrkMast.getPltType());
+ } else {
List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
maps.forEach(map -> {
String o = map.get("orderNo").toString();
- orderService.checkComplete(o);
+ orderService.checkComplete(o, agvWrkMast.getPltType());
});
}
@@ -306,10 +351,16 @@
// }
//return SUCCESS;
- }catch (Exception e){
- log.error(""+e.getMessage());
+ } catch (Exception e) {
+ log.error("" + e.getMessage());
}
- reportMes(agvWrkMast,agvWrkDetlListOld);
+ //TODO
+ //鏆傛椂鍔犱笂trycatch
+ try {
+ reportMes(agvWrkMast, agvWrkDetlListOld);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
return SUCCESS;
}
@@ -321,7 +372,7 @@
List<AgvWrkDetl> agvWrkDetlListOld = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
- try{
+ try {
Date now = new Date();
int wrkNo = agvWrkMast.getWrkNo();
@@ -362,6 +413,7 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(9527L);
wrkMast.setModiTime(now);
+ wrkMast.setPltType(agvWrkMast.getPltType());
wrkMast.setLogErrMemo("completedCarryWrk");
if (!agvWrkMastService.insertByIncrease(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -396,7 +448,7 @@
List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
maps.forEach(map -> {
String o = map.get("orderNo").toString();
- orderService.checkComplete(o);
+ orderService.checkComplete(o, agvWrkMast.getPltType());
});
}
@@ -406,19 +458,20 @@
// doHttpRequest(param,getMesTokenInfo(),"涓婃姤mes鍗曟嵁淇℃伅",url,orderReportPath,null,"127.0.0.1");
// }
- }catch (Exception e){
- log.error(""+e.getMessage());
+ } catch (Exception e) {
+ log.error("" + e.getMessage());
}
- reportMes(agvWrkMast,agvWrkDetlListOld);
+ reportMes(agvWrkMast, agvWrkDetlListOld);
return SUCCESS;
}
+
@Transactional
public ReturnT<String> completedCarryWrk2(AgvWrkMast agvWrkMast) {
//鐢ㄤ簬涓婃姤mes鐨勫伐浣滄。鏄庣粏
List<AgvWrkDetl> agvWrkDetlListOld = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
- try{
+ try {
int wrkNo = agvWrkMast.getWrkNo();
String orderNo = getOrderNoByWrkNo(wrkNo);
String agvBasDevp = "";
@@ -463,10 +516,11 @@
// }
// reportMes(agvWrkMast,agvWrkDetlListOld);
// return SUCCESS;
- }catch (Exception e){
- log.error(""+e.getMessage());
+ } catch (Exception e) {
+ log.error("" + e.getMessage());
}
- reportMes(agvWrkMast,agvWrkDetlListOld);
+ //TODO 寮犺秴
+ //reportMes(agvWrkMast, agvWrkDetlListOld);
return SUCCESS;
}
@@ -489,8 +543,9 @@
agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
}
return SUCCESS;
- }catch (Exception e){
- log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y"+e.getMessage());
+ } catch (Exception e) {
+ //TODO
+ //log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y" + e.getMessage());
}
return FAIL;
}
@@ -561,14 +616,14 @@
@Transactional
public ReturnT<String> autoEmptyOut(AgvBasDevp agvBasDevp) {
- agvWorkService.emptyPlateOut(agvBasDevp.getDevNo(),0,9527L);
+ agvWorkService.emptyPlateOut(agvBasDevp.getDevNo(), 0, 9527L);
return SUCCESS;
}
- private String getOrderNoByWrkNo(int wrkNo){
+ private String getOrderNoByWrkNo(int wrkNo) {
AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
- if(Cools.isEmpty(agvWrkDetl)){
+ if (Cools.isEmpty(agvWrkDetl)) {
return null;
}
return agvWrkDetl.getOrderNo();
@@ -639,26 +694,26 @@
return wrkMast;
}
- private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls){
- if(Cools.isEmpty(agvWrkDetls)){
- return ;
+ private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
+ if (Cools.isEmpty(agvWrkDetls)) {
+ return;
}
//鍖哄垎涓嶅悓浠诲姟绫诲瀷鐨勪笂鎶ユ柟寮�
- if(IN_TYPE_LIST.contains(agvWrkMast.getIoType())){
- reportMesPakinOrder(agvWrkMast,agvWrkDetls);
+ if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
+ reportMesPakinOrder(agvWrkMast, agvWrkDetls);
}
- if(OUT_TYPE_List.contains(agvWrkMast.getIoType())){
- reportMesPakoutOrder(agvWrkMast,agvWrkDetls);
+ if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
+ reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
}
- if(MOVE_TYPE_List.contains(agvWrkMast.getIoType())){
- generateMesParam(agvWrkMast,agvWrkDetls);
+ if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
+ generateMesParam(agvWrkMast, agvWrkDetls);
}
}
- private void reportMesPakinOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls){
+ private void reportMesPakinOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
- for (AgvWrkDetl agvWrkDetl : agvWrkDetls){
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
//鍒ゆ柇鏄惁閲囪喘鍏ュ簱
String orderNo = agvWrkDetl.getOrderNo();
@@ -666,7 +721,7 @@
DocType docType = docTypeService.selectById(order.getDocType());
- if (docType.getDocName().contains("閲囪喘")){
+ if (docType.getDocName().contains("閲囪喘")) {
OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(orderNo, agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
@@ -686,39 +741,39 @@
mesBuyPakinReportParam.setCode(orderNo);
mesBuyPakinReportParam.setIteam(iteams);
- doHttpRequest(mesBuyPakinReportParam,getMesTokenInfo(),"涓婃姤mes閲囪喘鍏ュ簱淇℃伅",url,buyPakinReportPath,null,"127.0.0.1");
+ doHttpRequest(mesBuyPakinReportParam, getMesTokenInfo(), "涓婃姤mes閲囪喘鍏ュ簱淇℃伅", url, buyPakinReportPath, null, "127.0.0.1");
- }else {
+ } else {
MesPakinReportParam mesPakinReportParam = new MesPakinReportParam();
mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
mesPakinReportParam.setBizType("0");
- mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(agvWrkDetl.getThreeCode().trim(),agvWrkDetl.getMatnr(),agvWrkMast.getLocNo()));
- mesPakinReportParam.setNoQrCodeExecAmount(new MesPakinReportParam.NoQrCodeExecAmount(agvWrkDetl.getAnfme(),agvWrkDetl.getUnit(),null));
+ mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(agvWrkDetl.getThreeCode().trim(), agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
+ mesPakinReportParam.setNoQrCodeExecAmount(new MesPakinReportParam.NoQrCodeExecAmount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null));
- doHttpRequest(mesPakinReportParam,getMesTokenInfo(),"涓婃姤mes鍏ュ簱淇℃伅",url,pakinReportPath,null,"127.0.0.1");
+ doHttpRequest(mesPakinReportParam, getMesTokenInfo(), "涓婃姤mes鍏ュ簱淇℃伅", url, pakinReportPath, null, "127.0.0.1");
}
}
}
- private void reportMesPakoutOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls){
- for (AgvWrkDetl agvWrkDetl : agvWrkDetls){
+ private void reportMesPakoutOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
MesPakoutReportParam mesPakoutReportParam = new MesPakoutReportParam();
mesPakoutReportParam.setStorageCode(agvWrkMast.getLocNo());
AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
mesPakoutReportParam.setWareHouseCode(agvLocMast.getPltType().toString());
mesPakoutReportParam.setMaterialCode(agvWrkDetl.getMatnr());
mesPakoutReportParam.setBatchNos(Arrays.asList(agvWrkDetl.getThreeCode().trim()));
- mesPakoutReportParam.setAmount(new MesPakoutReportParam.Amount(agvWrkDetl.getAnfme(),agvWrkDetl.getUnit(),null));
+ mesPakoutReportParam.setAmount(new MesPakoutReportParam.Amount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null));
- doHttpRequest(mesPakoutReportParam,getMesTokenInfo(),"涓婃姤mes鍑哄簱淇℃伅",url,pakoutReportPath,null,"127.0.0.1");
+ doHttpRequest(mesPakoutReportParam, getMesTokenInfo(), "涓婃姤mes鍑哄簱淇℃伅", url, pakoutReportPath, null, "127.0.0.1");
}
}
- private void generateMesParam(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls){
+ private void generateMesParam(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
- if(agvWrkMast.getIoType() == 53){
+ if (agvWrkMast.getIoType() == 53) {
String locNo = agvWrkMast.getLocNo();
agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo());
agvWrkMast.setSourceLocNo(locNo);
@@ -738,9 +793,9 @@
MesOrderReportParam.TransferOrderItem transferOrderItem = new MesOrderReportParam.TransferOrderItem();
transferOrderItem.setRemark(agvWrkDetls.get(0).getOrderNo());
//璋冩嫧
- if(agvWrkMast.getLocNo().contains("YZ")){
+ if (agvWrkMast.getLocNo().contains("YZ")) {
transferOrderItem.setTargetLocationCode(agvWrkMast.getLocNo());
- }else {
+ } else {
//鍑哄簱榛樿浠撲綅
String floor = agvWrkMast.getLocNo().split("F")[1];
transferOrderItem.setTargetLocationCode(getTargetLocationByFloor(floor));
@@ -750,10 +805,10 @@
param.setTransferOrderItems(transferOrderItems);
- for (AgvWrkDetl agvWrkDetl : agvWrkDetls){
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
MesOrderReportParam.TransferOrderItem.InventoryDetail inventoryDetail = new MesOrderReportParam.TransferOrderItem.InventoryDetail();
//娣诲姞amount灞炴��
- MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount amount = new MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount(agvWrkDetl.getAnfme(),agvWrkDetl.getUnit(),null);
+ MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount amount = new MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null);
inventoryDetail.setAmount(amount);
//娣诲姞bizKey灞炴��
MesOrderReportParam.TransferOrderItem.InventoryDetail.BizKey bizKey = new MesOrderReportParam.TransferOrderItem.InventoryDetail.BizKey(Cools.isEmpty(agvWrkDetl.getBatch()) ? "" : agvWrkDetl.getBatch().trim());
@@ -765,65 +820,60 @@
inventoryDetail.setStorageStatus(1);
inventoryDetails.add(inventoryDetail);
//娣诲姞閿�鍞鍗曞彿
- MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customField = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField("workOrderCode__c",agvWrkDetl.getThreeCode().trim());
+ MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customField = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField("workOrderCode__c", agvWrkDetl.getThreeCode().trim());
customFields.add(customField);
}
- doHttpRequest(param,getMesTokenInfo(),"涓婃姤mes璋冩嫧淇℃伅",url,orderReportPath,null,"127.0.0.1");
+ doHttpRequest(param, getMesTokenInfo(), "涓婃姤mes璋冩嫧淇℃伅", url, orderReportPath, null, "127.0.0.1");
}
//鑾峰彇mes token淇℃伅
- private Map<String,Object> getMesTokenInfo(){
- Map<String,String> param = new HashMap<>();
- param.put("appKey",appKey);
- param.put("appSecret",appSecret);
+ private Map<String, Object> getMesTokenInfo() {
+ Map<String, String> param = new HashMap<>();
+ param.put("appKey", appKey);
+ param.put("appSecret", appSecret);
- JSONObject jsonObject = doHttpRequest(param,null, "鑾峰彇MesToken", getTokenUrl, getTokenPath, null, "127.0.0.1");
+ JSONObject jsonObject = doHttpRequest(param, null, "鑾峰彇MesToken", getTokenUrl, getTokenPath, null, "127.0.0.1");
- Map<String,Object> headParam = new HashMap<>();
- headParam.put("X-AUTH",JSON.parseObject(jsonObject.get("data").toString()).get("appAccessToken").toString());
+ Map<String, Object> headParam = new HashMap<>();
+ headParam.put("X-AUTH", JSON.parseObject(jsonObject.get("data").toString()).get("appAccessToken").toString());
return headParam;
}
//鏍规嵁妤煎眰榛樿鍑哄簱浠撲綅
- private String getTargetLocationByFloor(String f){
+ private String getTargetLocationByFloor(String f) {
int floor = Integer.parseInt(f);
- if(floor == 1){
+ if (floor == 1) {
return "WH-000";
}
- if(floor == 2){
+ if (floor == 2) {
return "WH-000";
}
- if(floor == 3){
+ if (floor == 3) {
return "WH-000";
}
return null;
}
- private JSONObject doHttpRequest(Object requestParam,Map<String,Object> headParam, String namespace, String url, String path, String appkey, String ip){
+ private JSONObject doHttpRequest(Object requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
String response = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
- .setUri(url)
- .setPath(path)
- .setHeaders(headParam)
- .setJson(JSONObject.toJSONString(requestParam))
- .setHttps(true)
- .build()
- .doPost();
+ response = new HttpHandler.Builder().setUri(url).setPath(path).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200){
- throw new CoolException(jsonObject.get("dsc").toString());
+ if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
+ log.info("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細" + jsonObject);
+ //TODO 寮犺秴
+ //throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
}
success = true;
return jsonObject;
@@ -836,19 +886,11 @@
// }
// success = true;
- }catch (Exception e){
+ } catch (Exception e) {
log.error(e.getMessage());
throw new CoolException(e.getMessage());
- }finally {
- apiLogService.save(
- namespace,
- url + path,
- appkey,
- ip,
- JSON.toJSONString(JSONObject.toJSONString(requestParam)),
- response,
- success
- );
+ } finally {
+ apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
}
}
--
Gitblit v1.9.1