violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:客户同步同步下单平台接口增加业务主体

Browse Source
This commit is contained in:
zzs 2025-01-21 11:46:32 +08:00
parent c6fce96a94
commit b8f95ad456
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/yem/or/api/AssepcDynamic.java
View File

@ -112,14 +112,14 @@ public class AssepcDynamic {
* @throws IOException * @throws IOException
*/ */
@ApiPostMapping("/assepcdynamic/qurtbillno") @ApiPostMapping("/assepcdynamic/qurtbillno")
public CustomApiResult<Object> qurtbillno(@NotNull @ApiParam("客户编码") String number) throws IOException { public CustomApiResult<Object> qurtbillno(@NotNull @ApiParam("客户.业务主体.下单平台ID") String number) throws IOException {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
try { try {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
QFilter qFilter = new QFilter("createorg.number", QCP.equals, "110"); QFilter qFilter = new QFilter("createorg.number", QCP.equals, "110");
qFilter.and("status", QCP.equals, "C"); qFilter.and("status", QCP.equals, "C");
if (!StringUtils.containsIgnoreCase(number, "admin")) { if (!StringUtils.containsIgnoreCase(number, "admin")) {
qFilter.and("yem_customer.number", QCP.equals, number); qFilter.and("yem_customer.yem_groupcustomers.number", QCP.equals, number);
} }
// qFilter.and("yem_billtype.number", QCP.equals, "yem_es_salesorder_ZJ"); // qFilter.and("yem_billtype.number", QCP.equals, "yem_es_salesorder_ZJ");
String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles", false); String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles", false);
@ -170,7 +170,7 @@ public class AssepcDynamic {
public CustomApiResult<Object> modelquery( public CustomApiResult<Object> modelquery(
@NotNull @ApiParam("订单号(number)、产品机型(number)") String number, @NotNull @ApiParam("订单号(number)、产品机型(number)") String number,
@NotNull @ApiParam("searchap3（订单号）,searchap4（产品机型）") String searchap, @NotNull @ApiParam("searchap3（订单号）,searchap4（产品机型）") String searchap,
@ApiParam("客户编码，查询产品机型必传") String custom) throws IOException { @ApiParam("客户.业务主体.下单平台ID，查询产品机型必传") String custom) throws IOException {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
try { try {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
@ -186,7 +186,7 @@ public class AssepcDynamic {
qFilters.add(new QFilter("yem_model.yem_products.number", QCP.equals, number)); qFilters.add(new QFilter("yem_model.yem_products.number", QCP.equals, number));
if (YEM.isNotEmpty(custom)) { if (YEM.isNotEmpty(custom)) {
if ((!StringUtils.containsIgnoreCase(custom, "admin"))) { if ((!StringUtils.containsIgnoreCase(custom, "admin"))) {
qFilters.add(new QFilter("yem_customer.number", QCP.equals, custom)); qFilters.add(new QFilter("yem_customer.yem_groupcustomers.number", QCP.equals, custom));
} }
} else { } else {
return CustomApiResult.fail("501", "客户编码为空！"); return CustomApiResult.fail("501", "客户编码为空！");
@ -447,11 +447,11 @@ public class AssepcDynamic {
} }
@ApiPostMapping("/assepcdynamic/electronic_group") @ApiPostMapping("/assepcdynamic/electronic_group")
public CustomApiResult<Object> queryElectronicGroup(@NotNull @ApiParam("客户.编码(116021200012)") String number) { public CustomApiResult<Object> queryElectronicGroup(@NotNull @ApiParam("客户.业务主体.下单平台ID") String number) {
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
QFilter qFilter = new QFilter("status", QCP.equals, "C"); QFilter qFilter = new QFilter("status", QCP.equals, "C");
if (!StringUtils.containsIgnoreCase(number, "admin")) { if (!StringUtils.containsIgnoreCase(number, "admin")) {
qFilter.and(new QFilter("yem_customer.number", QCP.equals, number)); qFilter.and(new QFilter("yem_customer.yem_groupcustomers.number", QCP.equals, number));
} }
String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles"); String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles");
DynamicObjectCollection load = ORM.create().query("yem_em_devicefiles", selectfields + ",id", qFilter.toArray()); DynamicObjectCollection load = ORM.create().query("yem_em_devicefiles", selectfields + ",id", qFilter.toArray());
@ -517,6 +517,8 @@ public class AssepcDynamic {
map.put("warrantyenddate", ""); map.put("warrantyenddate", "");
} }
map.put("yem_saledate", dynamicObject.getString("yem_saledate"));
result.add(map); result.add(map);
} }
@ -668,11 +670,11 @@ public class AssepcDynamic {
* @return * @return
*/ */
@ApiPostMapping("/assepcdynamic/queassequipment") @ApiPostMapping("/assepcdynamic/queassequipment")
public CustomApiResult<Object> queryBayedResourceNo(@NotBlank @ApiParam(value = "客户编码", example = "116021200012") String customerNo) { public CustomApiResult<Object> queryBayedResourceNo(@NotBlank @ApiParam(value = "客户.业务主体.下单平台ID") String customerNo) {
String algoKey = this.getClass().getName(); String algoKey = this.getClass().getName();
QFilter qFilter = new QFilter("status", "=", "C"); QFilter qFilter = new QFilter("status", "=", "C");
if (!StringUtils.containsIgnoreCase(customerNo, "admin")) { if (!StringUtils.containsIgnoreCase(customerNo, "admin")) {
qFilter.and("yem_customer.number", "=", customerNo); qFilter.and("yem_customer.yem_groupcustomers.number", "=", customerNo);
} }
qFilter.and("yem_model", "is not null", null); qFilter.and("yem_model", "is not null", null);
ArrayList<String> list = Lists.newArrayList(); ArrayList<String> list = Lists.newArrayList();
@ -680,6 +682,7 @@ public class AssepcDynamic {
list.add("yem_customer"); list.add("yem_customer");
list.add("number"); list.add("number");
DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_em_devicefiles", String.join(",", list), qFilter.toArray()); DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_em_devicefiles", String.join(",", list), qFilter.toArray());
HashSet<String> set = Sets.newHashSet(); HashSet<String> set = Sets.newHashSet();
DynamicObjectCollection collection = ORM.create().toPlainDynamicObjectCollection(dataSet); DynamicObjectCollection collection = ORM.create().toPlainDynamicObjectCollection(dataSet);
Set<Long> ids = new HashSet<>(); Set<Long> ids = new HashSet<>();
@ -802,11 +805,11 @@ public class AssepcDynamic {
} }
@ApiPostMapping("bayed_product_model") @ApiPostMapping("bayed_product_model")
public CustomApiResult<Object> queryProductModel(@NotBlank @ApiParam(value = "客户编码", example = "116021200012") String customerNo) { public CustomApiResult<Object> queryProductModel(@NotBlank @ApiParam(value = "客户.业务主体.下单平台ID") String customerNo) {
String algoKey = this.getClass().getName(); String algoKey = this.getClass().getName();
QFilter qFilter = new QFilter("status", "=", "C"); QFilter qFilter = new QFilter("status", "=", "C");
if (!StringUtils.containsIgnoreCase(customerNo, "admin")) { if (!StringUtils.containsIgnoreCase(customerNo, "admin")) {
qFilter.and("yem_customer.number", "=", customerNo); qFilter.and("yem_customer.yem_groupcustomers.number", "=", customerNo);
} }
qFilter.and("group", "is not null", null); qFilter.and("group", "is not null", null);
ArrayList<String> list = Lists.newArrayList(); ArrayList<String> list = Lists.newArrayList();