bug修复，功能优化
anthonywj
4 years ago
parent
572a7f6782
commit
5f141fca95
@ -0,0 +1,6 @@
|
||||
package com.glxp.sale.admin.constant;
|
||||
|
||||
public class Constant {
|
||||
|
||||
public static String SYSTEM_CUSTOMER_ID = "110";
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
package com.glxp.sale.admin.controller.basic;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
|
||||
import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity;
|
||||
import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest;
|
||||
import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest;
|
||||
import com.glxp.sale.admin.res.PageSimpleResponse;
|
||||
import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
|
||||
import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
|
||||
import com.glxp.sale.common.enums.ResultEnum;
|
||||
import com.glxp.sale.common.res.BaseResponse;
|
||||
import com.glxp.sale.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class BussinessOriginTypeController {
|
||||
|
||||
|
||||
@Resource
|
||||
private BussinessOriginTypeService bussinessOriginTypeService;
|
||||
|
||||
|
||||
@GetMapping("/udiwms/originBusType/filter")
|
||||
public BaseResponse filterJoin(BussinessOriginTypeFilterRequest bussinessTypeFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<BussinessOriginTypeEntity> bussinessTypeEntities;
|
||||
bussinessTypeEntities = bussinessOriginTypeService.filterList(
|
||||
bussinessTypeFilterRequest);
|
||||
PageInfo<BussinessOriginTypeEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(bussinessTypeEntities);
|
||||
PageSimpleResponse<BussinessOriginTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(bussinessTypeEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package com.glxp.sale.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
|
||||
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
|
||||
import com.glxp.sale.admin.req.inout.WarehouseQueryRequest;
|
||||
import com.glxp.sale.admin.res.PageSimpleResponse;
|
||||
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.sale.admin.res.inout.UdiTraceResponse;
|
||||
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
|
||||
import com.glxp.sale.admin.service.inout.CodesService;
|
||||
import com.glxp.sale.common.res.BaseResponse;
|
||||
import com.glxp.sale.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
public class UdiTraceController {
|
||||
|
||||
@Resource
|
||||
private CodesService warehouseService;
|
||||
@Resource
|
||||
UdiRelevanceService udiRelevanceService;
|
||||
|
||||
@GetMapping("udiwarehouse/trace/filter")
|
||||
public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
|
||||
List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
|
||||
if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
|
||||
WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
|
||||
String udi = warehouseEntity.getCode().substring(2, 16);
|
||||
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
|
||||
filterUdiInfoRequest.setNameCode(udi);
|
||||
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
|
||||
UdiRelevanceResponse udiRelevance = null;
|
||||
if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
|
||||
udiRelevance = udiRelevanceResponses.get(0);
|
||||
}
|
||||
|
||||
UdiRelevanceResponse finalUdiRelevance = udiRelevance;
|
||||
List<UdiTraceResponse> udiTraceResponseList = warehouseEntityList.stream().map(item ->
|
||||
{
|
||||
UdiTraceResponse udiTraceResponse = new UdiTraceResponse();
|
||||
BeanUtils.copyProperties(item, udiTraceResponse);
|
||||
if(finalUdiRelevance!=null){
|
||||
udiTraceResponse.setYlqxzcrbarmc(finalUdiRelevance.getYlqxzcrbarmc());
|
||||
udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc());
|
||||
udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh());
|
||||
}
|
||||
return udiTraceResponse;
|
||||
}).collect(Collectors.toList());
|
||||
PageInfo<UdiTraceResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(udiTraceResponseList);
|
||||
PageSimpleResponse<UdiTraceResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(udiTraceResponseList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}else {
|
||||
return ResultVOUtils.error(500,"未找到该条码！");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.sale.admin.dao.basic;
|
||||
|
||||
import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity;
|
||||
import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface BussinessOriginTypeDao {
|
||||
|
||||
List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.sale.admin.entity.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BussinessOriginTypeEntity {
|
||||
private String id;
|
||||
private String name;
|
||||
private String action;
|
||||
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package com.glxp.sale.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class IOOrderPdfEntity {
|
||||
|
||||
private String id;
|
||||
private String action;
|
||||
private String actDate;
|
||||
private String fromCorp;
|
||||
private String fromType;
|
||||
|
||||
private String erpOrderId;
|
||||
private String companyname;
|
||||
private String goodsid;
|
||||
private String goodsname;
|
||||
private String batchNo;
|
||||
private String warehouseCode;
|
||||
private String productDate;
|
||||
private String expireDate;
|
||||
private Integer erpCount;
|
||||
private Integer reCount;
|
||||
private String nameCode;
|
||||
private String productCompany;
|
||||
private String coName;
|
||||
private String authCode;
|
||||
private String packSpec;
|
||||
private String packRatio;
|
||||
private Integer count;
|
||||
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.glxp.sale.admin.req.basic;
|
||||
|
||||
import com.glxp.sale.admin.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BussinessOriginTypeFilterRequest extends ListPageRequest {
|
||||
private String action;
|
||||
private String name;
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
package com.glxp.sale.admin.req.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
@Data
|
||||
public class LockUdiRequest {
|
||||
|
||||
List<String> ids;
|
||||
private Integer lockStatus;
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.sale.admin.res.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UdiTraceResponse {
|
||||
|
||||
private String orderId;
|
||||
private String actDate;
|
||||
private String mainAction;
|
||||
private String action;
|
||||
private String fromCorp;
|
||||
private Integer count;
|
||||
private String cpmctymc;
|
||||
private String ylqxzcrbarmc;
|
||||
private String ggxh;
|
||||
private String batchNo;
|
||||
private String produceDate;
|
||||
private String expireDate;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.sale.admin.service.basic;
|
||||
|
||||
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
|
||||
import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity;
|
||||
import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest;
|
||||
import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface BussinessOriginTypeService {
|
||||
|
||||
List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
|
||||
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.glxp.sale.admin.service.basic.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.sale.admin.dao.basic.BussinessOriginTypeDao;
|
||||
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
|
||||
import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity;
|
||||
import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest;
|
||||
import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeService {
|
||||
|
||||
@Resource
|
||||
BussinessOriginTypeDao bussinessOriginTypeDao;
|
||||
|
||||
@Override
|
||||
public List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest) {
|
||||
if (bussinessOriginTypeFilterRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (bussinessOriginTypeFilterRequest.getPage() != null) {
|
||||
int offset = (bussinessOriginTypeFilterRequest.getPage() - 1) * bussinessOriginTypeFilterRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, bussinessOriginTypeFilterRequest.getLimit());
|
||||
}
|
||||
List<BussinessOriginTypeEntity> data = bussinessOriginTypeDao.filterList(bussinessOriginTypeFilterRequest);
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package com.glxp.sale.admin.thread;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
||||
@Service
|
||||
public class TestThread {
|
||||
Logger logger = LoggerFactory.getLogger(TestThread.class);
|
||||
|
||||
@Async
|
||||
public void test() {
|
||||
String data[] = null;
|
||||
logger.error(data[1]);
|
||||
if ("2222".equals(data)) {
|
||||
logger.error("----1");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.sale.admin.dao.basic.BussinessOriginTypeDao">
|
||||
|
||||
<select id="filterList" parameterType="com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest"
|
||||
resultType="com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity">
|
||||
SELECT * FROM basic_bustype_origin
|
||||
<where>
|
||||
<if test="name != ''and name != null">
|
||||
AND name LIKE concat(#{name},'%')
|
||||
</if>
|
||||
<if test="action != ''and action != null">
|
||||
AND action LIKE concat(#{action},'%')
|
||||
</if>
|
||||
|
||||
</where>
|
||||
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,22 @@
|
||||
package com.glxp.sale.admin;
|
||||
|
||||
import com.glxp.sale.BaseApiAdminApplicationTest;
|
||||
import com.glxp.sale.admin.service.auth.AuthLoginService;
|
||||
import com.glxp.sale.admin.thread.TestThread;
|
||||
import org.junit.Test;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
public class TestUtils extends BaseApiAdminApplicationTest {
|
||||
|
||||
@Resource
|
||||
private TestThread testThread;
|
||||
|
||||
@Test
|
||||
public void test1() {
|
||||
|
||||
testThread.test();
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue