更换产品表实体类

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java

@@ -22,6 +22,7 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.sale.admin.entity.thrsys.*;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
 import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
 import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse;
@@ -214,7 +215,9 @@ public class SpsSyncUploadController {
                 List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities();
                 UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
                 for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
-                    mapper.insertUdiInfo(udiInfoEntity);
+                    UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
+                    BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
+                    mapper.insertUdiInfo(udiInfoRequest);
                 }
                 batchSession.commit();
             }

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java

@@ -14,6 +14,7 @@ import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.CombineRequest;
 import com.glxp.sale.admin.req.basic.RemoveRelRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
@@ -354,7 +355,9 @@ public class UdiContrastController {
         udiInfoEntity.setScbssfbhsxrq("是");
         udiInfoEntity.setScbssfbhxlh("否");
         udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
+        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+        udiInfoService.insertUdiInfo(udiInfoRequest);
     }
 
     public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) {

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -8,10 +8,7 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.config.WebSocketServer;
 import com.glxp.sale.admin.constant.ConstantStatus;
-import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
+import com.glxp.sale.admin.entity.basic.*;
-import com.glxp.sale.admin.entity.basic.FilterSysEntity;
-import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
-import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductEntity;
@@ -306,7 +303,7 @@ public class UdiRelevanceController {
             }
         }
 
-        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+        UdiInfoRequest udiInfoEntity = new UdiInfoRequest();
         udiInfoEntity.setSptm(udiRelevanceResponse.getSptm());
         udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm());
         udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname());
@@ -505,7 +502,7 @@ public class UdiRelevanceController {
                 String time = DateUtil.getDateTime();
                 udiRelevanceEntity.setUpdateTime(time);
                 udiRelevanceEntity.setModifyTime(time);
-                UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                UdiInfoRequest udiInfoEntity = new UdiInfoRequest();
                 udiInfoEntity.setYbbm(postSmpUdiInfoRequest.getYbbm());
                 udiInfoEntity.setSptm(postSmpUdiInfoRequest.getSptm());
                 BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoEntity);
@@ -690,19 +687,19 @@ public class UdiRelevanceController {
         }
         BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
         ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId());
-        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+        UdiInfoRequest UdiInfoRequest = new UdiInfoRequest();
-        BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity);
+        BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest);
-        udiInfoEntity.setNameCode(thrProductsEntity.getCode());
+        UdiInfoRequest.setNameCode(thrProductsEntity.getCode());
-        udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
+        UdiInfoRequest.setCpmctymc(thrProductsEntity.getName());
-        udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
+        UdiInfoRequest.setManufactory(thrProductsEntity.getManufactory());
-        udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
+        UdiInfoRequest.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
-        udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
+        UdiInfoRequest.setGgxh(thrProductsEntity.getSpec());
-        udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
+        UdiInfoRequest.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
-        udiInfoEntity.setUuid(CustomUtil.getUUId());
+        UdiInfoRequest.setUuid(CustomUtil.getUUId());
-        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+        UdiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
-        udiInfoEntity.setDiType(1);
+        UdiInfoRequest.setDiType(1);
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        udiInfoService.insertUdiInfo(UdiInfoRequest);
-        udiRelevanceEntity.setUuid(udiInfoEntity.getUuid());
+        udiRelevanceEntity.setUuid(UdiInfoRequest.getUuid());
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java

@@ -16,6 +16,7 @@ import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.basic.CombineRequest;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.req.basic.SupplementRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.req.inout.DeleteRequest;
 import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
@@ -30,7 +31,6 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService;
 import com.glxp.sale.admin.util.BeanUtils;
-import com.glxp.sale.admin.util.FilterUdiUtils;
 import com.glxp.sale.admin.util.SupplementVailUtil;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -186,22 +186,24 @@ public class ThrProductsAddDiController {
                 udiRelevanceEntity.setManufactory(thrProductsAddDiEntity.getManufactory());
 
                 UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid());
