协调平台更新

src/main/java/com/glxp/api/controller/basic/UdiProductController.java

@@ -216,7 +216,7 @@ public class UdiProductController extends BaseController {
     @PostMapping("/udi/udirel/syncOnline")
     @Log(title = "耗材字典", businessType = BusinessType.UPDATE)
     public BaseResponse syncOnline(@RequestBody UdiCombineRequest udiCombineRequest) {
-        List<BasicUdiProductEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getOriginUuid());
+        List<BasicUdiProductEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getUuid());
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
             BaseResponse<List<ProductInfoEntity>> listBaseResponse = asyncDiDlHelper.dlLastVersionByDi(udiInfoEntities.get(0).getNameCode());
             if (listBaseResponse.getCode() == 20000) {
@@ -225,7 +225,7 @@ public class UdiProductController extends BaseController {
                     productInfoService.insertProductInfos(productInfoEntityList);
                 }
             }
-            udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getOriginUuid());
+            udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getUuid());
             basicUdiProductService.deleteByUuid(udiCombineRequest.getUuid());
             for (BasicUdiProductEntity udiProductEntity : udiInfoEntities) {
                 udiProductEntity.setUuid(udiCombineRequest.getUuid());

src/main/java/com/glxp/api/controller/basic/UdiRelController.java

@@ -77,6 +77,36 @@ public class UdiRelController extends BaseController {
         return ResultVOUtils.success(basicUdiRelResponsePageSimpleResponse);
     }
 
+    //获取同步库UDI信息
+    @AuthRuleAnnotation("")
+    @ApiIgnore
+    @ApiOperation(value = "获取企业产品信息", response = BasicUdiRelResponse.class)
+    @GetMapping("udi/basic/rel/company/filter")
+    public BaseResponse filterRelByCompany(FilterUdiRelRequest filterUdiRelRequest) {
+        System.out.println(filterUdiRelRequest.toString());
+        String nameCode;
+        if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
+            if (udiEntity != null) {
+                nameCode = udiEntity.getUdi();
+            } else {
+                return ResultVOUtils.error(500, "无效UDI码！");
+            }
+        } else
+            nameCode = filterUdiRelRequest.getNameCode();
+        if (StrUtil.isNotEmpty(nameCode)) {
+            filterUdiRelRequest.setNameCode(nameCode);
+        } else {
+            filterUdiRelRequest.setDiType(1);
+        }
+        List<BasicUdiRelResponse> udiDlDeviceResponse = basicUdiRelService.filtersList(filterUdiRelRequest);
+        PageInfo<BasicUdiRelResponse> basicUdiRelResponsePageInfo = new PageInfo<>(udiDlDeviceResponse);
+        PageSimpleResponse<BasicUdiRelResponse> basicUdiRelResponsePageSimpleResponse = new PageSimpleResponse<>();
+        basicUdiRelResponsePageSimpleResponse.setTotal(basicUdiRelResponsePageInfo.getTotal());
+        basicUdiRelResponsePageSimpleResponse.setList(udiDlDeviceResponse);
+        return ResultVOUtils.success(basicUdiRelResponsePageSimpleResponse);
+    }
+
 
     //产品信息关联新增
     @ApiIgnore

src/main/java/com/glxp/api/req/auth/FilterUserComapanyRequest.java

@@ -9,7 +9,7 @@ import lombok.Data;
 @ApiModel("查询用户企业请求类")
 public class FilterUserComapanyRequest extends ListPageRequest {
 
-    @ApiModelProperty(value = "查询键")
+    @ApiModelProperty(value = "关键字查询")
     private String searchKey;
 
     @ApiModelProperty(value = "企业ID")

src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java

@@ -80,7 +80,6 @@ public class BasicUdiRelResponse {
     private Integer isUseDy;
     @ApiModelProperty(value = "产品名称，通用名称")
     private String cpmctymc;
-    @ApiModelProperty(value = "产品类别")
     private String cplb;
     @ApiModelProperty(value = "分类编码")
     private String flbm;
@@ -131,7 +130,7 @@ public class BasicUdiRelResponse {
     private Boolean isNewest;
     @ApiModelProperty(value = "产品类型")
     private String cplx;
-    @ApiModelProperty(value = "耗材或者设备")
+    @ApiModelProperty(value = "产品类别")
     private String hchzsb;
     @ApiModelProperty(value = "是否为包类产品/组套类产品； 1 是 0 否")
     private String sfwblztlcp;
@@ -154,9 +153,9 @@ public class BasicUdiRelResponse {
     private Date agengtStartDate;
     @ApiModelProperty(value = "代理结束日期")
     private Date agengtEndDate;
-    @ApiModelProperty(value = "测量名称")
+    @ApiModelProperty(value = "计量单位")
     private String measname;
-    @ApiModelProperty(value = "制造商")
+    @ApiModelProperty(value = "生产企业")
     private String manufactory;
 
 

src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java

@@ -29,7 +29,7 @@ public class TraceOrderResponse {
     /**
      * 1:入库；2：出库
      */
-    @ApiModelProperty(value = "1:入库；2：出库")
+    @ApiModelProperty(value = "出入库类型1:入库；2：出库")
     private Integer inOutType;
     private Integer traceSource;
 
@@ -169,13 +169,18 @@ public class TraceOrderResponse {
     private String serialNo;
     @ApiModelProperty(value = "查询UDI码")
     private String udiCode;
+    @ApiModelProperty(value = "注册/备案证号")
     private String zczbhhzbapzbh;
     @ApiModelProperty(value = "查询记录号")
     private String recordCode;
-
+    @ApiModelProperty(value = "数量")
     private Integer count;
+    @ApiModelProperty(value = "库存数量")
+    private Integer invCount;
+
 
     //获取往来信息
+    @ApiModelProperty(value = "往来单位信息")
     private String fromToCorp;
 
     //获取往来单位