From e266ae4e7b5c578de1843d746cf7ae1c58c2c70a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 5 Dec 2023 13:10:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/UdiContrastController.java | 3 ++- src/main/java/com/glxp/api/http/NmpaUdiClient.java | 4 +++- .../java/com/glxp/api/service/inout/IoAddInoutService.java | 7 +++++-- .../mybatis/mapper/thrsys/ThrProductsAddDiDao.xml | 7 +++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 0b58b53e..8a1e973c 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -193,8 +193,9 @@ public class UdiContrastController { productInfoService.insertProductInfos(productInfoEntityList); newUuid = productInfoEntityList.get(0).getUuid(); } + } else { + return ResultVOUtils.error(500, "实时获取国家库数据失败！"); } - udiInfoEntities = udiDlHttpClient.getUdiByUuid(newUuid); udiProductService.deleteByUuid(udiCombineRequest.getUuid()); for (UdiProductEntity udiProductEntity : udiInfoEntities) { diff --git a/src/main/java/com/glxp/api/http/NmpaUdiClient.java b/src/main/java/com/glxp/api/http/NmpaUdiClient.java index 700a1e79..ed53bd05 100644 --- a/src/main/java/com/glxp/api/http/NmpaUdiClient.java +++ b/src/main/java/com/glxp/api/http/NmpaUdiClient.java @@ -2,6 +2,7 @@ package com.glxp.api.http; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiProductEntity; @@ -33,7 +34,8 @@ public class NmpaUdiClient { productInfoFilterRequest.setPage(1); productInfoFilterRequest.setLimit(100); productInfoFilterRequest.setUuid(uuid); - + if (StrUtil.isEmpty(uuid)) + return null; List productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); List udiInfoEntities = new ArrayList<>(); String myUuid = UuidUtils.getUUId(); diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index b37762ef..4e1199c0 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -154,6 +154,7 @@ public class IoAddInoutService { } else { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); + orderEntity.setErrMsg(result); orderService.update(orderEntity); insertList.clear(); return; @@ -682,7 +683,10 @@ public class IoAddInoutService { int count = 0; if (filterList != null) { for (IoCodeTempEntity temp : filterList) { - if (temp.getCode().equals(codeEntity.getCode())) { + if (temp.getCode().equals(codeEntity.getCode()) + && StrUtil.trimToEmpty(temp.getSerialNo()).equals(StrUtil.trimToEmpty(codeEntity.getSerialNo())) + && StrUtil.trimToEmpty(temp.getInBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getInBatchNo())) + ) { count = count + 1; } } @@ -693,7 +697,6 @@ public class IoAddInoutService { return null; } - public String checkOriginCode(IoCodeTempEntity warehouseEntity) { UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode()); diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 66d052a8..4e113e47 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -16,7 +16,7 @@ qxlb, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, updateTime, supName, model, `standard`, - qtbm, zczyxqz, relId, type) + qtbm, zczyxqz, relId, type, deviceRecordKey) values (#{item.uuid}, @@ -25,6 +25,8 @@ #{item.auditTime}, #{item.remark}, #{item.auditUser}, + + #{item.status}, #{item.thirdSysFk}, #{item.code}, @@ -41,7 +43,8 @@ , #{item.name}, #{item.spec}, #{item.registerNo}, #{item.cplb} , #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh} , #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model} - , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type}) + , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type}, + #{item.deviceRecordKey}) From 0fa3c04d98db44d653595c301da9950e82dafeeb Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 11 Dec 2023 09:04:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E7=B1=BB=E5=88=AB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/RegisterController.java | 2 +- .../purchase/SupProductController.java | 17 ++--- .../sync/SpsSyncBasicController.java | 68 +++++++++++++++++++ .../sync/SpsSyncDownloadController.java | 1 + .../thrsys/ThrProductTypeCotroller.java | 44 ++++++++++++ .../api/dao/thrsys/ThrProductTypeMapper.java | 15 ++++ .../entity/thrsys/ThrProductTypeEntity.java | 56 +++++++++++++++ .../api/req/sync/SpsSyncBasicRlRequest.java | 16 +++++ .../thrsys/FilterThrProductTypeRequest.java | 26 +++++++ .../service/thrsys/ThrProductTypeService.java | 30 ++++++++ .../mapper/thrsys/ThrProductTypeMapper.xml | 33 +++++++++ 11 files changed, 299 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java create mode 100644 src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java create mode 100644 src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java create mode 100644 src/main/java/com/glxp/api/req/sync/SpsSyncBasicRlRequest.java create mode 100644 src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java create mode 100644 src/main/resources/mybatis/mapper/thrsys/ThrProductTypeMapper.xml diff --git a/src/main/java/com/glxp/api/controller/auth/RegisterController.java b/src/main/java/com/glxp/api/controller/auth/RegisterController.java index 09e178f5..da31ec6b 100644 --- a/src/main/java/com/glxp/api/controller/auth/RegisterController.java +++ b/src/main/java/com/glxp/api/controller/auth/RegisterController.java @@ -132,7 +132,7 @@ public class RegisterController { JSONObject json = new JSONObject(); json.put("memPhone", checkCodeRequest.getPhoneNum()); json.put("code", mobile_code); - json.put("createTime", System.currentTimeMillis()); + json.put("createTime", System.currentTimeMillis() + ""); //验证码存入redis中 redisUtil.set(Constant.CAPTCHAS + checkCodeRequest.getPhoneNum(), json, 300L); return ResultVOUtils.success("发送成功" + " " + mobile_code); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 5411931f..2dc4ed8b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -144,15 +144,16 @@ public class SupProductController { int i = supProductService.findProduct(supProductEntity); System.out.println(i); if (i == 0) { - supProductEntity.setCreateTime(new Date()); - supProductEntity.setUpdateTime(new Date()); - supProductEntity.setId(IdUtil.getSnowflakeNextId()); - boolean b = supProductService.insertRegistration(supProductEntity); - if (b) { - return ResultVOUtils.success("添加成功"); + supProductEntity.setCreateTime(new Date()); + supProductEntity.setUpdateTime(new Date()); + supProductEntity.setId(IdUtil.getSnowflakeNextId()); + boolean b = supProductService.insertRegistration(supProductEntity); + if (b) { + return ResultVOUtils.success("添加成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } } else { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); - }} else { return ResultVOUtils.error(ResultEnum.DATA_REPEAT); } } diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java new file mode 100644 index 00000000..a296d689 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java @@ -0,0 +1,68 @@ +package com.glxp.api.controller.sync; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; +import com.glxp.api.dao.basic.BasicProductsDao; +import com.glxp.api.dao.basic.CompanyProductRelevanceDao; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.req.sync.SpsSyncBasicRlRequest; +import com.glxp.api.req.system.DeleteRequest; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@Api(tags = "内网基础信息同步修改") +@RequiredArgsConstructor +@Slf4j +public class SpsSyncBasicController { + + private final UdiRelevanceDao udiRelevanceDao; + private final BasicProductsDao basicProductsDao; + private final CompanyProductRelevanceDao relevanceDao; + + @AuthRuleAnnotation("") + @PostMapping("/spssync/basic/udirl/update") + @Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE) + public BaseResponse udiRlUpdate(@RequestBody UdiRelevanceEntity udiRelevanceEntity) { + + if (udiRelevanceEntity.getId() != null) { + return ResultVOUtils.error(500, "缺少唯一标识"); + } + int b = udiRelevanceDao.updateById(udiRelevanceEntity); + if (b > 0) + return ResultVOUtils.success("更新成功！"); + else + return ResultVOUtils.error(500, "更新失败！"); + } + + @AuthRuleAnnotation("") + @PostMapping("/spssync/basic/udirl/batchInsert") + @Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE) + public BaseResponse udiRlUpdate(@RequestBody SpsSyncBasicRlRequest spsSyncBasicRlRequest) { + + if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getUdiRelevanceEntities())) { + udiRelevanceDao.replaceBatchs(spsSyncBasicRlRequest.getUdiRelevanceEntities()); + } + if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getBasicProductsEntities())) { + basicProductsDao.replaceBatchs(spsSyncBasicRlRequest.getBasicProductsEntities()); + } + if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getCompanyProductRelevanceEntities())) { + relevanceDao.replaceBatchs(spsSyncBasicRlRequest.getCompanyProductRelevanceEntities()); + } + return ResultVOUtils.success("同步成功！"); + } + + +} diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index 643dab4d..eac3d669 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -1332,5 +1332,6 @@ public class SpsSyncDownloadController { } } + } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java new file mode 100644 index 00000000..bf25165c --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java @@ -0,0 +1,44 @@ +package com.glxp.api.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.thrsys.ThrProductTypeEntity; +import com.glxp.api.req.thrsys.FilterThrProductTypeRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.thrsys.ThrProductTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@Slf4j +@RestController +public class ThrProductTypeCotroller { + + @Resource + ThrProductTypeService thrProductTypeService; + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/thrsys/getThrProductType") + public BaseResponse getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductTypeEntityList + = thrProductTypeService.getProductTypes(filterThrProductTypeRequest); + PageInfo pageInfo; + pageInfo = new PageInfo(thrProductTypeEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductTypeEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java new file mode 100644 index 00000000..abf7f12f --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java @@ -0,0 +1,15 @@ +package com.glxp.api.dao.thrsys; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.thrsys.ThrProductTypeEntity; +import com.glxp.api.req.thrsys.FilterThrProductTypeRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ThrProductTypeMapper extends BaseMapper { + + List getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest); + +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java new file mode 100644 index 00000000..3a9deb0a --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java @@ -0,0 +1,56 @@ +package com.glxp.api.entity.thrsys; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@ApiModel(value = "com-glxp-api-entity-thrsys-ThrProductType") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "thr_product_type") +public class ThrProductTypeEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 类别编码 + */ + @TableField(value = "code") + @ApiModelProperty(value = "类别编码") + private String code; + + /** + * 类别名称 + */ + @TableField(value = "`name`") + @ApiModelProperty(value = "类别名称") + private String name; + + /** + * 第三系统标识 + */ + @TableField(value = "thirdSys") + @ApiModelProperty(value = "第三系统标识") + private String thirdSys; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value = "备注") + private String remark; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/req/sync/SpsSyncBasicRlRequest.java b/src/main/java/com/glxp/api/req/sync/SpsSyncBasicRlRequest.java new file mode 100644 index 00000000..20cd7054 --- /dev/null +++ b/src/main/java/com/glxp/api/req/sync/SpsSyncBasicRlRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.req.sync; + +import com.glxp.api.entity.basic.BasicProductsEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class SpsSyncBasicRlRequest { + + private List udiRelevanceEntities; + private List companyProductRelevanceEntities; + private List basicProductsEntities; +} diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java new file mode 100644 index 00000000..0ba5bfd0 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java @@ -0,0 +1,26 @@ +package com.glxp.api.req.thrsys; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrProductTypeRequest extends ListPageRequest { + + + /** + * 类别编码 + */ + private String code; + + /** + * 类别名称 + */ + private String name; + + /** + * 第三系统标识 + */ + private String thirdSys; + + private String key; +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java new file mode 100644 index 00000000..98946c96 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java @@ -0,0 +1,30 @@ +package com.glxp.api.service.thrsys; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.thrsys.ThrProductTypeMapper; +import com.glxp.api.entity.thrsys.ThrProductTypeEntity; +import com.glxp.api.req.thrsys.FilterThrProductTypeRequest; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductTypeService extends ServiceImpl { + @Resource + ThrProductTypeMapper thrProductTypeMapper; + + public List getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest) { + if (filterThrProductTypeRequest == null) { + return Collections.emptyList(); + } + if (filterThrProductTypeRequest.getPage() != null) { + int offset = (filterThrProductTypeRequest.getPage() - 1) * filterThrProductTypeRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrProductTypeRequest.getLimit()); + } + List data = thrProductTypeMapper.getProductTypes(filterThrProductTypeRequest); + return data; + } +} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductTypeMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductTypeMapper.xml new file mode 100644 index 00000000..d4930287 --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductTypeMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + id, code, `name`, thirdSys, remark + + + + + From 4fc006c1e5b00d13230a327d8681cd4ccdd18781 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 11 Dec 2023 21:58:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=BC=82=E5=B8=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/constant/Constant.java | 3 +++ .../com/glxp/api/controller/sync/SpsSyncBasicController.java | 2 +- .../service/basic/impl/BasicBussinessTypeServiceImpl.java | 5 ++++- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 5e03eeed..144483de 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -238,6 +238,9 @@ public class Constant { public static final String ORDER_STATUS_INCODE = "supInCode"; + + public static final String ORDER_STATUS_RETURN = "supReturned"; + /**前端页面查询相关单据类型标识*/ diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java index a296d689..6e432d11 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java @@ -37,7 +37,7 @@ public class SpsSyncBasicController { @Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE) public BaseResponse udiRlUpdate(@RequestBody UdiRelevanceEntity udiRelevanceEntity) { - if (udiRelevanceEntity.getId() != null) { + if (udiRelevanceEntity.getId() == null) { return ResultVOUtils.error(500, "缺少唯一标识"); } int b = udiRelevanceDao.updateById(udiRelevanceEntity); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 4315391a..14c7bf59 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -257,7 +257,10 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl() .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)); - + case Constant.ORDER_STATUS_RETURN: + bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper() + .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("mainAction", ConstantType.TYPE_OUT)); + break; default: break; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index a988b716..7f0b407f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -691,6 +691,11 @@ public class IoOrderServiceImpl implements IoOrderService { case Constant.ORDER_STATUS_UN_ALLOCATE: filterOrderRequest.setStatuses(Arrays.asList(ConstantStatus.ORDER_STATUS_ALLOCATE)); filterOrderRequest.setDealStatuses(Arrays.asList(2)); + + case Constant.ORDER_STATUS_RETURN: + filterOrderRequest.setStatuses(Arrays.asList(10, 7)); + filterOrderRequest.setDealStatuses(Arrays.asList(3, 4)); + break; default: break; }