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

1.添加下载仓库功能相关接口

Browse Source
master
x_z 3 years ago
parent c3d3a7a4d9
commit e481211c73
11 changed files with 195 additions and 20 deletions
Show Stats Download Patch File Download Diff File

14
api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.admin.controller.thrsys;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
@ -139,5 +140,18 @@ public class ThrInvWarehouseController {
return ResultVOUtils.success();
}
/**
* 下载第三方系统的仓库
* @param thirdSysFk
* @return
*/
@GetMapping("/spms/thrsys/warehouse/download")
public BaseResponse downloadThirdWarehouse(String thirdSysFk) {
if (StrUtil.isBlank(thirdSysFk)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return thrInvWarehouseService.downloadThirdWarehouse(thirdSysFk);
}
}

13
api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvWarehouseEntity.java
Unescape Escape View File

@ -21,12 +21,17 @@ public class ThrInvWarehouseEntity {
private String remark;
/**
* 仓库等级
*/
* 仓库等级
*/
private Integer level;
/**
* 父级仓库编码
*/
* 父级仓库编码
*/
private String pcode;
/**
* 第三方系统标识
*/
private String thirdSysFk;
}

21
api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.glxp.api.admin.httpclient.req.UdiwmsUnitRequest;
import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
import com.glxp.api.admin.req.erp.UdiwmsWarehouseRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.res.basic.ErpUnitsResponse;
@ -18,13 +19,10 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 获取ERP基础数据
@ -94,4 +92,21 @@ public class ErpBasicClient {
}
}
//查询仓库货位号
public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(udiwmsWarehouseRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getWarehouse";
udiwmsWarehouseRequest.setPage(1);
udiwmsWarehouseRequest.setLimit(100);
log.info("查询第三方系统的仓库货位号url：{}，参数：{}", url, udiwmsWarehouseRequest.toString());
String response = HttpClient.uCloudPost(url, udiwmsWarehouseRequest);
log.info(response);
try {
return JSONObject.parseObject(response, BaseResponse.class);
} catch (Exception e) {
log.error("获取第三方系统的仓库货位码异常", e);
return ResultVOUtils.error(500, "下载失败");
}
}
}

21
api-admin/src/main/java/com/glxp/api/admin/req/erp/UdiwmsWarehouseRequest.java
Unescape Escape View File

@ -0,0 +1,21 @@
package com.glxp.api.admin.req.erp;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
/**
* 仓库货位信息查询参数
*/
@Data
public class UdiwmsWarehouseRequest extends ListPageRequest {
//仓库号，支持模糊查询
private String inventoryCode;
//货位号，支持模糊查询
private String warehouseCode;
//第三方系统ID
private String thirdSys;
}

6
api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java
Unescape Escape View File

@ -20,4 +20,10 @@ public class FilterThrInvWarehouseRequest extends ListPageRequest {
private Integer level;
private String lastUpdateTime;
/**
* 第三方系统标识
*/
private String thirdSysFk;
}

16
api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseDetail.java
Unescape Escape View File

@ -0,0 +1,16 @@
package com.glxp.api.admin.res.erp;
import lombok.Data;
@Data
public class UdiwmsWarehouseDetail {
//货位号
private String code;
//货位名称
private String name;
//备注
private String remark;
}

17
api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseResponse.java
Unescape Escape View File

@ -0,0 +1,17 @@
package com.glxp.api.admin.res.erp;
import lombok.Data;
import java.util.List;
/**
* 仓库货位号返回信息
*/
@Data
public class UdiwmsWarehouseResponse extends UdiwmsWarehouseDetail{
private List<UdiwmsWarehouseDetail> details;
}

5
api-admin/src/main/java/com/glxp/api/admin/res/thrsys/ThrInvWarehouseResponse.java
Unescape Escape View File

@ -19,6 +19,11 @@ public class ThrInvWarehouseResponse {
private Date updateTime;
private String remark;
/**
* 第三方系统标识
*/
private String thirdSysFk;
private List<ThrInvWarehouseResponse> children;
}

8
api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.admin.service.thrsys;
import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
import com.glxp.api.common.res.BaseResponse;
import java.util.List;
@ -29,4 +30,11 @@ public interface ThrInvWarehouseService {
ThrInvWarehouseEntity selectMaxCode(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest);
/**
* 下载第三方系统仓库数据
*
* @param thirdSysFk
* @return
*/
BaseResponse downloadThirdWarehouse(String thirdSysFk);
}

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

