Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

数据结构修改

Browse Source
This commit is contained in:
lym
2024-04-28 16:59:39 +08:00
parent 79d271d7bb
commit ac43bf6832
5 changed files with 21 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+2 -41
View File
@@ -274,47 +274,8 @@ public class OrderController {
@GetMapping("getApiData")
@Operation(summary = "api数据获取")
@PreAuthorize("@ss.hasPermission('executor:order:getApiData')")
public CommonResult<JSONObject> test(@RequestParam(value = "orderNo", required = false, defaultValue = "20230809027818") String orderNo) {
// orderService.importApiData(orderNo);
// 获取token
JSONObject json = apiOrderService.getApiTokenMessage("CF7526AD51", "5f467b508061eff60bdacc7230357d2f");
// 判断获取token是否成功
if (json.getString("err_msg").equals("success")) {
System.out.println("获取token成功");
String token = json.getJSONObject("info").getString("access_token");
JSONObject jsonObject = new JSONObject();
jsonObject.put("order_no", orderNo);//生产单号需要传入赋值
jsonObject.put("format", "json");
JSONObject partsObject = new JSONObject();
partsObject.put("curr_page", 1);//生产单号需要传入赋值
partsObject.put("page_count", "100");
partsObject.put("order_no", orderNo);
// 数据解析
JSONObject data = apiOrderService.getApiOrderMessage(token, jsonObject);
JSONObject parts = apiOrderService.getApiOrderPartsMessage(token, partsObject);
// if (parts.getString("err_code").equals("0")) {
// System.out.println("获取数据成功");
// String value = parts.getString("value");
// System.out.println("value " + parts.getString("value") );
//// System.out.println("list " + toListMap(value));
//// 数据格式进行转换
// System.out.println("order " + value.substring(1, value.length() - 1));
// }
if (data.getString("err_code").equals("0")) {
System.out.println("获取数据成功");
String value = data.getString("value");
System.out.println("value " + data.getString("value") );
// System.out.println("list " + toListMap(value));
// 数据格式进行转换
System.out.println("order " + value.substring(1, value.length() - 1));
}else {
System.out.println("获取数据shibai");
}
}
return success(apiOrderService.getApiTokenMessage("CF7526AD51", "5f467b508061eff60bdacc7230357d2f"));
public CommonResult<Boolean> test(@RequestParam(value = "orderNo", required = false, defaultValue = "20230809027818") String orderNo) {
return success(orderService.importApiData(orderNo));
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+3 -4
View File
@@ -391,12 +391,11 @@ public class OrderServiceImpl implements OrderService {
throw exception(APP_TOKEN_ERROR);
}
String token = json.getJSONObject("info").getString("access_token");
// 获取生产信息
// 获取板件信息
JSONObject jsonPlates = new JSONObject();
jsonPlates.put("order_no", orderNo);//生产单号需要传入赋值
jsonPlates.put("format", "json");
JSONObject dataPlates = apiOrderService.getApiOrderMessage(token, jsonPlates);
System.out.println(dataPlates);
if (!dataPlates.getString("err_code").equals("0")) {
throw exception(PLATE_DATA_ERROR);
}
@@ -406,7 +405,7 @@ public class OrderServiceImpl implements OrderService {
jsonParts.put("page_count", PARTS_PAGE_MAX);
jsonParts.put("order_no", orderNo);
JSONObject parts = apiOrderService.getApiOrderPartsMessage(token, jsonParts);
if (!dataPlates.getString("err_code").equals("0")) {
if (!parts.getString("err_code").equals("0")) {
throw exception(PARTS_DATA_ERROR);
}
JSONObject dataParts = new JSONObject();
@@ -416,7 +415,7 @@ public class OrderServiceImpl implements OrderService {
mergeJSONObjects(dataParts, value);
}
// 转换
List<PlateDetail> plateDetails = (List<PlateDetail>) apiTypeChangeRealize.apiPlateDataChange(dataPlates,dataParts);
List<PlateDetail> plateDetails = (List<PlateDetail>) apiTypeChangeRealize.apiPlateDataChange(dataPlates.getJSONObject("value"),dataParts);
System.out.println(plateDetails);
return null;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PartsInfo.java
+5 -7
View File
@@ -35,21 +35,19 @@ public class PartsInfo {
private String factory; //商品生产厂商
private String brand; //商品品牌
private String model; //商品型号
private String spec; //商品规格
private String unit; //商品单位
private Double price; // 配件价格
private Boolean isComposite; // 是否为配件
private String groupName; // 组件名称
private String processGroup; // 五金加工组
private String objectType; // 五金类型
private String objectSpecExtras; // 五金额外规格
private String partsSpec; // 配件属性
private String doorRemark; // 门板组件铰链备注
private String hingeRemark; // 门板组件拉手备注
private Double goodsNumber; //产品数量为特殊处理，板件和配件都有数量
private String doorRemark; // 门板组件铰链备注
private String hingeRemark; // 门板组件拉手备注
private String remark;
private String specialRemark; // 特殊备注(Json字符串)
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PlateDetail.java
+6 -2
View File
@@ -33,6 +33,10 @@ public class PlateDetail {
private String roomsName; //房间名称
private String bodyName; //柜体名
private String bodyNo; // 柜体号
// 柜体 长 宽 深
private Double width;
private Double height;
private Double depth;
// 柜体成倍拆单的倍数
private Integer multiNum;
@@ -44,8 +48,8 @@ public class PlateDetail {
private List<Group> groupList;
// 成品长宽、面积
private Double width;
private Double length;
private Double plateWidth;
private Double plateLength;
private Double acreage;
// 开料长宽、面积
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeChangeRealize.java
+5 -108
View File
File diff suppressed because one or more lines are too long