UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

产品信息编辑问题

Browse Source
busUser
anthonywj 3 years ago
parent eec0635f8c
commit 038d541b65
16 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File

4
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
Unescape Escape View File

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

12
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java
Unescape Escape View File

@ -14,7 +14,7 @@ import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.RemoveRelRequest; import com.glxp.sale.admin.req.basic.RemoveRelRequest;
import com.glxp.sale.admin.req.basic.UdiInfoReqeust; import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
@ -157,11 +157,11 @@ public class UdiContrastController {
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
UdiInfoReqeust udiInfoReqeust = new UdiInfoReqeust(); UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoReqeust); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.updateUdiInfo(udiInfoReqeust); udiInfoService.updateUdiInfo(udiInfoRequest);
} }
udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); // udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
String time = DateUtil.formatDateTime(new Date()); String time = DateUtil.formatDateTime(new Date());
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
@ -364,7 +364,7 @@ public class UdiContrastController {
udiInfoEntity.setScbssfbhsxrq("是"); udiInfoEntity.setScbssfbhsxrq("是");
udiInfoEntity.setScbssfbhxlh("否"); udiInfoEntity.setScbssfbhxlh("否");
udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
UdiInfoReqeust udiInfoRequest = new UdiInfoReqeust(); UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.insertUdiInfo(udiInfoRequest); udiInfoService.insertUdiInfo(udiInfoRequest);
} }