-                udiInfoEntity.setSptm(thrProductsAddDiResponse.getSptm());
+                UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
-                udiInfoEntity.setYbbm(thrProductsAddDiResponse.getYbbm());
+                BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
-                udiInfoEntity.setMeasname(thrProductsAddDiResponse.getMeasname());
+                udiInfoRequest.setSptm(thrProductsAddDiResponse.getSptm());
-                udiInfoEntity.setManufactory(thrProductsAddDiResponse.getManufactory());
+                udiInfoRequest.setYbbm(thrProductsAddDiResponse.getYbbm());
-                udiInfoEntity.setSpmc(thrProductsAddDiResponse.getSpmc());
+                udiInfoRequest.setMeasname(thrProductsAddDiResponse.getMeasname());
-                udiInfoEntity.setCpms(thrProductsAddDiResponse.getCpms());
+                udiInfoRequest.setManufactory(thrProductsAddDiResponse.getManufactory());
-                udiInfoEntity.setPrice(thrProductsAddDiResponse.getPrice());
+                udiInfoRequest.setSpmc(thrProductsAddDiResponse.getSpmc());
-                udiInfoEntity.setBasicPrductRemak1(thrProductsAddDiResponse.getBasicPrductRemak1());
+                udiInfoRequest.setCpms(thrProductsAddDiResponse.getCpms());
-                udiInfoEntity.setBasicPrductRemak2(thrProductsAddDiResponse.getBasicPrductRemak2());
+                udiInfoRequest.setPrice(thrProductsAddDiResponse.getPrice());
-                udiInfoEntity.setBasicPrductRemak3(thrProductsAddDiResponse.getBasicPrductRemak3());
+                udiInfoRequest.setBasicPrductRemak1(thrProductsAddDiResponse.getBasicPrductRemak1());
-                udiInfoEntity.setBasicPrductRemak4(thrProductsAddDiResponse.getBasicPrductRemak4());
+                udiInfoRequest.setBasicPrductRemak2(thrProductsAddDiResponse.getBasicPrductRemak2());
-                udiInfoEntity.setBasicPrductRemak5(thrProductsAddDiResponse.getBasicPrductRemak5());
+                udiInfoRequest.setBasicPrductRemak3(thrProductsAddDiResponse.getBasicPrductRemak3());
-                udiInfoEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
+                udiInfoRequest.setBasicPrductRemak4(thrProductsAddDiResponse.getBasicPrductRemak4());
-                udiInfoEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
+                udiInfoRequest.setBasicPrductRemak5(thrProductsAddDiResponse.getBasicPrductRemak5());
-                udiInfoEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
+                udiInfoRequest.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
-                udiInfoService.updateUdiInfo(udiInfoEntity);
+                udiInfoRequest.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
+                udiInfoRequest.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
+                udiInfoService.updateUdiInfo(udiInfoRequest);
 
 
                 udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);

api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java

@@ -1,8 +1,8 @@
 package com.glxp.sale.admin.dao.basic;
 
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
-import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -24,11 +24,11 @@ public interface UdiInfoDao {
 
     List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid);
 
-    boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);
+    boolean insertUdiInfo(UdiInfoRequest udiInfoEntity);
 
     boolean insertUdiInfos(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities);
 
-    boolean updateUdiInfo(UdiInfoEntity udiInfoEntity);
+    boolean updateUdiInfo(UdiInfoRequest udiInfoRequest);
 
     boolean deleteById(@Param("id") String id);
 

api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoRequest.java

