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

Merge remote-tracking branch 'origin/master'

Browse Source
master
anthonywj 2 years ago
parent d730b5c084 a2944efa3e
commit 8a9607f690
11 changed files with 163 additions and 77 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -317,6 +317,7 @@ public class UdiRelevanceController extends BaseController {
udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch());
udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire());
udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());
udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoSerial());
udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum());
udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1());
udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2());

10
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -47,6 +47,7 @@ public class UdiProductEntity {
private Boolean allowNoBatch;
private Boolean allowNoExpire;
private Boolean allowNoProduct;
private Boolean allowNoSerial;
private String spmc;
private String cplx;
private String hchzsb;
@ -78,6 +79,9 @@ public class UdiProductEntity {
private String supId;
private Integer relSupId;
public Boolean getAllowNoBatch() {
if (allowNoBatch == null)
return false;
@ -96,5 +100,11 @@ public class UdiProductEntity {
return allowNoProduct;
}
public Boolean getAllowNoSerial() {
if (allowNoSerial == null)
return false;
return allowNoSerial;
}
}

7
src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
Unescape Escape View File

@ -12,6 +12,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String cpmctymc;
private String nameCode;
private String uuid;
private String originUuid;
private String ggxh;
private String thirdId;
private Long id;
@ -56,12 +57,16 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String uniqueNameCode;
private String supName;
private String unitFk;
private String originUuid;
private String relId;
private String companyName;
private String bindRlIds;
private String relCode;
private String bindType;
private String certIdFk;
private String manufactory;
private String tyshxydm;
private Boolean dispatch;
private Boolean groupBuy;
}

9
src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
Unescape Escape View File

@ -70,6 +70,7 @@ public class UdiRelevanceSaveRequest {
private Boolean allowNoBatch;
private Boolean allowNoExpire;
private Boolean allowNoProduct;
private Boolean allowNoSerial;
private String spmc;
private String cplx;
private String hchzsb;
@ -85,17 +86,19 @@ public class UdiRelevanceSaveRequest {
private String price;
private Integer useExpireTime;
//关联修改提交:true;单独提交:false
private Boolean relSubmit;
private Integer lowStockNum;
private Integer overStockNum;
private Integer recentDateTime;
private Integer isDateBy;
private String relCode;
//关联修改提交:true;单独提交:false
private Boolean relSubmit;
private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品
private boolean needCert; //是否需要资质材料
private String certIdFk;
}

48
src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -8,9 +9,12 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao;
import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.http.ErpBasicClient;
import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest;
import com.glxp.api.req.thrsys.FilterThrBusTypeOriginRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.thrsys.ThrBusTypeOriginResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.thrsys.IThrBusTypeOriginService;
@ -163,14 +167,52 @@ public class ThrBusTypeOriginServiceImpl implements IThrBusTypeOriginService {
public BaseResponse downloadThrBusType(ThrSystemDetailEntity thrSystemDetailEntity) {
int page = 1;
int limit = 100;
/*while (true) {
while (true) {
FilterBasicThirdSysDetailRequest request = new FilterBasicThirdSysDetailRequest();
request.setPage(page);
request.setLimit(limit);
request.setThirdSysFk(thrSystemDetailEntity.getThirdSysFk());
erpBasicClient.getBusTypes(request);
}*/
BaseResponse<PageSimpleResponse<ThrSystemBusApiEntity>> baseResponse = erpBasicClient.getBusTypes(request);
if (baseResponse.getCode() == 20000) {
List<ThrSystemBusApiEntity> list = baseResponse.getData().getList();
list.forEach(item -> {
ThrBusTypeOriginEntity thrBusTypeOriginEntity = thrBusTypeOriginDao.selectOne(new QueryWrapper<ThrBusTypeOriginEntity>().eq("code", item.getCode()).eq("thirdSys", thrSystemDetailEntity.getThirdSysFk()));
if (null == thrBusTypeOriginEntity) {
thrBusTypeOriginEntity = new ThrBusTypeOriginEntity();
BeanUtil.copyProperties(item, thrBusTypeOriginEntity);
thrBusTypeOriginEntity.setUpdateTime(new Date());
thrBusTypeOriginEntity.setThirdSys(thrBusTypeOriginEntity.getThirdSys());
thrBusTypeOriginDao.insertBusOriginType(thrBusTypeOriginEntity);
} else {
boolean isChange = verifyDataChange(thrBusTypeOriginEntity, item);
if (isChange) {
thrBusTypeOriginDao.updateById(thrBusTypeOriginEntity);
}
}
});
if (list.size() >= limit) {
page++;
} else {
break;
}
} else {
log.error("下载第三方系统单据类型异常", baseResponse.getMessage());
return ResultVOUtils.error(500, "下载第三方系统单据类型异常");
}
}
return ResultVOUtils.success("下载完成");
}
/**
* 校验拉取的第三方数据是否有更新
*
* @param thrBusTypeOriginEntity
* @param thrSystemBusApi
* @return
*/
private boolean verifyDataChange(ThrBusTypeOriginEntity thrBusTypeOriginEntity, ThrSystemBusApiEntity thrSystemBusApi) {
return false;
}
}

2
src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java
Unescape Escape View File

@ -118,7 +118,7 @@ public class ThrCorpServiceImpl implements ThrCorpService {
if (baseResponse.getCode() == 20000) {
List<ThrCorpsResponse> list = baseResponse.getData().getList();
list.parallelStream().forEach(thrCorpsResponse -> {
list.forEach(thrCorpsResponse -> {
ThrCorpEntity thrCorpEntity = thrCorpDao.selectByUnitIdAndThirdId(thrCorpsResponse.getUnitId(), thrSystemDetailEntity.getThirdSysFk());
if (null == thrCorpEntity) {
thrCorpEntity = new ThrCorpEntity();

2
src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java
Unescape Escape View File

@ -142,7 +142,7 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>> baseResponse = erpBasicClient.getWarehouse(udiwmsWarehouseRequest);
if (baseResponse.getCode() == 20000) {
List<UdiwmsWarehouseDetail> list = baseResponse.getData().getList();
list.parallelStream().forEach(udiwmsWarehouseDetail -> {
list.forEach(udiwmsWarehouseDetail -> {
//查询此编码对应的仓库是否存在，若不存在，则直接插入，存在则判断数据是否有更新，有更新则更新此数据
ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCodeAndThirdId(udiwmsWarehouseDetail.getCode(), thrSystemDetailEntity.getThirdSysFk());
if (null == thrInvWarehouseEntity) {

1
src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
Unescape Escape View File

@ -139,6 +139,7 @@ public class ThrProductsServiceImpl implements ThrProductsService {
list.forEach(item -> {
ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
BeanUtil.copyProperties(item, thrProductsEntity);
thrProductsEntity.setSpec(thrProductsEntity.getStandard()); //复制规格型号值
thrProductsEntity.setThirdSysFk(postThrProductsRequest.getThirdSys());
thrProductsEntity.setCreateTime(DateUtil.date(new Date()));
thrProductsEntity.setUpdateTime(DateUtil.date(new Date()));

3
src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
Unescape Escape View File

@ -301,6 +301,9 @@
<if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
<if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
<if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
<if test="allowNoSerial != null">
allowNoSerial=#{allowNoSerial},
</if>
<if test="spmc != null">spmc=#{spmc},</if>
<if test="cplx != null">cplx=#{cplx},</if>
<if test="hchzsb != null">hchzsb=#{hchzsb},</if>

154
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -251,59 +251,62 @@
<select id="filterUdiGp" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,
basic_products.originUuid,
basic_products.nameCode,
basic_products.deviceRecordKey,
basic_products.packRatio,
basic_products.packUnit,
basic_products.packLevel,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.ybbm,
basic_products.sptm,
basic_products.manufactory,
basic_products.measname,
basic_products.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
basic_products.cpdls,
basic_products.price,
basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
bht.name classifyName,
basic_products.originUuid,
basic_products.nameCode,
basic_products.deviceRecordKey,
basic_products.packRatio,
basic_products.packUnit,
basic_products.packLevel,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.ybbm,
basic_products.sptm,
basic_products.manufactory,
basic_products.measname,
basic_products.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
basic_products.cpdls,
basic_products.price,
basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
left join basic_hosp_type bht on basic_udirel.relCode = bht.code
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -312,8 +315,8 @@
AND relCode = #{relCode}
</if>
<if test="bindType != '' and bindType != null">
AND relCode is null
or trim(relCode) = ''
AND (relCode is null
or trim(relCode) = '')
</if>
<if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%')
@ -329,19 +332,19 @@
</if>
<if test="unionCode != '' and unionCode != null">
and (
nameCode LIKE concat('%', #{unionCode}, '%')
or ybbm LIKE concat('%', #{unionCode}, '%')
or sptm LIKE concat('%', #{unionCode}, '%'))
nameCode LIKE concat('%', #{unionCode}, '%')
or ybbm LIKE concat('%', #{unionCode}, '%')
or sptm LIKE concat('%', #{unionCode}, '%'))
</if>
<if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
</if>
<if test="thrPiId != '' and thrPiId != null">
and (thirdId LIKE concat('%', #{thrPiId}, '%')
or thirdId1 LIKE concat('%', #{thrPiId}, '%')
or thirdId2 LIKE concat('%', #{thrPiId}, '%')
or thirdId3 LIKE concat('%', #{thrPiId}, '%')
or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
or thirdId1 LIKE concat('%', #{thrPiId}, '%')
or thirdId2 LIKE concat('%', #{thrPiId}, '%')
or thirdId3 LIKE concat('%', #{thrPiId}, '%')
or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
</if>
<if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid}
@ -360,31 +363,31 @@
</if>
<if test="filterType != null and filterType == 1">
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
and basic_products.originUuid <![CDATA[<>]]> ''
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 2">
AND basic_products.originUuid is NULL
</if>
<if test="filterType != null and filterType == 3">
AND (mainId is NULL or mainId = '')
and basic_products.originUuid <![CDATA[<>]]> ''
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 4">
AND thirdId1 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 5">
AND thirdId2 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 6">
AND thirdId3 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 7">
AND thirdId4 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 10">
AND basic_udirel.updateTime is NULL
@ -398,6 +401,18 @@
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}
</if>
<if test="originUuid != null and originUuid != ''">
and originUuid = #{originUuid}
</if>
<if test="manufactory != null and manufactory != ''">
and manufactory LIKE concat('%',#{manufactory},'%')
</if>
<if test="dispatch != null">
and basic_udirel.dispatch = #{dispatch}
</if>
<if test="groupBuy != null">
and basic_udirel.groupBuy = #{groupBuy}
</if>
</where>
ORDER BY modifyTime DESC
</select>
@ -761,6 +776,9 @@
<if test="relCode != '' and relCode != null">
relCode=#{relCode},
</if>
<if test="needCert != null">
needCert=#{needCert},
</if>
</trim>
WHERE id = #{id}
</update>

3
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -197,6 +197,9 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('io_order', 'checkPreInOrders', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('sys_hosp_config', 'thirdSys', 'varchar(255)', 1);
# CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3);
# CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);

Write Preview
Loading…
Cancel
Save