105
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -8,10 +8,7 @@ import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.config.WebSocketServer; import com.glxp.sale.admin.config.WebSocketServer;
import com.glxp.sale.admin.constant.ConstantStatus; 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.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity;
@ -280,52 +277,58 @@ public class UdiRelevanceController {
return ResultVOUtils.error(500, vailResult); return ResultVOUtils.error(500, vailResult);
} }
//判断父id不为空就吧值给到id里面防止id变成详情id
if (udiRelevanceResponse.getPid() != null) {
udiRelevanceResponse.setId(udiRelevanceResponse.getPid());
}
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); //更新关联表相关信息
BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity); UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
udiRelevanceEntity.setId(udiRelevanceResponse.getId() + ""); BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceRequest);
udiRelevanceRequest.setId(udiRelevanceResponse.getId() + "");
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceRequest.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceRequest.setModifyTime(time);
if (udiRelevanceResponse.getIsUseDy() == 1) { if (udiRelevanceResponse.getIsUseDy() == 1) {
udiRelevanceEntity.setIsUseDy(true); udiRelevanceRequest.setIsUseDy(true);
} else udiRelevanceEntity.setIsUseDy(false); } else udiRelevanceRequest.setIsUseDy(false);
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
if (!customerId.equals("110")) { if (!customerId.equals("110")) {
if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { if (StrUtil.isNotEmpty(udiRelevanceRequest.getPrice())) {
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceEntity.getId(), customerId + ""); //更新供应商关联表相关信息
companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceRequest.getId(), customerId + "");
companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceRequest.getPrice()));
companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity); companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity);
} }
} }
UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust(); //更新产品信息表相关产品信息
udiInfoEntity.setSptm(udiRelevanceResponse.getSptm()); UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
udiInfoEntity.setNameCode(udiRelevanceResponse.getNameCode()); udiInfoRequest.setNameCode(udiRelevanceResponse.getNameCode());
udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm()); udiInfoRequest.setSptm(udiRelevanceResponse.getSptm());
udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname()); udiInfoRequest.setYbbm(udiRelevanceResponse.getYbbm());
udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory()); udiInfoRequest.setMeasname(udiRelevanceResponse.getMeasname());
udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); udiInfoRequest.setManufactory(udiRelevanceResponse.getManufactory());
udiInfoEntity.setPrice(udiRelevanceResponse.getPrice()); udiInfoRequest.setCpms(udiRelevanceResponse.getCpms());
udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc()); // udiInfoRequest.setDiType(udiRelevanceResponse.getDiType());
udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch()); udiInfoRequest.setPrice(udiRelevanceResponse.getPrice());
udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire()); udiInfoRequest.setSpmc(udiRelevanceResponse.getSpmc());
udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct()); udiInfoRequest.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); udiInfoRequest.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); udiInfoRequest.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());
udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); udiInfoRequest.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl());
udiInfoEntity.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4()); udiInfoRequest.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
udiInfoEntity.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5()); udiInfoRequest.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
udiInfoEntity.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6()); udiInfoRequest.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());
udiInfoEntity.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7()); udiInfoRequest.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4());
udiInfoEntity.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8()); udiInfoRequest.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5());
udiInfoRequest.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6());
udiInfoRequest.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7());
udiInfoRequest.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8());
if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) { if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) {
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); udiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
} }
udiInfoEntity.setUuid(udiRelevanceResponse.getUuid()); udiInfoRequest.setUuid(udiRelevanceResponse.getUuid());
udiInfoService.updateUdiInfo(udiInfoEntity); udiInfoService.updateUdiInfo(udiInfoRequest);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success("更新成功");
} }
@ -503,12 +506,12 @@ public class UdiRelevanceController {
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
UdiInfoReqeust udiInfoReqeust = new UdiInfoReqeust(); UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
udiInfoReqeust.setYbbm(postSmpUdiInfoRequest.getYbbm()); udiInfoRequest.setYbbm(postSmpUdiInfoRequest.getYbbm());
udiInfoReqeust.setSptm(postSmpUdiInfoRequest.getSptm()); udiInfoRequest.setSptm(postSmpUdiInfoRequest.getSptm());
BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoReqeust); BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoRequest);
udiInfoReqeust.setUuid(udiRelevanceEntity.getUuid()); udiInfoRequest.setUuid(udiRelevanceEntity.getUuid());
udiInfoService.insertUdiInfo(udiInfoReqeust); udiInfoService.insertUdiInfo(udiInfoRequest);
udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
} }
@ -688,7 +691,7 @@ public class UdiRelevanceController {
} }
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId()); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId());
UdiInfoReqeust UdiInfoRequest = new UdiInfoReqeust(); UdiInfoRequest UdiInfoRequest = new UdiInfoRequest();
BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest); BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest);
UdiInfoRequest.setNameCode(thrProductsEntity.getCode()); UdiInfoRequest.setNameCode(thrProductsEntity.getCode());
UdiInfoRequest.setCpmctymc(thrProductsEntity.getName()); UdiInfoRequest.setCpmctymc(thrProductsEntity.getName());
@ -704,8 +707,8 @@ public class UdiRelevanceController {
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
return ResultVOUtils.success("解除绑定成功！"); return ResultVOUtils.success("解除绑定成功！");
} }
@ -726,8 +729,8 @@ public class UdiRelevanceController {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setId(id); udiRelevanceEntity.setId(id);
udiRelevanceEntity.setLockStatus(lockUdiRequest.getLockStatus()); udiRelevanceEntity.setLockStatus(lockUdiRequest.getLockStatus());
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
} }
return ResultVOUtils.success("更新成功！"); return ResultVOUtils.success("更新成功！");

3
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java
Unescape Escape View File

@ -28,7 +28,6 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService; import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService;
import com.glxp.sale.admin.util.BeanUtils; 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.admin.util.SupplementVailUtil;
import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.res.BaseResponse;
@ -184,7 +183,7 @@ public class ThrProductsAddDiController {
udiRelevanceEntity.setManufactory(thrProductsAddDiEntity.getManufactory()); udiRelevanceEntity.setManufactory(thrProductsAddDiEntity.getManufactory());
UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid()); UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid());
UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest); BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
udiInfoRequest.setSptm(thrProductsAddDiResponse.getSptm()); udiInfoRequest.setSptm(thrProductsAddDiResponse.getSptm());
udiInfoRequest.setYbbm(thrProductsAddDiResponse.getYbbm()); udiInfoRequest.setYbbm(thrProductsAddDiResponse.getYbbm());

7
api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java
Unescape Escape View File

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

2
api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoReqeust.java → api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoRequest.java
Unescape Escape View File