@ -1,22 +1,30 @@
package com.glxp.api.admin.service.thrsys.impl;
import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.thrsys.ThrInvWarehouseDao;
import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.erp.UdiwmsWarehouseRequest;
import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
import com.glxp.api.admin.res.erp.UdiwmsWarehouseResponse;
import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
import com.glxp.api.common.res.BaseResponse;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Service
public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
@Resource
ThrInvWarehouseDao thrInvWarehouseDao;
@Resource
private ErpBasicClient erpBasicClient;
@Override
public ThrInvWarehouseEntity findDefault(Boolean advaceType, Boolean isDefault) {
@ -93,4 +101,33 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
public ThrInvWarehouseEntity selectMaxCode(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) {
return thrInvWarehouseDao.selectMaxCode(filterThrInvWarehouseRequest);
}
@Transactional(rollbackFor = Exception.class)
@Override
public BaseResponse downloadThirdWarehouse(String thirdSysFk) {
UdiwmsWarehouseRequest udiwmsWarehouseRequest = new UdiwmsWarehouseRequest();
udiwmsWarehouseRequest.setThirdSys(thirdSysFk);
BaseResponse warehouse = erpBasicClient.getWarehouse(udiwmsWarehouseRequest);
if (warehouse.getCode().equals(20000)) {
String jsonStr = JSONUtil.toJsonStr(warehouse.getData());
List<UdiwmsWarehouseResponse> responseList = JSONUtil.toList(jsonStr, UdiwmsWarehouseResponse.class);
List<ThrInvWarehouseEntity> list = new ArrayList<>();
for (UdiwmsWarehouseResponse response : responseList) {
ThrInvWarehouseEntity thrInvWarehouseEntity = new ThrInvWarehouseEntity();
//TODO 暂不处理货位数据
thrInvWarehouseEntity.setPid(0);
thrInvWarehouseEntity.setName(response.getName());
thrInvWarehouseEntity.setCode(response.getCode());
thrInvWarehouseEntity.setThirdSysFk(thirdSysFk);
thrInvWarehouseEntity.setAdvanceType(false); //默认是仓库
thrInvWarehouseEntity.setStatus(1);//默认启用
list.add(thrInvWarehouseEntity);
}
//插入数据
thrInvWarehouseDao.insertInvWarehouses(list);
warehouse.setData(null);
}
return warehouse;
}
}

55
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
Unescape Escape View File

@ -2,10 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.thrsys.ThrInvWarehouseDao">
<select id="filterThrInvWarehouse" parameterType="com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity">
SELECT * FROM thr_inv_warehouse
SELECT *
FROM thr_inv_warehouse
<where>
<if test="id != '' and id != null">
AND id = #{id}
@ -19,20 +19,25 @@
<if test="name != '' and name != null">
AND name = #{name}
</if>
<if test=" advanceType != null">
<if test="advanceType != null">
AND advanceType = #{advanceType}
</if>
<if test="isDefault != null">
AND isDefault = #{isDefault}
</if>
<if test="key != null">
and code like concat('%',#{key},'%') or `name` like concat('%',#{key},'%')
and code like concat('%', #{key}, '%')
or `name` like concat('%', #{key}, '%')
</if>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
<if test="thirdSysFk != null">
and thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<select id="selectById" parameterType="Map"
@ -64,24 +69,27 @@
<if test="isDefault != '' and isDefault != null">
AND isDefault = #{isDefault}
</if>
<if test="thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<insert id="insertThrInvWarehouse" keyProperty="id"
parameterType="com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity">
insert INTO thr_inv_warehouse
replace INTO thr_inv_warehouse
(pid, code, name, advanceType, isDefault,
status, updateTime, remark)
status, updateTime, remark, thirdSysFk)
values (#{pid}, #{code},
#{name}, #{advanceType}, #{isDefault},
#{status}, #{updateTime},
#{remark})
#{remark}, #{thirdSysFk})
</insert>
<insert id="insertThrInvWarehouses" parameterType="java.util.List">
insert INTO thr_inv_warehouse
(pid, code, name, advanceType, isDefault,
status, updateTime, remark)
status, updateTime, remark, thirdSysFk)
VALUES
<foreach collection="thrInvWarehouseEntitys" item="item" index="index"
separator=",">
@ -89,7 +97,7 @@
#{item.pid}, #{item.code},
#{item.name}, #{item.advanceType}, #{item.isDefault},
#{item.status}, #{item.updateTime},
#{item.remark})
#{item.remark}, #{item.thirdSysFk})
</foreach>
</insert>
@ -110,6 +118,7 @@
<if test="status != null">status=#{status},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
</trim>
WHERE id = #{id}
</update>
@ -147,6 +156,28 @@
<if test="level != null">
AND `level` = #{level}
</if>
<if test="thirdSysFk != null">
AND `thirdSysFk` = #{thirdSysFk}
</if>
</where>
</select>
<insert id="insertInvWarehouses">
replace into thr_inv_warehouse (pid, code, name, advanceType, isDefault, status, updateTime, remark, level,
pcode,
thirdSysFk)
values
<foreach collection="thrInvWarehouseEntitys" index="index" item="item" separator=",">
(#{item.pid},
#{item.code},
#{item.name},
#{item.advanceType},
#{item.isDefault},
#{item.status},
#{item.updateTime},
#{item.remark},
#{item.level},
#{item.pcode},
#{item.thirdSysFk})
</foreach>
</insert>
</mapper>
Write Preview
Loading…
Cancel
Save