diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java index 8dd67cf3..65e2266c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java @@ -9,8 +9,9 @@ public class ConstantStatus { public static final Integer ORDER_STATUS_SUCCESS = 4; //已校验 //ERP校验状态 - public static final Integer ORDER_CHECK_SUCCESS = 1; //校验成功 - public static final Integer ORDER_CHECK_FAIL = 0; //校验失败 + public static final Integer ORDER_CHECK_SUCCESS = 2; //校验成功 + public static final Integer ORDER_CHECK_FAIL = 1; //校验失败 + public static final Integer ORDER_CHECK_UN = 0; //校验失败 //ERP订单上传状态 public static final Integer ORDER_EXPORT_UN = 0; //未导出 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java index 4c2bb64e..34d487ac 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java @@ -8,6 +8,7 @@ import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.info.SystemParamConfigResponse; import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.thread.IoModifyErpTask; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -53,6 +54,7 @@ public class SystemParamConfigController { return ResultVOUtils.success(pageSimpleResponse); } + //key搜索 @GetMapping("/udiwms/sys/config/selectByKey") public BaseResponse selectByKey(@Valid SystemParamConfigRequest systemParamConfigRequest, BindingResult bindingResult) { @@ -64,6 +66,7 @@ public class SystemParamConfigController { return ResultVOUtils.success(systemParamConfigEntity); } + @AuthRuleAnnotation("system/param/config/save") @PostMapping("/system/param/config/save") public BaseResponse save(@RequestBody @Valid SystemParamConfigSaveRequest systemParamConfigSaveRequest, @@ -99,6 +102,9 @@ public class SystemParamConfigController { } systemParamConfigService.updateParentId(systemParamConfigSaveRequest1); } + + //toDo //各种设置所需执行操作 + return ResultVOUtils.success("修改成功"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 4c004f40..2cb1ece2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -202,7 +202,7 @@ public class OrderController { } mainOrderEntity.setErpFk(docidStr); orderService.updateOrder(mainOrderEntity); - List erpOrderEntities = new ErpOrderClient(ucloudUrl).getErpOrder(docids); + List erpOrderEntities = new ErpOrderClient(ucloudUrl).getErpOrder(docids, mainOrderEntity.getAction()); if (erpOrderEntities != null && erpOrderEntities.size() > 0) { List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder); myErpOrderService.insertErpOrders(returnOrders); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index 71841088..c4d57fd3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -82,8 +82,8 @@ public class OrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (filterErpOrderRequest.getDocid() == null || filterErpOrderRequest.getDocid().equals("")) { - filterErpOrderRequest.setDocid("null"); + if (filterErpOrderRequest.getErpOrderId() == null || filterErpOrderRequest.getErpOrderId().equals("")) { + filterErpOrderRequest.setErpOrderId("null"); } List erpInfoEntityList = myErpOrderService.filterMyErpDetailOrder(filterErpOrderRequest); PageInfo pageInfo; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java index 6f50d99f..e55e333e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java @@ -86,7 +86,7 @@ public class ContrastErpUtil { orderFilterRequest.setId(orderIdFk); OrderEntity orderEntity = orderService.findOne(orderFilterRequest); ErpOrderEntity vailExitMsg = vailErpExit(myErpOrderService, mErpOrderEntities, orderIdFk); - SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey("forbidSameErp"); + SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey("erp_forbidSameErp"); if (vailExitMsg != null && systemParamConfigEntity!=null && systemParamConfigEntity.getParamValue().equals("1")) { errMsg = "所选ERP单" + vailExitMsg.getErpOrderId() + "已被其他出入库单" + vailExitMsg.getOrderIdFk() + "绑定！"; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java index 2b5bb67f..56938713 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java @@ -84,21 +84,21 @@ public class InoutUtils { public String nullVail(WarehouseEntity warehousetemp, SystemParamConfigService configService) { if (warehousetemp.getAction().equals(ConstantType.TYPE_PUT_RETURN)) { - SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("isReturnWareHouseIn"); + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isReturnWareHouseIn"); if (systemParamConfigEntity==null || "0".equals(systemParamConfigEntity.getParamValue())) { return null; } else { return warehousetemp.getCode() + "不允许未销售出库可以退货入库"; } } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_RETURN)) { - SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("isReturnWareHouseOut"); + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isReturnWareHouseOut"); if (systemParamConfigEntity==null || "0".equals(systemParamConfigEntity.getParamValue())) { return null; } else { return warehousetemp.getCode() + "不允许零库存退货出库"; } } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_SALE)) { - SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("isSalesWareHouseOut"); + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isSalesWareHouseOut"); if (systemParamConfigEntity==null || "0".equals(systemParamConfigEntity.getParamValue())) { return null; } else { diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java index 542dd5c8..b5f18789 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java @@ -14,7 +14,7 @@ public interface CodesDao { boolean insertWarehouse(WarehouseEntity warehouseEntity); - boolean insertWarehouses(@Param("warehouseEntities") List warehouseEntities); + boolean insertWarehouses(@Param("io_codesEntities") List warehouseEntities); List findByNo(WarehouseQueryRequest warehouseQueryRequest); @@ -30,7 +30,7 @@ public interface CodesDao { boolean updateOrderId(@Param("oldOrderId") String oldOrderId, @Param("newOrderId") String newOrderId); - boolean updateUnit(@Param("orderId") String orderId, @Param("fromCorpID") String fromCorpID, @Param("fromCorp") String fromCorp); + boolean updateUnit(@Param("orderId") String orderId, @Param("fromCorpId") String fromCorpId, @Param("fromCorp") String fromCorp); List findCodesById(@Param("orderId") String orderId); diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java index c9699050..7309ed58 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java @@ -8,7 +8,7 @@ import java.util.List; @Data public class FilterErpOrderRequest extends ListPageRequest { - private String docid; + private String erpOrderId; private String goodsname; private String companyname; private String orderId; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java index 928e6a5c..5b42085f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java @@ -14,11 +14,11 @@ public class OrderEntity { private String mainAction; private String fromCorp; private Integer status; - private String exportStatus; + private Integer exportStatus; private String fromType; private Integer contrastStatus; private String erpFk; - private String signStatus; + private Integer signStatus; private String stockCheckFk; private String remark; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehousetempExample.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehousetempExample.java deleted file mode 100644 index 529a29cc..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehousetempExample.java +++ /dev/null @@ -1,1429 +0,0 @@ -package com.glxp.api.admin.entity.inout; - -import java.util.ArrayList; -import java.util.List; - -public class WarehousetempExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public WarehousetempExample() { - oredCriteria = new ArrayList<>(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList<>(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andActionIsNull() { - addCriterion("action is null"); - return (Criteria) this; - } - - public Criteria andActionIsNotNull() { - addCriterion("action is not null"); - return (Criteria) this; - } - - public Criteria andActionEqualTo(String value) { - addCriterion("action =", value, "action"); - return (Criteria) this; - } - - public Criteria andActionNotEqualTo(String value) { - addCriterion("action <>", value, "action"); - return (Criteria) this; - } - - public Criteria andActionGreaterThan(String value) { - addCriterion("action >", value, "action"); - return (Criteria) this; - } - - public Criteria andActionGreaterThanOrEqualTo(String value) { - addCriterion("action >=", value, "action"); - return (Criteria) this; - } - - public Criteria andActionLessThan(String value) { - addCriterion("action <", value, "action"); - return (Criteria) this; - } - - public Criteria andActionLessThanOrEqualTo(String value) { - addCriterion("action <=", value, "action"); - return (Criteria) this; - } - - public Criteria andActionLike(String value) { - addCriterion("action like", value, "action"); - return (Criteria) this; - } - - public Criteria andActionNotLike(String value) { - addCriterion("action not like", value, "action"); - return (Criteria) this; - } - - public Criteria andActionIn(List values) { - addCriterion("action in", values, "action"); - return (Criteria) this; - } - - public Criteria andActionNotIn(List values) { - addCriterion("action not in", values, "action"); - return (Criteria) this; - } - - public Criteria andActionBetween(String value1, String value2) { - addCriterion("action between", value1, value2, "action"); - return (Criteria) this; - } - - public Criteria andActionNotBetween(String value1, String value2) { - addCriterion("action not between", value1, value2, "action"); - return (Criteria) this; - } - - public Criteria andMainactionIsNull() { - addCriterion("mainAction is null"); - return (Criteria) this; - } - - public Criteria andMainactionIsNotNull() { - addCriterion("mainAction is not null"); - return (Criteria) this; - } - - public Criteria andMainactionEqualTo(String value) { - addCriterion("mainAction =", value, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionNotEqualTo(String value) { - addCriterion("mainAction <>", value, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionGreaterThan(String value) { - addCriterion("mainAction >", value, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionGreaterThanOrEqualTo(String value) { - addCriterion("mainAction >=", value, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionLessThan(String value) { - addCriterion("mainAction <", value, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionLessThanOrEqualTo(String value) { - addCriterion("mainAction <=", value, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionLike(String value) { - addCriterion("mainAction like", value, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionNotLike(String value) { - addCriterion("mainAction not like", value, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionIn(List values) { - addCriterion("mainAction in", values, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionNotIn(List values) { - addCriterion("mainAction not in", values, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionBetween(String value1, String value2) { - addCriterion("mainAction between", value1, value2, "mainaction"); - return (Criteria) this; - } - - public Criteria andMainactionNotBetween(String value1, String value2) { - addCriterion("mainAction not between", value1, value2, "mainaction"); - return (Criteria) this; - } - - public Criteria andCodeIsNull() { - addCriterion("code is null"); - return (Criteria) this; - } - - public Criteria andCodeIsNotNull() { - addCriterion("code is not null"); - return (Criteria) this; - } - - public Criteria andCodeEqualTo(String value) { - addCriterion("code =", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotEqualTo(String value) { - addCriterion("code <>", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeGreaterThan(String value) { - addCriterion("code >", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeGreaterThanOrEqualTo(String value) { - addCriterion("code >=", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLessThan(String value) { - addCriterion("code <", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLessThanOrEqualTo(String value) { - addCriterion("code <=", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLike(String value) { - addCriterion("code like", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotLike(String value) { - addCriterion("code not like", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeIn(List values) { - addCriterion("code in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotIn(List values) { - addCriterion("code not in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeBetween(String value1, String value2) { - addCriterion("code between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotBetween(String value1, String value2) { - addCriterion("code not between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andCorporderidIsNull() { - addCriterion("corpOrderId is null"); - return (Criteria) this; - } - - public Criteria andCorporderidIsNotNull() { - addCriterion("corpOrderId is not null"); - return (Criteria) this; - } - - public Criteria andCorporderidEqualTo(String value) { - addCriterion("corpOrderId =", value, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidNotEqualTo(String value) { - addCriterion("corpOrderId <>", value, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidGreaterThan(String value) { - addCriterion("corpOrderId >", value, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidGreaterThanOrEqualTo(String value) { - addCriterion("corpOrderId >=", value, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidLessThan(String value) { - addCriterion("corpOrderId <", value, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidLessThanOrEqualTo(String value) { - addCriterion("corpOrderId <=", value, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidLike(String value) { - addCriterion("corpOrderId like", value, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidNotLike(String value) { - addCriterion("corpOrderId not like", value, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidIn(List values) { - addCriterion("corpOrderId in", values, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidNotIn(List values) { - addCriterion("corpOrderId not in", values, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidBetween(String value1, String value2) { - addCriterion("corpOrderId between", value1, value2, "corporderid"); - return (Criteria) this; - } - - public Criteria andCorporderidNotBetween(String value1, String value2) { - addCriterion("corpOrderId not between", value1, value2, "corporderid"); - return (Criteria) this; - } - - public Criteria andActorIsNull() { - addCriterion("actor is null"); - return (Criteria) this; - } - - public Criteria andActorIsNotNull() { - addCriterion("actor is not null"); - return (Criteria) this; - } - - public Criteria andActorEqualTo(String value) { - addCriterion("actor =", value, "actor"); - return (Criteria) this; - } - - public Criteria andActorNotEqualTo(String value) { - addCriterion("actor <>", value, "actor"); - return (Criteria) this; - } - - public Criteria andActorGreaterThan(String value) { - addCriterion("actor >", value, "actor"); - return (Criteria) this; - } - - public Criteria andActorGreaterThanOrEqualTo(String value) { - addCriterion("actor >=", value, "actor"); - return (Criteria) this; - } - - public Criteria andActorLessThan(String value) { - addCriterion("actor <", value, "actor"); - return (Criteria) this; - } - - public Criteria andActorLessThanOrEqualTo(String value) { - addCriterion("actor <=", value, "actor"); - return (Criteria) this; - } - - public Criteria andActorLike(String value) { - addCriterion("actor like", value, "actor"); - return (Criteria) this; - } - - public Criteria andActorNotLike(String value) { - addCriterion("actor not like", value, "actor"); - return (Criteria) this; - } - - public Criteria andActorIn(List values) { - addCriterion("actor in", values, "actor"); - return (Criteria) this; - } - - public Criteria andActorNotIn(List values) { - addCriterion("actor not in", values, "actor"); - return (Criteria) this; - } - - public Criteria andActorBetween(String value1, String value2) { - addCriterion("actor between", value1, value2, "actor"); - return (Criteria) this; - } - - public Criteria andActorNotBetween(String value1, String value2) { - addCriterion("actor not between", value1, value2, "actor"); - return (Criteria) this; - } - - public Criteria andActdateIsNull() { - addCriterion("actDate is null"); - return (Criteria) this; - } - - public Criteria andActdateIsNotNull() { - addCriterion("actDate is not null"); - return (Criteria) this; - } - - public Criteria andActdateEqualTo(String value) { - addCriterion("actDate =", value, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateNotEqualTo(String value) { - addCriterion("actDate <>", value, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateGreaterThan(String value) { - addCriterion("actDate >", value, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateGreaterThanOrEqualTo(String value) { - addCriterion("actDate >=", value, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateLessThan(String value) { - addCriterion("actDate <", value, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateLessThanOrEqualTo(String value) { - addCriterion("actDate <=", value, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateLike(String value) { - addCriterion("actDate like", value, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateNotLike(String value) { - addCriterion("actDate not like", value, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateIn(List values) { - addCriterion("actDate in", values, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateNotIn(List values) { - addCriterion("actDate not in", values, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateBetween(String value1, String value2) { - addCriterion("actDate between", value1, value2, "actdate"); - return (Criteria) this; - } - - public Criteria andActdateNotBetween(String value1, String value2) { - addCriterion("actDate not between", value1, value2, "actdate"); - return (Criteria) this; - } - - public Criteria andWrongcodeIsNull() { - addCriterion("wrongCode is null"); - return (Criteria) this; - } - - public Criteria andWrongcodeIsNotNull() { - addCriterion("wrongCode is not null"); - return (Criteria) this; - } - - public Criteria andWrongcodeEqualTo(Integer value) { - addCriterion("wrongCode =", value, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeNotEqualTo(Integer value) { - addCriterion("wrongCode <>", value, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeGreaterThan(Integer value) { - addCriterion("wrongCode >", value, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeGreaterThanOrEqualTo(Integer value) { - addCriterion("wrongCode >=", value, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeLessThan(Integer value) { - addCriterion("wrongCode <", value, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeLessThanOrEqualTo(Integer value) { - addCriterion("wrongCode <=", value, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeIn(List values) { - addCriterion("wrongCode in", values, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeNotIn(List values) { - addCriterion("wrongCode not in", values, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeBetween(Integer value1, Integer value2) { - addCriterion("wrongCode between", value1, value2, "wrongcode"); - return (Criteria) this; - } - - public Criteria andWrongcodeNotBetween(Integer value1, Integer value2) { - addCriterion("wrongCode not between", value1, value2, "wrongcode"); - return (Criteria) this; - } - - public Criteria andUppercorporderidIsNull() { - addCriterion("upperCorpOrderId is null"); - return (Criteria) this; - } - - public Criteria andUppercorporderidIsNotNull() { - addCriterion("upperCorpOrderId is not null"); - return (Criteria) this; - } - - public Criteria andUppercorporderidEqualTo(String value) { - addCriterion("upperCorpOrderId =", value, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidNotEqualTo(String value) { - addCriterion("upperCorpOrderId <>", value, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidGreaterThan(String value) { - addCriterion("upperCorpOrderId >", value, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidGreaterThanOrEqualTo(String value) { - addCriterion("upperCorpOrderId >=", value, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidLessThan(String value) { - addCriterion("upperCorpOrderId <", value, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidLessThanOrEqualTo(String value) { - addCriterion("upperCorpOrderId <=", value, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidLike(String value) { - addCriterion("upperCorpOrderId like", value, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidNotLike(String value) { - addCriterion("upperCorpOrderId not like", value, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidIn(List values) { - addCriterion("upperCorpOrderId in", values, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidNotIn(List values) { - addCriterion("upperCorpOrderId not in", values, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidBetween(String value1, String value2) { - addCriterion("upperCorpOrderId between", value1, value2, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andUppercorporderidNotBetween(String value1, String value2) { - addCriterion("upperCorpOrderId not between", value1, value2, "uppercorporderid"); - return (Criteria) this; - } - - public Criteria andFromcorpidIsNull() { - addCriterion("fromCorpID is null"); - return (Criteria) this; - } - - public Criteria andFromcorpidIsNotNull() { - addCriterion("fromCorpID is not null"); - return (Criteria) this; - } - - public Criteria andFromcorpidEqualTo(String value) { - addCriterion("fromCorpID =", value, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidNotEqualTo(String value) { - addCriterion("fromCorpID <>", value, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidGreaterThan(String value) { - addCriterion("fromCorpID >", value, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidGreaterThanOrEqualTo(String value) { - addCriterion("fromCorpID >=", value, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidLessThan(String value) { - addCriterion("fromCorpID <", value, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidLessThanOrEqualTo(String value) { - addCriterion("fromCorpID <=", value, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidLike(String value) { - addCriterion("fromCorpID like", value, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidNotLike(String value) { - addCriterion("fromCorpID not like", value, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidIn(List values) { - addCriterion("fromCorpID in", values, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidNotIn(List values) { - addCriterion("fromCorpID not in", values, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidBetween(String value1, String value2) { - addCriterion("fromCorpID between", value1, value2, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpidNotBetween(String value1, String value2) { - addCriterion("fromCorpID not between", value1, value2, "fromcorpid"); - return (Criteria) this; - } - - public Criteria andFromcorpIsNull() { - addCriterion("fromCorp is null"); - return (Criteria) this; - } - - public Criteria andFromcorpIsNotNull() { - addCriterion("fromCorp is not null"); - return (Criteria) this; - } - - public Criteria andFromcorpEqualTo(String value) { - addCriterion("fromCorp =", value, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpNotEqualTo(String value) { - addCriterion("fromCorp <>", value, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpGreaterThan(String value) { - addCriterion("fromCorp >", value, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpGreaterThanOrEqualTo(String value) { - addCriterion("fromCorp >=", value, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpLessThan(String value) { - addCriterion("fromCorp <", value, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpLessThanOrEqualTo(String value) { - addCriterion("fromCorp <=", value, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpLike(String value) { - addCriterion("fromCorp like", value, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpNotLike(String value) { - addCriterion("fromCorp not like", value, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpIn(List values) { - addCriterion("fromCorp in", values, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpNotIn(List values) { - addCriterion("fromCorp not in", values, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpBetween(String value1, String value2) { - addCriterion("fromCorp between", value1, value2, "fromcorp"); - return (Criteria) this; - } - - public Criteria andFromcorpNotBetween(String value1, String value2) { - addCriterion("fromCorp not between", value1, value2, "fromcorp"); - return (Criteria) this; - } - - public Criteria andOrderidIsNull() { - addCriterion("orderId is null"); - return (Criteria) this; - } - - public Criteria andOrderidIsNotNull() { - addCriterion("orderId is not null"); - return (Criteria) this; - } - - public Criteria andOrderidEqualTo(String value) { - addCriterion("orderId =", value, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidNotEqualTo(String value) { - addCriterion("orderId <>", value, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidGreaterThan(String value) { - addCriterion("orderId >", value, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidGreaterThanOrEqualTo(String value) { - addCriterion("orderId >=", value, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidLessThan(String value) { - addCriterion("orderId <", value, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidLessThanOrEqualTo(String value) { - addCriterion("orderId <=", value, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidLike(String value) { - addCriterion("orderId like", value, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidNotLike(String value) { - addCriterion("orderId not like", value, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidIn(List values) { - addCriterion("orderId in", values, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidNotIn(List values) { - addCriterion("orderId not in", values, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidBetween(String value1, String value2) { - addCriterion("orderId between", value1, value2, "orderid"); - return (Criteria) this; - } - - public Criteria andOrderidNotBetween(String value1, String value2) { - addCriterion("orderId not between", value1, value2, "orderid"); - return (Criteria) this; - } - - public Criteria andBatchnoIsNull() { - addCriterion("batchNo is null"); - return (Criteria) this; - } - - public Criteria andBatchnoIsNotNull() { - addCriterion("batchNo is not null"); - return (Criteria) this; - } - - public Criteria andBatchnoEqualTo(String value) { - addCriterion("batchNo =", value, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoNotEqualTo(String value) { - addCriterion("batchNo <>", value, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoGreaterThan(String value) { - addCriterion("batchNo >", value, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoGreaterThanOrEqualTo(String value) { - addCriterion("batchNo >=", value, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoLessThan(String value) { - addCriterion("batchNo <", value, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoLessThanOrEqualTo(String value) { - addCriterion("batchNo <=", value, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoLike(String value) { - addCriterion("batchNo like", value, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoNotLike(String value) { - addCriterion("batchNo not like", value, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoIn(List values) { - addCriterion("batchNo in", values, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoNotIn(List values) { - addCriterion("batchNo not in", values, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoBetween(String value1, String value2) { - addCriterion("batchNo between", value1, value2, "batchno"); - return (Criteria) this; - } - - public Criteria andBatchnoNotBetween(String value1, String value2) { - addCriterion("batchNo not between", value1, value2, "batchno"); - return (Criteria) this; - } - - public Criteria andProducedateIsNull() { - addCriterion("produceDate is null"); - return (Criteria) this; - } - - public Criteria andProducedateIsNotNull() { - addCriterion("produceDate is not null"); - return (Criteria) this; - } - - public Criteria andProducedateEqualTo(String value) { - addCriterion("produceDate =", value, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateNotEqualTo(String value) { - addCriterion("produceDate <>", value, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateGreaterThan(String value) { - addCriterion("produceDate >", value, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateGreaterThanOrEqualTo(String value) { - addCriterion("produceDate >=", value, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateLessThan(String value) { - addCriterion("produceDate <", value, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateLessThanOrEqualTo(String value) { - addCriterion("produceDate <=", value, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateLike(String value) { - addCriterion("produceDate like", value, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateNotLike(String value) { - addCriterion("produceDate not like", value, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateIn(List values) { - addCriterion("produceDate in", values, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateNotIn(List values) { - addCriterion("produceDate not in", values, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateBetween(String value1, String value2) { - addCriterion("produceDate between", value1, value2, "producedate"); - return (Criteria) this; - } - - public Criteria andProducedateNotBetween(String value1, String value2) { - addCriterion("produceDate not between", value1, value2, "producedate"); - return (Criteria) this; - } - - public Criteria andExpiredateIsNull() { - addCriterion("expireDate is null"); - return (Criteria) this; - } - - public Criteria andExpiredateIsNotNull() { - addCriterion("expireDate is not null"); - return (Criteria) this; - } - - public Criteria andExpiredateEqualTo(String value) { - addCriterion("expireDate =", value, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateNotEqualTo(String value) { - addCriterion("expireDate <>", value, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateGreaterThan(String value) { - addCriterion("expireDate >", value, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateGreaterThanOrEqualTo(String value) { - addCriterion("expireDate >=", value, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateLessThan(String value) { - addCriterion("expireDate <", value, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateLessThanOrEqualTo(String value) { - addCriterion("expireDate <=", value, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateLike(String value) { - addCriterion("expireDate like", value, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateNotLike(String value) { - addCriterion("expireDate not like", value, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateIn(List values) { - addCriterion("expireDate in", values, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateNotIn(List values) { - addCriterion("expireDate not in", values, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateBetween(String value1, String value2) { - addCriterion("expireDate between", value1, value2, "expiredate"); - return (Criteria) this; - } - - public Criteria andExpiredateNotBetween(String value1, String value2) { - addCriterion("expireDate not between", value1, value2, "expiredate"); - return (Criteria) this; - } - - public Criteria andSerialnoIsNull() { - addCriterion("serialNo is null"); - return (Criteria) this; - } - - public Criteria andSerialnoIsNotNull() { - addCriterion("serialNo is not null"); - return (Criteria) this; - } - - public Criteria andSerialnoEqualTo(String value) { - addCriterion("serialNo =", value, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoNotEqualTo(String value) { - addCriterion("serialNo <>", value, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoGreaterThan(String value) { - addCriterion("serialNo >", value, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoGreaterThanOrEqualTo(String value) { - addCriterion("serialNo >=", value, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoLessThan(String value) { - addCriterion("serialNo <", value, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoLessThanOrEqualTo(String value) { - addCriterion("serialNo <=", value, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoLike(String value) { - addCriterion("serialNo like", value, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoNotLike(String value) { - addCriterion("serialNo not like", value, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoIn(List values) { - addCriterion("serialNo in", values, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoNotIn(List values) { - addCriterion("serialNo not in", values, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoBetween(String value1, String value2) { - addCriterion("serialNo between", value1, value2, "serialno"); - return (Criteria) this; - } - - public Criteria andSerialnoNotBetween(String value1, String value2) { - addCriterion("serialNo not between", value1, value2, "serialno"); - return (Criteria) this; - } - - public Criteria andUdiIsNull() { - addCriterion("udi is null"); - return (Criteria) this; - } - - public Criteria andUdiIsNotNull() { - addCriterion("udi is not null"); - return (Criteria) this; - } - - public Criteria andUdiEqualTo(String value) { - addCriterion("udi =", value, "udi"); - return (Criteria) this; - } - - public Criteria andUdiNotEqualTo(String value) { - addCriterion("udi <>", value, "udi"); - return (Criteria) this; - } - - public Criteria andUdiGreaterThan(String value) { - addCriterion("udi >", value, "udi"); - return (Criteria) this; - } - - public Criteria andUdiGreaterThanOrEqualTo(String value) { - addCriterion("udi >=", value, "udi"); - return (Criteria) this; - } - - public Criteria andUdiLessThan(String value) { - addCriterion("udi <", value, "udi"); - return (Criteria) this; - } - - public Criteria andUdiLessThanOrEqualTo(String value) { - addCriterion("udi <=", value, "udi"); - return (Criteria) this; - } - - public Criteria andUdiLike(String value) { - addCriterion("udi like", value, "udi"); - return (Criteria) this; - } - - public Criteria andUdiNotLike(String value) { - addCriterion("udi not like", value, "udi"); - return (Criteria) this; - } - - public Criteria andUdiIn(List values) { - addCriterion("udi in", values, "udi"); - return (Criteria) this; - } - - public Criteria andUdiNotIn(List values) { - addCriterion("udi not in", values, "udi"); - return (Criteria) this; - } - - public Criteria andUdiBetween(String value1, String value2) { - addCriterion("udi between", value1, value2, "udi"); - return (Criteria) this; - } - - public Criteria andUdiNotBetween(String value1, String value2) { - addCriterion("udi not between", value1, value2, "udi"); - return (Criteria) this; - } - - public Criteria andCountIsNull() { - addCriterion("count is null"); - return (Criteria) this; - } - - public Criteria andCountIsNotNull() { - addCriterion("count is not null"); - return (Criteria) this; - } - - public Criteria andCountEqualTo(Integer value) { - addCriterion("count =", value, "count"); - return (Criteria) this; - } - - public Criteria andCountNotEqualTo(Integer value) { - addCriterion("count <>", value, "count"); - return (Criteria) this; - } - - public Criteria andCountGreaterThan(Integer value) { - addCriterion("count >", value, "count"); - return (Criteria) this; - } - - public Criteria andCountGreaterThanOrEqualTo(Integer value) { - addCriterion("count >=", value, "count"); - return (Criteria) this; - } - - public Criteria andCountLessThan(Integer value) { - addCriterion("count <", value, "count"); - return (Criteria) this; - } - - public Criteria andCountLessThanOrEqualTo(Integer value) { - addCriterion("count <=", value, "count"); - return (Criteria) this; - } - - public Criteria andCountIn(List values) { - addCriterion("count in", values, "count"); - return (Criteria) this; - } - - public Criteria andCountNotIn(List values) { - addCriterion("count not in", values, "count"); - return (Criteria) this; - } - - public Criteria andCountBetween(Integer value1, Integer value2) { - addCriterion("count between", value1, value2, "count"); - return (Criteria) this; - } - - public Criteria andCountNotBetween(Integer value1, Integer value2) { - addCriterion("count not between", value1, value2, "count"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java index b7dbf827..6e4e80b6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java @@ -31,11 +31,11 @@ public class ErpOrderClient { this.url = url; } - public List getErpOrder(List billCodes) { + public List getErpOrder(List billCodes, String action) { List erpOrderEntities = new ArrayList<>(); if (billCodes != null && billCodes.size() > 0) { for (int i = 0; i < billCodes.size(); i++) { - ErpOrderEntity erpOrderEntity = getErpOrder(billCodes.get(i)); + ErpOrderEntity erpOrderEntity = getErpOrder(billCodes.get(i), action); if (erpOrderEntity != null) { erpOrderEntities.add(erpOrderEntity); } @@ -50,6 +50,7 @@ public class ErpOrderClient { paramMap.put("page", filterOrderRequest.getPage()); paramMap.put("limit", filterOrderRequest.getLimit()); paramMap.put("billAction", filterOrderRequest.getBillAction()); + paramMap.put("billFlag", filterOrderRequest.getBillFlag()); if (filterOrderRequest.getStartDate() == null || filterOrderRequest.getEndDate() == null) { Map date = DateUtil.getDayTRange(); if (filterOrderRequest.getBillNo() != null) { @@ -110,10 +111,11 @@ public class ErpOrderClient { return null; } - public ErpOrderEntity getErpOrder(String billCode) { + public ErpOrderEntity getErpOrder(String billCode, String action) { FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setPage(1); filterOrderRequest.setLimit(1); + filterOrderRequest.setBillAction(action); filterOrderRequest.setBillNo(billCode); List erpOrderEntities = getErpOrder(filterOrderRequest); if (erpOrderEntities != null && erpOrderEntities.size() > 0) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java index 823ce843..2739ed9f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java @@ -16,4 +16,5 @@ public class SystemParamConfigRequest extends ListPageRequest { private int paramStatus; private int paramType; private String paramExplain; + private String key; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java index 52a6f35e..69821e53 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java @@ -9,5 +9,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private String action; private String name; private String mainAction; + private Boolean enable; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java index a6a277fb..1c35e92b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java @@ -22,8 +22,10 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { if (bussinessTypeFilterRequest == null) { return Collections.emptyList(); } - int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); - PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); + if(bussinessTypeFilterRequest.getPage()!=null){ + int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); + } List data = bussinessTypeDao.filterList(bussinessTypeFilterRequest); return data; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java index 579b8c59..35b6e6f8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java @@ -33,5 +33,5 @@ public interface CodesService { List searchCode(String code); - boolean updateUnit(String orderId, String fromCorpID, String fromCorp); + boolean updateUnit(String orderId, String fromCorpId, String fromCorp); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java index d60fc713..f437f6e7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java @@ -106,7 +106,7 @@ public class CodesServiceImpl implements CodesService { @Override - public boolean updateUnit(String orderId, String fromCorpID, String fromCorp) { - return warehouseDao.updateUnit(orderId, fromCorpID, fromCorp); + public boolean updateUnit(String orderId, String fromCorpId, String fromCorp) { + return warehouseDao.updateUnit(orderId, fromCorpId, fromCorp); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java index 6d6f05b0..9d31078f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java @@ -22,7 +22,7 @@ import javax.annotation.Resource; public class BasicUpdateErpDataTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(IoModifyErpTask.class); - + String cron; @Resource private BasicUpdateproductService updateproductService; @Resource @@ -37,7 +37,7 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { ScheduledRequest scheduledRequest = new ScheduledRequest(); scheduledRequest.setCronName("updateErpData"); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); - String cron = scheduledEntity.getCron(); + cron = scheduledEntity.getCron(); if (cron.isEmpty()) { logger.error("cron is null"); } @@ -48,7 +48,7 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { private void process() { logger.info("定时更新下载ERP产品信息"); - SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("updateErpData"); + SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData"); if (isUpdate != null && "1".equals(isUpdate.getParamValue())) { SystemParamConfigEntity product = systemParamConfigService.selectByParamKey("erp_products_query"); SystemParamConfigEntity onHand = systemParamConfigService.selectByParamKey("erp_onhand_query"); @@ -59,4 +59,9 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { } } + + public void setCron(String cron) { + this.cron = cron; + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index 366cdfa0..187711d5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -78,9 +78,10 @@ public class IoTransInoutService { orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); orderSaveRequest.setFromType("手持终端"); orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - orderSaveRequest.setExportStatus("未上传"); + orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); orderSaveRequest.setStockCheckFk(postOrder.getStockIdFk()); - orderSaveRequest.setSignStatus("0"); + orderSaveRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); + orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); List docidsList = postOrder.getErpOrders(); String docidStr = ""; if (docidsList != null) { @@ -186,7 +187,7 @@ public class IoTransInoutService { orderService.updateOrder(orderEntity); } else { String erpOrderUrl = systemParamConfigEntityBUMErpQuery.getParamValue(); - List cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds); + List cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds,orderEntity.getAction()); if (cloudErps != null && cloudErps.size() > 0) { List returnOrders = new ContrastErpUtil().transErp(cloudErps, udiRelevanceService, orderEntity.getId()); ErpOrderEntity temp = returnOrders.get(0); @@ -199,6 +200,7 @@ public class IoTransInoutService { return; } } + myErpOrderService.deleteByOrderId(orderEntity.getId()); myErpOrderService.insertErpOrders(returnOrders); new ContrastErpUtil(udiUrl).contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, transData, systemParamConfigService); } else { @@ -206,6 +208,7 @@ public class IoTransInoutService { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderEntity.setRemark("获取ERP出入库单据失败"); orderService.updateOrder(orderEntity); + myErpOrderService.deleteByOrderId(orderEntity.getId()); new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java index b0077bd0..ccabb2f1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java @@ -22,7 +22,7 @@ public class IoTransInoutTask implements SchedulingConfigurer { @Resource protected ScheduledDao scheduledDao; @Resource - SetupService setupService; + private IoTransInoutService ioTransInoutService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { @@ -41,5 +41,7 @@ public class IoTransInoutTask implements SchedulingConfigurer { private void process() { + logger.info("定时重码校验"); + ioTransInoutService.transInout(); } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 7e9ec433..cb8b72b1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -16,6 +16,10 @@ AND action LIKE concat(#{mainAction},'%') + + AND enable =#{enable} + + @@ -36,12 +40,12 @@ - UPDATE basic_bussiness_type SET - action = #{action}, - name = #{name}, - enable = #{enable}, - remark = #{remark} - mainAction = #{mainAction} + UPDATE basic_bussiness_type SET + action = #{action}, + name = #{name}, + enable = #{enable}, + remark = #{remark}, + mainAction = #{mainAction} WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index cbf199b0..e8544fc5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -8,7 +8,6 @@ select basic_udirel.id, basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, - basic_udirel.batchNo,basic_udirel.warehouseName, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj, @@ -47,7 +46,6 @@ select basic_udirel.id, basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, - basic_udirel.batchNo,basic_udirel.warehouseName, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType FROM basic_products right JOIN basic_udirel @@ -97,7 +95,7 @@ replace INTO basic_udirel ( - thirdId,thirdName,uuid,isUseDy,updateTime,batchNo,warehouseName + thirdId,thirdName,uuid,isUseDy,updateTime ) values ( @@ -105,9 +103,8 @@ #{thirdName}, #{uuid}, #{isUseDy}, - #{updateTime}, - #{batchNo}, - #{warehouseName} + #{updateTime} + ) @@ -133,8 +130,6 @@ uuid=#{uuid}, isUseDy=#{isUseDy}, updateTime=#{updateTime}, - batchNo=#{batchNo}, - warehouseName=#{warehouseName}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml index 0b8fd2c6..e7f21caf 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml @@ -12,6 +12,9 @@ AND `paramName` LIKE CONCAT(#{paramName},'%') + + and `paramName` LIKE CONCAT('%',#{key},'%') or paramKey LIKE CONCAT('%',#{key},'%') + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml index b8d2405a..8fc8ecab 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -21,9 +21,6 @@ and code =#{code} - - and udi =#{udi} - and batchNo =#{batchNo} @@ -33,7 +30,7 @@ - INSERT INTO io_codes(action,mainAction,code,corpOrderId,actor,actDate,wrongCode,upperCorpOrderId,fromCorpId,fromCorp,type) + INSERT INTO io_codes(action,mainAction,code,corpOrderId,actor,actDate,upperCorpOrderId,fromCorpId,fromCorp) values( #{action}, #{mainAction}, @@ -41,10 +38,8 @@ #{corpOrderId}, #{actor}, #{actDate}, - #{wrongCode}, - #{upperCorpOrderId}, #{fromCorpId}, - #{fromCorp},#{orderId},#{type}) + #{fromCorp},#{orderId}) @@ -55,9 +50,8 @@ corpOrderId, actor, actDate, - wrongCode, - upperCorpOrderId, - fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type) + fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate, + serialNo,count,packageLevel,warehouseCode) VALUES @@ -68,8 +62,6 @@ #{item.corpOrderId}, #{item.actor}, #{item.actDate}, - #{item.wrongCode}, - #{item.upperCorpOrderId}, #{item.fromCorpId}, #{ item.fromCorp @@ -77,9 +69,8 @@ ,#{item.produceDate} ,#{item.expireDate} ,#{item.serialNo} - ,#{item.udi} ,#{item.count} - ,#{item.type}) + ,#{item.packageLevel} ,#{item.warehouseCode}) @@ -109,7 +100,7 @@ - UPDATE io_codes SET fromCorpID = #{fromCorpID}, fromCorp = #{fromCorp} + UPDATE io_codes SET fromCorpId = #{fromCorpId}, fromCorp = #{fromCorp} WHERE orderId = #{orderId} \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml index 9802f3d4..01654cab 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -7,7 +7,7 @@ INSERT INTO io_codes_temp (action, mainAction,code, corpOrderId, actor,actDate, - fromCorpID, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,udi,count) + fromCorpId, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,count) VALUES @@ -18,24 +18,33 @@ #{item.corpOrderId}, #{item.actor}, #{item.actDate}, - #{item.fromCorpID}, + #{item.fromCorpId}, #{item.fromCorp}, #{item.orderId} ,#{item.batchNo} ,#{item.produceDate} ,#{item.expireDate} ,#{item.serialNo} - ,#{item.udi} ,#{item.count} ) + SELECT * + FROM io_codes_temp + + + and orderId =#{orderId} + + + and code LIKE concat('%',#{code},'%') + + + and batchNo =#{batchNo} + + + DELETE FROM io_codes_temp WHERE id IN diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetail.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetail.xml index 9d33e0b0..2142909a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetail.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetail.xml @@ -7,11 +7,11 @@ resultType="com.glxp.api.admin.entity.inout.ErpOrderEntity"> select * from io_order_detail - - and docid = #{docid} + + and erpOrderId = #{erpOrderId} - and GOODSNAME = #{goodsname} + and goodsname = #{goodsname} and orderIdFk = #{orderId} @@ -32,14 +32,14 @@ resultType="com.glxp.api.admin.entity.inout.ErpOrderEntity"> select * from io_order_detail - - and docid = #{docid} + + and erpOrderId = #{erpOrderId} - and GOODSNAME = #{goodsname} + and goodsname = #{goodsname} - group by orderIdFk,docid + group by orderIdFk,erpOrderId @@ -47,11 +47,11 @@ resultType="com.glxp.api.admin.entity.inout.ErpOrderEntity"> select * from io_order_detail - - and docid = #{docid} + + and erpOrderId = #{erpOrderId} - and GOODSNAME = #{goodsname} + and goodsname = #{goodsname} and orderIdFk = #{orderIdFk} @@ -63,7 +63,7 @@ @@ -168,7 +168,7 @@ WHERE id = #{id} - DELETE FROM io_order_detail WHERE docid = #{id} + DELETE FROM io_order_detail WHERE erpOrderId = #{id}