@@ -0,0 +1,83 @@
+package com.glxp.sale.admin.req.basic;
+
+import lombok.Data;
+
+@Data
+public class UdiInfoRequest {
+    private Integer id;
+    private String nameCode;
+    private String packRatio;
+    private String packLevel;
+    private Integer bhxjsl;
+    private Integer bhzxxsbzsl;
+    private Integer zxxsbzbhsydysl;
+    private String bhxjcpbm;
+    private String sjcpbm;  //
+    private String bzcj;
+    private String addType;
+    private String deviceRecordKey;
+    private String cpmctymc;
+    private String cplb;
+    private String flbm;
+    private String ggxh;
+    private String qxlb;
+    private String tyshxydm;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String ylqxzcrbarywmc;
+    private String sydycpbs;
+    private String uuid;
+    private Integer versionNumber;
+    private Integer diType;
+    private String thirdId;
+    private String thirdName;
+    private String ybbm;
+    private String sptm;
+    private String manufactory;
+    private String measname;
+    private Integer productType;
+    private String scbssfbhph;
+    private String scbssfbhxlh;
+    private String scbssfbhscrq;
+    private String scbssfbhsxrq;
+    private String cpms;
+    private String spmc;
+    private String originUuid;
+
+    //本地生成信息
+    private String batchNo;
+    private String produceDate;
+    private String expireDate;
+    private String serialNo;
+    private String udi;
+    private String code;
+    private Integer count;
+    private String warehouseCode;
+    private String udplatCode;
+    private String relId;//关联ID主键
+    private Integer status;
+    private String supId;
+
+    private Boolean isCheck;
+    private boolean allowNoBatch;
+    private boolean allowNoExpire;
+    private boolean allowNoProduct;
+
+    private String price;
+    private String cplx;
+    private String hchzsb;
+
+    //产品代理商
+    private String cpdls;
+
+
+    private String basicPrductRemak1;
+    private String basicPrductRemak2;
+    private String basicPrductRemak3;
+    private String basicPrductRemak4;
+    private String basicPrductRemak5;
+    private String basicPrductRemak6;
+    private String basicPrductRemak7;
+    private String basicPrductRemak8;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiRelevanceRequest.java

@@ -0,0 +1,42 @@
+package com.glxp.sale.admin.req.basic;
+
+import lombok.Data;
+
+@Data
+public class UdiRelevanceRequest {
+
+    private String id;
+    private String thirdId;
+    private String thirdName;
+    private String uuid;
+    private Boolean isUseDy;
+    private String updateTime;
+    private String thirdId1;
+    private String thirdId2;
+    private String thirdId3;
+    private String thirdId4;
+    private String thirdName1;
+    private String thirdName2;
+    private String thirdName3;
+    private String thirdName4;
+    private String manufactory;
+    private String measname;
+    private String ybbm;
+    private String sptm;
+    private Boolean isDisable;
+    private Boolean isLock;
+    private String mainId;
+    private String mainName;
+    private Integer lockStatus;
+    private String udplatCode;
+    private Boolean isAdavence;
+    private String supName;
+    private String originUuid;
+    private String price;
+    private String modifyTime; //修改时间
+
+    private Boolean useMuti;      //是否多次使用
+    private Integer useNum;     //最小包装单元可使用次数
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java

@@ -11,6 +11,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.CombineRequest;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.service.thrsys.ThrProductsService;
 import com.glxp.sale.admin.thread.UdiDlHttpClient;
@@ -171,7 +172,9 @@ public class UdiContrastService {
         udiInfoEntity.setScbssfbhsxrq("是");
         udiInfoEntity.setScbssfbhxlh("否");
         udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
+        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+        udiInfoService.insertUdiInfo(udiInfoRequest);
     }
 
     public long createOnlyUuid(CombineRequest combineRequest, String key) {

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java

@@ -3,6 +3,7 @@ package com.glxp.sale.admin.service.basic;
 
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,11 +28,11 @@ public interface UdiInfoService {
 
     List<UdiInfoEntity> findByUuids(String uuid);
 
-    boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);
+    boolean insertUdiInfo(UdiInfoRequest udiInfoRequest);
 
     boolean insertUdiInfos(List<UdiInfoEntity> udiInfoEntities);
 
-    boolean updateUdiInfo(UdiInfoEntity udiInfoEntity);
+    boolean updateUdiInfo(UdiInfoRequest udiInfoRequest);
 
     boolean deleteById(String id);
 

api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java

@@ -11,12 +11,14 @@ import com.glxp.sale.admin.entity.basic.UdiInfoImportDetailEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse;
 import com.glxp.sale.admin.service.basic.UdiInfoImportDetailService;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.TransactionIsolationLevel;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -100,7 +102,9 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
                 List<UdiInfoEntity> corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities();
                 UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
                 for (UdiInfoEntity basicUnitMaintainEntity : corpList) {
-                    mapper.insertUdiInfo(basicUnitMaintainEntity);
+                    UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
+                    BeanUtils.copyProperties(basicUnitMaintainEntity, udiInfoRequest);
+                    mapper.insertUdiInfo(udiInfoRequest);
                 }
                 batchSession.commit();
             }

api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java

@@ -5,8 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.basic.UdiInfoDao;
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
-import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.util.FilterUdiUtils;
@@ -92,8 +92,8 @@ public class UdiInfoServiceImpl implements UdiInfoService {
     }
 
     @Override
-    public boolean insertUdiInfo(UdiInfoEntity udiInfoEntity) {
+    public boolean insertUdiInfo(UdiInfoRequest udiInfoRequest) {
-        return udiInfoDao.insertUdiInfo(udiInfoEntity);
+        return udiInfoDao.insertUdiInfo(udiInfoRequest);
     }
 
     @Override
@@ -102,10 +102,10 @@ public class UdiInfoServiceImpl implements UdiInfoService {
     }
 
     @Override
-    public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) {
+    public boolean updateUdiInfo(UdiInfoRequest udiInfoRequest) {
-        if (StrUtil.isEmpty(udiInfoEntity.getUuid()))
+        if (StrUtil.isEmpty(udiInfoRequest.getUuid()))
             return false;
-        return udiInfoDao.updateUdiInfo(udiInfoEntity);
+        return udiInfoDao.updateUdiInfo(udiInfoRequest);
     }
 
     @Override

api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java

@@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.httpclient.ErpBasicClient;
 import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest;
 import com.glxp.sale.admin.req.basic.SpsSyncDataRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.*;
@@ -89,7 +90,7 @@ public class BasicBackUpdateProductService {
                     inventoryCodes.add(invmandocResponse.getCode());
                     erpProductsMap.put(invmandocResponse.getCode(), invmandocResponse);
                     if (isUpdate.getParamValue().equals("1")) {//不根据库存信息过滤
-                        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                        UdiInfoRequest udiInfoEntity = new UdiInfoRequest();
                         udiInfoEntity.setNameCode(invmandocResponse.getCode());
                         udiInfoEntity.setCpmctymc(invmandocResponse.getName());
                         udiInfoEntity.setGgxh(invmandocResponse.getSpec());
@@ -191,7 +192,7 @@ public class BasicBackUpdateProductService {
                 if (udiRelevanceEntity == null) {
                     if (isUpdate.getParamValue().equals("1")) {
 
-                        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                        UdiInfoRequest udiInfoEntity = new UdiInfoRequest();
                         udiInfoEntity.setNameCode(thrProductsEntity.getCode());
                         udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
                         udiInfoEntity.setGgxh(thrProductsEntity.getSpec());

api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java

@@ -8,6 +8,7 @@ import com.glxp.sale.admin.entity.basic.*;
 import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.basic.*;
@@ -112,7 +113,9 @@ public class BasicUdiInfoImportService {
                             udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
                             udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
                             udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
-                            udiInfoService.insertUdiInfo(udiInfoEntity);
+                            UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
+                            BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+                            udiInfoService.insertUdiInfo(udiInfoRequest);
 
                         } else {
                             udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL);

api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java

@@ -13,6 +13,7 @@ import com.glxp.sale.admin.httpclient.ErpBasicClient;
 import com.glxp.sale.admin.req.basic.CombineRequest;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.ErpProductsResponse;
@@ -92,7 +93,9 @@ public class BasicUpdateProductService {
                         udiInfoEntity.setUuid(CustomUtil.getUUId());
                         udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
                         udiInfoEntity.setDiType(1);
-                        udiInfoService.insertUdiInfo(udiInfoEntity);
+                        UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
+                        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+                        udiInfoService.insertUdiInfo(udiInfoRequest);
                     }
                     udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
                     udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
@@ -168,7 +171,9 @@ public class BasicUpdateProductService {
                         udiInfoEntity.setUuid(CustomUtil.getUUId());
                         udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
                         udiInfoEntity.setDiType(1);
-                        udiInfoService.insertUdiInfo(udiInfoEntity);
+                        UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
+                        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+                        udiInfoService.insertUdiInfo(udiInfoRequest);
                     }
                     udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
                     udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());

api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java

@@ -1,16 +1,15 @@
 package com.glxp.sale.admin.thread;
 
 import cn.hutool.core.util.StrUtil;
-import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.req.basic.SupplementRequest;
 import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoRequest;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.sale.admin.util.BeanUtils;
-import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -40,13 +39,13 @@ public class CompanyProductsRelService {
                     if (udiRelevanceEntity != null && StrUtil.isNotBlank(udiRelevanceEntity.getPrice())) {
                         companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice()));
                     }
-                    UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                    UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
-                    udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
+                    udiInfoRequest.setUuid(udiRelevanceEntity.getUuid());
                     SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest();
-                    BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoEntity);
+                    BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest);
                     BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity);
                     udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
-                    udiInfoService.updateUdiInfo(udiInfoEntity);
+                    udiInfoService.updateUdiInfo(udiInfoRequest);
                     companyProductRelevanceEntity.setCreate_time(new Date());
                     companyProductRelevanceEntity.setUpdate_time(new Date());
                     companyProductRelevanceEntity.setAuditStatus("3");

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -127,7 +127,7 @@
                   nameCode = #{nameCode}) limit 1
     </select>
 
-    <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
+    <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.sale.admin.req.basic.UdiInfoRequest">
         replace
         INTO basic_products
         (id,
@@ -232,7 +232,7 @@
         WHERE uuid = #{uuid}
     </delete>
 
-    <update id="updateUdiInfo" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
+    <update id="updateUdiInfo" parameterType="com.glxp.sale.admin.req.basic.UdiInfoRequest">
         UPDATE basic_products
         <trim prefix="set" suffixOverrides=",">
             <if test="packRatio != null">packRatio=#{packRatio},</if>