|
@@ -2,15 +2,14 @@ package com.steerinfo.dil.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
-import com.steerinfo.dil.mapper.RulesMapper;
|
|
|
|
-import com.steerinfo.dil.mapper.TmstruckMeasureCommissionMapper;
|
|
|
|
-import com.steerinfo.dil.mapper.TmstruckTareReturnResultMapper;
|
|
|
|
-import com.steerinfo.dil.mapper.UtilsMapper;
|
|
|
|
|
|
+import com.steerinfo.dil.mapper.*;
|
|
|
|
+import com.steerinfo.dil.model.MeasureJsonData;
|
|
import com.steerinfo.dil.model.TmstruckMeasureCommission;
|
|
import com.steerinfo.dil.model.TmstruckMeasureCommission;
|
|
import com.steerinfo.dil.model.TmstruckTareReturnResult;
|
|
import com.steerinfo.dil.model.TmstruckTareReturnResult;
|
|
import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
|
|
import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
import com.steerinfo.dil.util.HTTPRequestUtils;
|
|
import com.steerinfo.dil.util.HTTPRequestUtils;
|
|
|
|
+import com.steerinfo.dil.util.getRequestUtils;
|
|
import io.swagger.models.auth.In;
|
|
import io.swagger.models.auth.In;
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -50,11 +49,16 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
@Autowired
|
|
@Autowired
|
|
private RulesServiceImpl rulesService;
|
|
private RulesServiceImpl rulesService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private MeasureJsonDataMapper measureJsonDataMapper;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private TmstruckTareReturnResultMapper tmstruckTareReturnResultMapper;
|
|
private TmstruckTareReturnResultMapper tmstruckTareReturnResultMapper;
|
|
|
|
|
|
private static final String daGangUrl = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
|
|
private static final String daGangUrl = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
|
|
|
|
|
|
|
|
+ private static final String dagangUrlForLoad = "http://172.16.33.122:44325/api/logistics/modifyLoadPlace";
|
|
|
|
+
|
|
private static final String liuPiUrl = "http://172.16.33.122:44325/api/logistics/updateTareWeight";
|
|
private static final String liuPiUrl = "http://172.16.33.122:44325/api/logistics/updateTareWeight";
|
|
|
|
|
|
private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
|
|
private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
|
|
@@ -92,132 +96,25 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
|
|
|
//添加装货点发送委托给计量
|
|
//添加装货点发送委托给计量
|
|
@Override
|
|
@Override
|
|
- public int addMeasureCommissionForLoding(Map<String, Object> map){
|
|
|
|
- Map<String, Object> measureCommission = null;
|
|
|
|
- //查询计量委托
|
|
|
|
- int orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
|
|
|
|
- String warehouseName =(String) map.get("warehouseName");
|
|
|
|
- switch (orderType){
|
|
|
|
- case 1:
|
|
|
|
- break;
|
|
|
|
- case 2:
|
|
|
|
- measureCommission=tmstruckMeasureCommissionMapper.selectXsMeasuresion(map);
|
|
|
|
- if(measureCommission == null){
|
|
|
|
- return 0;
|
|
|
|
- }
|
|
|
|
- measureCommission.put("isRelationEAS",true);
|
|
|
|
- measureCommission.put("flowTo","出厂");
|
|
|
|
- measureCommission.put("isDel", false);
|
|
|
|
- measureCommission.put("isInsert", true);
|
|
|
|
- measureCommission.put("IsAssembly", false);
|
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
|
- measureCommission.put("packagesNum", 0);
|
|
|
|
- measureCommission.put("loadPlace",warehouseName);
|
|
|
|
- if(map.get("isDG") != null){
|
|
|
|
- measureCommission.put("factory", "dg");
|
|
|
|
- }
|
|
|
|
- break;
|
|
|
|
- case 5:
|
|
|
|
- case 6:
|
|
|
|
- case 8:
|
|
|
|
- case 17:
|
|
|
|
- measureCommission = tmstruckMeasureCommissionMapper.purchaseMeasure(map);
|
|
|
|
- if(measureCommission == null){
|
|
|
|
- return 0;
|
|
|
|
- }
|
|
|
|
- measureCommission.put("isRelationEAS", true);
|
|
|
|
- measureCommission.put("flowTo", "进厂");
|
|
|
|
- measureCommission.put("isDel", false);
|
|
|
|
- measureCommission.put("isInsert", true);
|
|
|
|
- measureCommission.put("IsAssembly", false);
|
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
|
- measureCommission.put("packagesNum", 0);
|
|
|
|
- measureCommission.put("loadPlace",warehouseName);
|
|
|
|
- break;
|
|
|
|
- case 11:
|
|
|
|
- //纯内转发送计量委托
|
|
|
|
- measureCommission = tmstruckMeasureCommissionMapper.purchaseNzMeasure(map);
|
|
|
|
- if(measureCommission == null){
|
|
|
|
- return 0;
|
|
|
|
- }
|
|
|
|
- if(map.get("deletedCommission") != null){
|
|
|
|
- measureCommission.put("isDel", true);
|
|
|
|
- measureCommission.put("isInsert", false);
|
|
|
|
- }else {
|
|
|
|
- measureCommission.put("isDel", false);
|
|
|
|
- measureCommission.put("isInsert", true);
|
|
|
|
- }
|
|
|
|
- measureCommission.put("isRelationEAS", false);
|
|
|
|
- measureCommission.put("flowTo", "中转");
|
|
|
|
- measureCommission.put("IsAssembly", false);
|
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
|
- measureCommission.put("packagesNum", 0);
|
|
|
|
- measureCommission.put("loadPlace",warehouseName);
|
|
|
|
- System.out.println(measureCommission);
|
|
|
|
- break;
|
|
|
|
- case 12:
|
|
|
|
- case 13: //零星进厂、出厂
|
|
|
|
- case 14:
|
|
|
|
- case 19:
|
|
|
|
- measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
|
|
|
|
- if(measureCommission == null){
|
|
|
|
- return 0;
|
|
|
|
- }
|
|
|
|
- measureCommission.put("steelyardNum", "null");
|
|
|
|
- measureCommission.put("demo", "无");
|
|
|
|
- measureCommission.put("isRelationEAS",false);
|
|
|
|
- if(orderType == 12){
|
|
|
|
- measureCommission.put("flowTo","进厂");
|
|
|
|
-
|
|
|
|
- }else if(orderType == 13){
|
|
|
|
- measureCommission.put("flowTo","出厂");
|
|
|
|
-
|
|
|
|
- }else if(orderType == 14){
|
|
|
|
- //查询还有几次未计量实绩
|
|
|
|
- BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
|
|
|
|
- Integer count = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(resultTotalId);
|
|
|
|
- if(count > 1){ //第一次进厂
|
|
|
|
- measureCommission.put("materiaName", measureCommission.get("materiaName") + "(出)");
|
|
|
|
- }else { //第二次进厂
|
|
|
|
- measureCommission.put("materiaName", measureCommission.get("materiaName") + "(入)");
|
|
|
|
- }
|
|
|
|
- measureCommission.put("flowTo","中转");
|
|
|
|
- }else{
|
|
|
|
- measureCommission.put("flowTo","退货");
|
|
|
|
- }
|
|
|
|
- measureCommission.put("isDel", false);
|
|
|
|
- measureCommission.put("isInsert", true);
|
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
|
- measureCommission.put("packagesNum", 0);
|
|
|
|
- measureCommission.put("loadPlace",warehouseName);
|
|
|
|
- break;
|
|
|
|
- case 20://采购内转委托总厂区
|
|
|
|
- case 15:
|
|
|
|
- case 16:
|
|
|
|
- measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
|
|
|
|
- if(measureCommission == null){
|
|
|
|
- return 0;
|
|
|
|
- }
|
|
|
|
- if(orderType == 16){
|
|
|
|
- measureCommission.put("factory","dg");
|
|
|
|
- }
|
|
|
|
- measureCommission.put("isRelationEAS",false);
|
|
|
|
- measureCommission.put("flowTo","进厂");
|
|
|
|
- measureCommission.put("isDel",false);
|
|
|
|
- measureCommission.put("isInsert",true);
|
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
|
- measureCommission.put("packagesNum", 0);
|
|
|
|
- measureCommission.put("loadPlace",warehouseName);
|
|
|
|
- }
|
|
|
|
- if(measureCommission != null){
|
|
|
|
- map.put("materialId", measureCommission.get("materialId"));
|
|
|
|
- }
|
|
|
|
- addMeasureCommission(map); // 添加计量委托
|
|
|
|
- /*访问接口发送数据*/
|
|
|
|
- System.out.println(measureCommission);
|
|
|
|
- return sendMesToMeasure(measureCommission);
|
|
|
|
|
|
+ public int addMeasureCommissionForLoding(Map<String, Object> map) throws Exception {
|
|
|
|
+ String loadingPace = (String) map.get("warehouseName");
|
|
|
|
+ String url = "http://172.16.33.122:44325/api/logistics/modifyLoadPlace";
|
|
|
|
+ String ysdd = (String) map.get("orderNumber");
|
|
|
|
+ String sendUrl = url + "?ysdd=" + ysdd + "&loadingPace=" + loadingPace;
|
|
|
|
+ String jsonData = getRequestUtils.doGet(sendUrl);
|
|
|
|
+ System.out.println("委托已发送" +jsonData);
|
|
|
|
+ MeasureJsonData measureJsonData=new MeasureJsonData();
|
|
|
|
+ BigDecimal measureId = measureJsonDataMapper.selectMaxId();
|
|
|
|
+ //设置主键id
|
|
|
|
+ measureJsonData.setMeasureId(measureId);
|
|
|
|
+ //老厂区报文
|
|
|
|
+ measureJsonData.setMeasureTypeId(new BigDecimal(1));
|
|
|
|
+ measureJsonData.setMeasureJsonData(jsonData);
|
|
|
|
+ int i = measureJsonDataMapper.insertSelective(measureJsonData);
|
|
|
|
+ return i;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询计量委托 0 :计皮 1:计毛
|
|
* 查询计量委托 0 :计皮 1:计毛
|
|
* @param map orderTypee 订单类型 type 是计皮还是计毛
|
|
* @param map orderTypee 订单类型 type 是计皮还是计毛
|
|
@@ -666,6 +563,42 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+// /**
|
|
|
|
+// *
|
|
|
|
+// * 访问老厂区计量接口方法
|
|
|
|
+// * @param ysdd
|
|
|
|
+// * @param loadingPace
|
|
|
|
+// * @return
|
|
|
|
+// */
|
|
|
|
+// public int sendUpdateLoadPlaceMeasure(String ysdd,String loadingPace){
|
|
|
|
+//// List<Map<String, Object>> sendMap = new ArrayList<>();
|
|
|
|
+//// sendMap.add(map);
|
|
|
|
+//// JSONObject jsonObject = new JSONObject();
|
|
|
|
+//// jsonObject.put("data", sendMap);
|
|
|
|
+// String jsonData = null;
|
|
|
|
+// try {
|
|
|
|
+//// jsonData = HTTPRequestUtils.send(dagangUrlForLoad, jsonObject, "utf-8");
|
|
|
|
+//
|
|
|
|
+// } catch (IOException e) {
|
|
|
|
+// e.printStackTrace();
|
|
|
|
+// }
|
|
|
|
+// if(!"null".equals(jsonData)){
|
|
|
|
+// System.out.println(jsonData);
|
|
|
|
+// HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
|
|
|
|
+// boolean success = (boolean) hashMap.get("success");
|
|
|
|
+// System.out.println(hashMap.get("msg"));
|
|
|
|
+// if(success){
|
|
|
|
+// return 1;
|
|
|
|
+// }
|
|
|
|
+// }else{
|
|
|
|
+// System.out.println("委托发送失败:" + jsonData);
|
|
|
|
+// }
|
|
|
|
+// return 0;
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 访问新厂区达兴能源计量接口方法
|
|
* 访问新厂区达兴能源计量接口方法
|
|
* @param map
|
|
* @param map
|