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

第三方产品信息选入

Browse Source
dev_no_inv
yewj 10 months ago
parent 9a9ae6dd51
commit 177a2651dd
2 changed files with 93 additions and 82 deletions
Show Stats Download Patch File Download Diff File

115
src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.basic; package com.glxp.api.service.basic;
import com.glxp.api.exception.JsonException;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
@ -171,6 +172,8 @@ public class BasicBackUpdateProductService {
return -1; return -1;
} }
@Resource
UdiContrastService udiContrastService;
//定时或一键下载更新本地所有产品信息 //定时或一键下载更新本地所有产品信息
@Async @Async
@ -185,65 +188,71 @@ public class BasicBackUpdateProductService {
filterThrInvProductsRequest.setPage(null); filterThrInvProductsRequest.setPage(null);
List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts(filterThrInvProductsRequest); List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts(filterThrInvProductsRequest);
SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type"); // SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type");
if (isEnable == null || isEnable == false) { // if (isEnable == null || isEnable == false) {
isUpdate.setParamValue("1"); // isUpdate.setParamValue("1");
} // }
if (thrProductsEntities != null && thrProductsEntities.size() > 0) { if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { for (ThrProductsEntity thrProductsEntity : thrProductsEntities) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), thirdSysId); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), thirdSysId);
if (udiRelevanceEntity == null) { if (udiRelevanceEntity == null) {
if (isUpdate.getParamValue().equals("1")) { // if (isUpdate.getParamValue().equals("1")) {
//
UdiProductEntity udiProductEntity = new UdiProductEntity(); // UdiProductEntity udiProductEntity = new UdiProductEntity();
udiProductEntity.setNameCode(thrProductsEntity.getCode()); // udiProductEntity.setNameCode(thrProductsEntity.getCode());
udiProductEntity.setCpmctymc(thrProductsEntity.getName()); // udiProductEntity.setCpmctymc(thrProductsEntity.getName());
udiProductEntity.setGgxh(thrProductsEntity.getSpec()); // udiProductEntity.setGgxh(thrProductsEntity.getSpec());
udiProductEntity.setUuid(CustomUtil.getUUId()); // udiProductEntity.setUuid(CustomUtil.getUUId());
udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); // udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiProductEntity.setDiType(1); // udiProductEntity.setDiType(1);
udiProductEntity.setManufactory(thrProductsEntity.getManufactory()); // udiProductEntity.setManufactory(thrProductsEntity.getManufactory());
udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); // udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); // udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiProductService.insertUdiInfo(udiProductEntity); // udiProductEntity.setRequireScanCode(0);
UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); // udiProductService.insertUdiInfo(udiProductEntity);
udiRelevanceEntity1.setUuid(udiProductEntity.getUuid()); // UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
udiRelevanceEntity1.setIsDisable(false); // udiRelevanceEntity1.setUuid(udiProductEntity.getUuid());
udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName()); // udiRelevanceEntity1.setIsDisable(false);
// udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName());
if ("thirdId".equals(thirdSysId)) { //
udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode()); // if ("thirdId".equals(thirdSysId)) {
} else if ("thirdId1".equals(thirdSysId)) { // udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdId1(thrProductsEntity.getCode()); // } else if ("thirdId1".equals(thirdSysId)) {
} else if ("thirdId2".equals(thirdSysId)) { // udiRelevanceEntity1.setThirdId1(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode()); // } else if ("thirdId2".equals(thirdSysId)) {
} else if ("thirdId3".equals(thirdSysId)) { // udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdId3(thrProductsEntity.getCode()); // } else if ("thirdId3".equals(thirdSysId)) {
} else if ("thirdId4".equals(thirdSysId)) { // udiRelevanceEntity1.setThirdId3(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode()); // } else if ("thirdId4".equals(thirdSysId)) {
} // udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode());
// }
//
ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); //
String mainSys = thrSystemEntity.getThirdId(); // ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
if (mainSys.equals("thirdId")) { // String mainSys = thrSystemEntity.getThirdId();
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); // if (mainSys.equals("thirdId")) {
} else if (mainSys.equals("thirdId1")) { // udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId());
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); // } else if (mainSys.equals("thirdId1")) {
} else if (mainSys.equals("thirdId2")) { // udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1());
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); // } else if (mainSys.equals("thirdId2")) {
} else if (mainSys.equals("thirdId3")) { // udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2());
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); // } else if (mainSys.equals("thirdId3")) {
} else if (mainSys.equals("thirdId4")) { // udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3());
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); // } else if (mainSys.equals("thirdId4")) {
} // udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4());
// }
//
// udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
// udiRelevanceEntity1.setUpdateTime(new Date());
// udiRelevanceEntity1.setModifyTime(new Date());
// udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
// udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
// }
try {
udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
} catch (JsonException e) {
udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity1.setUpdateTime(new Date());
udiRelevanceEntity1.setModifyTime(new Date());
udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
} }
} }

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

@ -284,6 +284,7 @@ public class UdiContrastService {
if (!aBoolean) { if (!aBoolean) {
throw new JsonException(500, "系统繁忙"); throw new JsonException(500, "系统繁忙");
} }
return;
} }
int packLevel = 1; // 初始化计数器 int packLevel = 1; // 初始化计数器
//循环插入 //循环插入
@ -296,7 +297,7 @@ public class UdiContrastService {
// udiProductEntity.setPrepnSpec(basicInsDrug.getPrepnSpec() != null ? basicInsDrug.getPrepnSpec() :basicInsDrugEntity.getPrepnSpec()); // udiProductEntity.setPrepnSpec(basicInsDrug.getPrepnSpec() != null ? basicInsDrug.getPrepnSpec() :basicInsDrugEntity.getPrepnSpec());
udiProductEntity.setZczbhhzbapzbh(basicInsDrug.getApprovalNum() != null ? basicInsDrug.getApprovalNum() : basicInsDrugEntity.getApprovalNum()); udiProductEntity.setZczbhhzbapzbh(basicInsDrug.getApprovalNum() != null ? basicInsDrug.getApprovalNum() : basicInsDrugEntity.getApprovalNum());
udiProductEntity.setCpmctymc(thrProductsEntity.getName()); udiProductEntity.setCpmctymc(thrProductsEntity.getName());
if (basicInsDrugEntity.getInsuranceDrugClass() != null){ if (basicInsDrugEntity != null && basicInsDrugEntity.getInsuranceDrugClass() != null) {
udiProductEntity.setMedicareType(setMedicareType(basicInsDrugEntity.getInsuranceDrugClass())); udiProductEntity.setMedicareType(setMedicareType(basicInsDrugEntity.getInsuranceDrugClass()));
} }
//最小产品单位 //最小产品单位
@ -374,6 +375,7 @@ public class UdiContrastService {
if (!aBoolean) { if (!aBoolean) {
throw new JsonException(500, "系统繁忙,"); throw new JsonException(500, "系统繁忙,");
} }
return;
// UdiProductEntity udiProductEntity = new UdiProductEntity(); // UdiProductEntity udiProductEntity = new UdiProductEntity();
// BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); // BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
// if (thrProductsEntity.getProductType() != 2){ // if (thrProductsEntity.getProductType() != 2){

Write Preview
Loading…
Cancel
Save