@ -4,7 +4,7 @@ package com.glxp.sale.admin.req.basic;
import lombok.Data; import lombok.Data;
@Data @Data
public class UdiInfoReqeust { public class UdiInfoRequest {
private Integer id; private Integer id;
private String nameCode; private String nameCode;

4
api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -85,7 +85,9 @@ public class UdiRelevanceResponse {
private String basicPrductRemak6; private String basicPrductRemak6;
private String basicPrductRemak7; private String basicPrductRemak7;
private String basicPrductRemak8; private String basicPrductRemak8;
private Boolean useMuti; //是否多次使用
private Integer useNum; //最小包装单元可使用次数
private Integer pid; //用来存父id
//产品代理商 //产品代理商
private String cpdls; private String cpdls;

4
api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java
Unescape Escape View File

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

6
api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java
Unescape Escape View File

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

4
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java
Unescape Escape View File

@ -11,7 +11,7 @@ import com.glxp.sale.admin.entity.basic.UdiInfoImportDetailEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.sale.admin.req.basic.UdiInfoReqeust; import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse;
import com.glxp.sale.admin.service.basic.UdiInfoImportDetailService; import com.glxp.sale.admin.service.basic.UdiInfoImportDetailService;
import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.ExecutorType;
@ -102,7 +102,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
List<UdiInfoEntity> corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities(); List<UdiInfoEntity> corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities();
UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
for (UdiInfoEntity basicUnitMaintainEntity : corpList) { for (UdiInfoEntity basicUnitMaintainEntity : corpList) {
UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(basicUnitMaintainEntity, udiInfoRequest); BeanUtils.copyProperties(basicUnitMaintainEntity, udiInfoRequest);
mapper.insertUdiInfo(udiInfoRequest); mapper.insertUdiInfo(udiInfoRequest);
} }

7
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java
Unescape Escape View File

@ -5,9 +5,8 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.dao.basic.UdiInfoDao; import com.glxp.sale.admin.dao.basic.UdiInfoDao;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity; 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.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiInfoReqeust; import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.admin.util.FilterUdiUtils;
@ -93,7 +92,7 @@ public class UdiInfoServiceImpl implements UdiInfoService {
} }
@Override @Override
public boolean insertUdiInfo(UdiInfoReqeust udiInfoRequest) { public boolean insertUdiInfo(UdiInfoRequest udiInfoRequest) {
return udiInfoDao.insertUdiInfo(udiInfoRequest); return udiInfoDao.insertUdiInfo(udiInfoRequest);
} }
@ -103,7 +102,7 @@ public class UdiInfoServiceImpl implements UdiInfoService {
} }
@Override @Override
public boolean updateUdiInfo(UdiInfoReqeust udiInfoRequest) { public boolean updateUdiInfo(UdiInfoRequest udiInfoRequest) {
if (StrUtil.isEmpty(udiInfoRequest.getUuid())) if (StrUtil.isEmpty(udiInfoRequest.getUuid()))
return false; return false;
return udiInfoDao.updateUdiInfo(udiInfoRequest); return udiInfoDao.updateUdiInfo(udiInfoRequest);

6
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java
Unescape Escape View File

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

4
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java
Unescape Escape View File

@ -8,7 +8,7 @@ import com.glxp.sale.admin.entity.basic.*;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.sale.admin.req.basic.UdiInfoReqeust; import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
@ -114,7 +114,7 @@ public class BasicUdiInfoImportService {
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.insertUdiInfo(udiInfoRequest); udiInfoService.insertUdiInfo(udiInfoRequest);

6
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java
Unescape Escape View File

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

6
api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java
Unescape Escape View File

@ -1,18 +1,16 @@
package com.glxp.sale.admin.thread; package com.glxp.sale.admin.thread;
import cn.hutool.core.util.StrUtil; 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.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.SupplementRequest;
import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
import com.glxp.sale.admin.req.basic.UdiInfoReqeust; import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.util.BeanUtils; import com.glxp.sale.admin.util.BeanUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -42,7 +40,7 @@ public class CompanyProductsRelService {
if (udiRelevanceEntity != null && StrUtil.isNotBlank(udiRelevanceEntity.getPrice())) { if (udiRelevanceEntity != null && StrUtil.isNotBlank(udiRelevanceEntity.getPrice())) {
companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice()));
} }
UdiInfoReqeust udiInfoRequest = new UdiInfoReqeust(); UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
udiInfoRequest.setUuid(udiRelevanceEntity.getUuid()); udiInfoRequest.setUuid(udiRelevanceEntity.getUuid());
SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest();
BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest); BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest);

4
api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save