1.提交国家库参数错误；2.完善出入库
anthonywj
4 years ago
parent
40c7ca13ce
commit
03fceaf8d9
@ -0,0 +1,38 @@
|
||||
package com.glxp.udi.admin.controller.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.info.SetupEntity;
|
||||
import com.glxp.udi.admin.req.info.FilterSetupRequest;
|
||||
import com.glxp.udi.admin.service.info.SetupService;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@RestController
|
||||
public class SetupController {
|
||||
|
||||
@Resource
|
||||
private SetupService setupService;
|
||||
|
||||
@GetMapping("/udi/info/setup")
|
||||
public BaseResponse getCompanyInfo(FilterSetupRequest filterSetupRequest) {
|
||||
filterSetupRequest.setId(1);
|
||||
SetupEntity setupEntity = setupService.findSetup(filterSetupRequest);
|
||||
if (setupEntity != null) {
|
||||
return ResultVOUtils.success(setupEntity);
|
||||
}
|
||||
return ResultVOUtils.error(500, "设置信息为空");
|
||||
}
|
||||
|
||||
@PostMapping("/udi/info/setup/modify")
|
||||
public BaseResponse modifyCompany(@RequestBody SetupEntity setupEntity) {
|
||||
setupEntity.setId(1);
|
||||
setupService.modifySetup(setupEntity);
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,183 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.entity.auth.AuthAdmin;
|
||||
import com.glxp.udi.admin.entity.contrast.CodeContrastDetailEntity;
|
||||
import com.glxp.udi.admin.entity.contrast.CodeContrastEntity;
|
||||
import com.glxp.udi.admin.entity.contrast.CustomercontrastEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import com.glxp.udi.admin.req.contrast.CodeContrastRequest;
|
||||
import com.glxp.udi.admin.req.contrast.DeleteCustomerContrastRequest;
|
||||
import com.glxp.udi.admin.req.contrast.FilterCodeContrastRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.contrast.CodeContrastResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.contrast.CodeContrastService;
|
||||
import com.glxp.udi.admin.service.contrast.CustomercontrastService;
|
||||
import com.glxp.udi.admin.util.UuidUtils;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.Valid;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
public class CodeContrastController {
|
||||
|
||||
@Resource
|
||||
private CodeContrastService codeContrastService;
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
@Resource
|
||||
private CustomercontrastService customercontrastService;
|
||||
|
||||
//对照码上传
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/salewarehouse/codeContrast/save")
|
||||
public BaseResponse saveList(@RequestBody @Valid CodeContrastRequest codeContrastRequest, BindingResult bindingResult) {
|
||||
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
String userId = request.getHeader("ADMIN_ID");
|
||||
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
|
||||
|
||||
List<CodeContrastEntity> codeContrastEntities = codeContrastRequest.getCodeContrastData();
|
||||
List<CodeContrastEntity> insertData = new ArrayList<>();
|
||||
|
||||
List<CustomercontrastEntity> customercontrastEntities = new ArrayList<>(); //创建关联关系
|
||||
|
||||
if (codeContrastEntities != null && codeContrastEntities.size() > 0) {
|
||||
|
||||
for (int i = 0; i < codeContrastEntities.size(); i++) {
|
||||
|
||||
String uuid = UuidUtils.getUUId();
|
||||
|
||||
CodeContrastEntity codeContrastEntity = codeContrastEntities.get(i);
|
||||
codeContrastEntity.setUserId(Long.parseLong(userId));
|
||||
codeContrastEntity.setCustomerId(authAdmin.getCustomerId());
|
||||
codeContrastEntity.setId(uuid);
|
||||
insertData.add(codeContrastEntity);
|
||||
|
||||
CustomercontrastEntity customercontrastEntity = new CustomercontrastEntity();
|
||||
customercontrastEntity.setCodeContrastId(uuid);
|
||||
customercontrastEntity.setCustomerId(authAdmin.getCustomerId());
|
||||
customercontrastEntity.setUserId(Long.parseLong(userId));
|
||||
customercontrastEntities.add(customercontrastEntity);
|
||||
}
|
||||
} else return ResultVOUtils.error(301, "上传对照数据为空");
|
||||
|
||||
boolean b = codeContrastService.insertCodeContrastList(insertData);
|
||||
boolean c = customercontrastService.insertCustomercontrastList(customercontrastEntities); //插入对照表
|
||||
if (!b && !c) {
|
||||
return ResultVOUtils.error(500, "插入数据出错");
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/salewarehouse/codeContrast/deleteContrastByCustomer")
|
||||
public BaseResponse deleteCustomerContrast(@RequestBody @Valid DeleteCustomerContrastRequest deleteCustomerContrastRequest, BindingResult bindingResult) {
|
||||
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
String userId = request.getHeader("ADMIN_ID");
|
||||
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
|
||||
deleteCustomerContrastRequest.setCustomerId(authAdmin.getCustomerId());
|
||||
boolean b = customercontrastService.deleteCustomercontrast(deleteCustomerContrastRequest);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
//对照码下载
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/salewarehouse/codeContrast/list")
|
||||
public BaseResponse listCodeContrast(@Valid ListPageRequest listPageRequest, BindingResult bindingResult) {
|
||||
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
String userId = request.getHeader("ADMIN_ID");
|
||||
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
|
||||
List<CodeContrastEntity> codeContrastEntities = codeContrastService.listCodeContrast(listPageRequest, authAdmin.getCustomerId());
|
||||
|
||||
List<CodeContrastResponse> codeContrastResponses = codeContrastEntities.stream().map(item ->
|
||||
{
|
||||
CodeContrastResponse codeContrastResponse = new CodeContrastResponse();
|
||||
BeanUtils.copyProperties(item, codeContrastResponse);
|
||||
return codeContrastResponse;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
PageInfo<CodeContrastResponse> pageInfo = new PageInfo<>(codeContrastResponses);
|
||||
PageSimpleResponse<CodeContrastResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(codeContrastResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
//对照表查询
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/salewarehouse/codeContrast/filter")
|
||||
public BaseResponse filterCodeContrast(@Valid FilterCodeContrastRequest filterCodeContrastRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<CodeContrastDetailEntity> codeContrastEntities = null;
|
||||
if (filterCodeContrastRequest.getCustomerId() != null)
|
||||
codeContrastEntities = customercontrastService.filterDetailByCustomerId(filterCodeContrastRequest);
|
||||
else {
|
||||
codeContrastEntities = customercontrastService.filterDetailAll(filterCodeContrastRequest);
|
||||
}
|
||||
|
||||
List<CodeContrastDetailEntity> codeContrastResponses = codeContrastEntities.stream().map(item ->
|
||||
{
|
||||
CodeContrastDetailEntity codeContrastDetailEntity = new CodeContrastDetailEntity();
|
||||
BeanUtils.copyProperties(item, codeContrastDetailEntity);
|
||||
return codeContrastDetailEntity;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
PageInfo<CodeContrastDetailEntity> pageInfo = new PageInfo<>(codeContrastResponses);
|
||||
PageSimpleResponse<CodeContrastDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(codeContrastResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,231 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.Druginfo;
|
||||
import com.glxp.udi.admin.entity.inout.MipsDrugEntity;
|
||||
import com.glxp.udi.admin.req.inout.DrugFilterRequest;
|
||||
import com.glxp.udi.admin.req.inout.DrugInfoRequest;
|
||||
import com.glxp.udi.admin.req.inout.DrugsSaveRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.inout.DruginfoResponse;
|
||||
import com.glxp.udi.admin.res.inout.MipsDrugResponse;
|
||||
import com.glxp.udi.admin.service.info.CompanyService;
|
||||
import com.glxp.udi.admin.service.inout.DruginfoService;
|
||||
import com.glxp.udi.admin.util.HttpClient;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 药品信息
|
||||
*/
|
||||
@RestController
|
||||
public class DruginfoController {
|
||||
|
||||
|
||||
@Resource
|
||||
private DruginfoService druginfoService;
|
||||
@Resource
|
||||
private CompanyService companyService;
|
||||
|
||||
@Value("${UDIC_MIPSDOWNLOAD_URL}")
|
||||
private String url;
|
||||
|
||||
@GetMapping("warehouse/drug/list")
|
||||
public BaseResponse list(@Valid DrugInfoRequest drugInfoRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<Druginfo> druginfoList = druginfoService.listDrugInfo(drugInfoRequest);
|
||||
List<DruginfoResponse> druginfoResponses = druginfoList.stream().map(item ->
|
||||
{
|
||||
DruginfoResponse druginfoResponse = new DruginfoResponse();
|
||||
BeanUtils.copyProperties(item, druginfoResponse);
|
||||
return druginfoResponse;
|
||||
}).collect(Collectors.toList());
|
||||
PageInfo<Druginfo> pageInfo = new PageInfo<>(druginfoList);
|
||||
PageSimpleResponse<DruginfoResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(druginfoResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/drug/filter")
|
||||
public BaseResponse filter(@Valid DrugFilterRequest drugFilterRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<Druginfo> druginfoList = druginfoService.filterDrugInfo(drugFilterRequest);
|
||||
|
||||
List<DruginfoResponse> druginfoResponses = druginfoList.stream().map(item ->
|
||||
{
|
||||
DruginfoResponse druginfoResponse = new DruginfoResponse();
|
||||
BeanUtils.copyProperties(item, druginfoResponse);
|
||||
return druginfoResponse;
|
||||
}).collect(Collectors.toList());
|
||||
PageInfo<Druginfo> pageInfo = new PageInfo<>(druginfoList);
|
||||
PageSimpleResponse<DruginfoResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(druginfoResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取同一种类型的产品信息并合并后返回
|
||||
*
|
||||
* @param drugInfoRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("warehouse/drug/combineFilter")
|
||||
public BaseResponse combineFilter(@Valid DrugFilterRequest drugInfoRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<Druginfo> druginfoList = druginfoService.filterDrugInfo(drugInfoRequest);
|
||||
Map<String, Druginfo> data = new HashMap<>();
|
||||
for (Druginfo druginfo : druginfoList) {
|
||||
data.put(druginfo.getUuid(), druginfo);
|
||||
}
|
||||
List<Druginfo> returnLists = new ArrayList<>();
|
||||
for (Druginfo value : data.values()) {
|
||||
returnLists.add(value);
|
||||
}
|
||||
for (int i = 0; i < returnLists.size(); i++) {
|
||||
String nameCode = returnLists.get(i).getNamecode();
|
||||
if (druginfoService.isExit(nameCode)) {
|
||||
returnLists.get(i).setCheck(true);
|
||||
} else
|
||||
returnLists.get(i).setCheck(false);
|
||||
}
|
||||
|
||||
|
||||
List<DruginfoResponse> druginfoResponses = returnLists.stream().map(item ->
|
||||
{
|
||||
DruginfoResponse druginfoResponse = new DruginfoResponse();
|
||||
BeanUtils.copyProperties(item, druginfoResponse);
|
||||
return druginfoResponse;
|
||||
}).collect(Collectors.toList());
|
||||
PageInfo<Druginfo> pageInfo = new PageInfo<>(druginfoList);
|
||||
PageSimpleResponse<DruginfoResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(druginfoResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入TXT药品信息
|
||||
*
|
||||
* @param drugsSaveRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/warehouse/drug/save")
|
||||
public BaseResponse saveList(@RequestBody @Valid DrugsSaveRequest drugsSaveRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<Druginfo> druginfos = drugsSaveRequest.getDruginfos();
|
||||
List<Druginfo> saveList = addUuid(druginfos);
|
||||
drugsSaveRequest.setDruginfos(saveList);
|
||||
int b = druginfoService.saveDruginfo(drugsSaveRequest);
|
||||
System.out.println(b + "-------------------");
|
||||
if (b < 0) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
public List<Druginfo> addUuid(List<Druginfo> druginfos){
|
||||
Map<String, List<Druginfo>> data = new HashMap<>();
|
||||
for (Druginfo druginfo : druginfos) {
|
||||
String key = druginfo.getConame() + druginfo.getFormspec() + druginfo.getPackspec() + druginfo.getPackratio();
|
||||
if (data.get(key) == null) {
|
||||
List<Druginfo> values = new ArrayList<>();
|
||||
values.add(druginfo);
|
||||
data.put(key, values);
|
||||
} else {
|
||||
List<Druginfo> values = data.get(key);
|
||||
values.add(druginfo);
|
||||
}
|
||||
|
||||
}
|
||||
List<Druginfo> saveList = new ArrayList<>();
|
||||
for (List<Druginfo> druginfoList : data.values()) {
|
||||
String uuid = getUUId();
|
||||
for (int i = 0; i < druginfoList.size(); i++) {
|
||||
Druginfo druginfo = druginfoList.get(i);
|
||||
druginfo.setUuid(uuid);
|
||||
saveList.add(druginfo);
|
||||
}
|
||||
}
|
||||
return saveList;
|
||||
}
|
||||
|
||||
private String getUUId() {
|
||||
UUID uuid = UUID.randomUUID();
|
||||
return uuid.toString().replace("-", "");
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/drug/import")
|
||||
public BaseResponse importMips() {
|
||||
String response = HttpClient.mipsGet(url + "/mips/druginfo/list");
|
||||
MipsDrugResponse mipsDrugResponse = (MipsDrugResponse) JSONObject.parseObject(response, MipsDrugResponse.class);
|
||||
if (mipsDrugResponse.getCode() == 20000) {
|
||||
// CompanyEntity companyEntity = companyService.findCompany();
|
||||
List<MipsDrugEntity> mipsDrugEntities = mipsDrugResponse.getData().getList();
|
||||
List<Druginfo> druginfoResponses = mipsDrugEntities.stream().map(item ->
|
||||
{
|
||||
Druginfo druginfo = new Druginfo();
|
||||
BeanUtils.copyProperties(item, druginfo);
|
||||
druginfo.setNamecode(item.getCodeVersion() + item.getResCode());
|
||||
if ("1".equals(item.getProductType())) {
|
||||
druginfo.setType("监管药品");
|
||||
} else if ("2".equals(item.getProductType())) {
|
||||
druginfo.setType("非国家监管药品");
|
||||
}
|
||||
|
||||
druginfo.setConame(item.getProductName());
|
||||
druginfo.setAuthcode(item.getAuthorizedNo());
|
||||
druginfo.setForm(item.getType());
|
||||
druginfo.setFormspec(item.getSpec());
|
||||
druginfo.setPackspec(item.getPackageSpec());
|
||||
druginfo.setPackratio(item.getPkgRatio());
|
||||
druginfo.setPacklevel(item.getCodeLevel());
|
||||
// druginfo.setUnit(companyEntity.getName());
|
||||
return druginfo;
|
||||
}).collect(Collectors.toList());
|
||||
List<Druginfo> saveList = addUuid(druginfoResponses);
|
||||
DrugsSaveRequest drugsSaveRequest = new DrugsSaveRequest();
|
||||
drugsSaveRequest.setDruginfos(saveList);
|
||||
int b = druginfoService.saveDruginfo(drugsSaveRequest);
|
||||
System.out.println(b + "-------------------");
|
||||
if (b < 0) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
return ResultVOUtils.success("导入成功");
|
||||
} else {
|
||||
return ResultVOUtils.error(911, "导入失败");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.inout.FilterErpOrderRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.inout.MyErpOrderService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class MyErpOrderController {
|
||||
@Value("${UCLOD_SERVER_URL}")
|
||||
private String ucloudUrl;
|
||||
@Resource
|
||||
MyErpOrderService myErpOrderService;
|
||||
|
||||
@GetMapping("/warehouse/getMyErpOrders")
|
||||
public BaseResponse getMyErpOrders(FilterErpOrderRequest filterErpOrderRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (filterErpOrderRequest.getDocid() == null || filterErpOrderRequest.getDocid().equals("")) {
|
||||
filterErpOrderRequest.setDocid("null");
|
||||
}
|
||||
List<ErpOrderEntity> erpInfoEntityList = myErpOrderService.filterMyErpDetailOrder(filterErpOrderRequest);
|
||||
PageInfo<ErpOrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(erpInfoEntityList);
|
||||
PageSimpleResponse<ErpOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(erpInfoEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/deleteErpOrder")
|
||||
public BaseResponse deleteErpOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = myErpOrderService.deleteById(deleteRequest.getId());
|
||||
if (b) {
|
||||
return ResultVOUtils.success("删除成功");
|
||||
} else {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping(value = "/warehouse/inout/order/detail")
|
||||
public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest,
|
||||
BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) {
|
||||
filterErpOrderRequest.setOrderId("1");
|
||||
}
|
||||
filterErpOrderRequest.setPage(1);
|
||||
filterErpOrderRequest.setLimit(100);
|
||||
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
|
||||
return ResultVOUtils.success(erpOrderEntities);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.fastjson.TypeReference;
|
||||
import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
|
||||
import com.glxp.udi.admin.util.HttpClient;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class UdiDlHttpClient {
|
||||
String udiUrl;
|
||||
|
||||
public UdiDlHttpClient(String udiUrl) {
|
||||
this.udiUrl = udiUrl;
|
||||
}
|
||||
|
||||
public List<UdiInfoEntity> getUdiByUuid(String uuid) {
|
||||
Map<String, Object> paramMap = new HashMap<>(16);
|
||||
paramMap.put("page", 1);
|
||||
paramMap.put("limit", 100);
|
||||
paramMap.put("uuid", uuid);
|
||||
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterByUuid", paramMap);
|
||||
try {
|
||||
BaseResponse<List<UdiInfoEntity>> udiDlDeviceResponse =
|
||||
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<UdiInfoEntity>>>(){
|
||||
|
||||
});
|
||||
List<UdiInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
|
||||
return udiInfoEntities;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public List<UdiInfoEntity> getUdiByDi(String key) {
|
||||
Map<String, Object> paramMap = new HashMap<>(16);
|
||||
paramMap.put("page", 1);
|
||||
paramMap.put("limit", 100);
|
||||
paramMap.put("nameCode", key);
|
||||
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterByNameCode", paramMap);
|
||||
try {
|
||||
BaseResponse<List<UdiInfoEntity>> udiDlDeviceResponse =
|
||||
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<UdiInfoEntity>>>(){
|
||||
|
||||
});
|
||||
List<UdiInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
|
||||
return udiInfoEntities;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,149 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.fastjson.TypeReference;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.auth.AuthAdmin;
|
||||
import com.glxp.udi.admin.entity.inout.TraceUploadEntity;
|
||||
import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
|
||||
import com.glxp.udi.admin.entity.inout.WarehouseEntity;
|
||||
import com.glxp.udi.admin.entity.udid.UdiEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
|
||||
import com.glxp.udi.admin.req.inout.WarehouseQueryRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.inout.UdiRelevanceResponse;
|
||||
import com.glxp.udi.admin.res.inout.UdiTraceResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.inout.UdiInfoService;
|
||||
import com.glxp.udi.admin.service.inout.UdiRelevanceService;
|
||||
import com.glxp.udi.admin.service.inout.WarehouseService;
|
||||
import com.glxp.udi.admin.util.DateUtil;
|
||||
import com.glxp.udi.admin.util.FilterUdiUtils;
|
||||
import com.glxp.udi.admin.util.GetAuthAdminUtil;
|
||||
import com.glxp.udi.admin.util.HttpClient;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
public class UdiTraceController {
|
||||
|
||||
@Resource
|
||||
private WarehouseService warehouseService;
|
||||
@Resource
|
||||
UdiRelevanceService udiRelevanceService;
|
||||
@Resource
|
||||
UdiInfoService udiInfoService;
|
||||
@Value("${COOR_UPLOAD_ORDER}")
|
||||
private String coorUploadUrl;
|
||||
private static final Logger logger = LoggerFactory.getLogger(UdiTraceController.class);
|
||||
@Resource
|
||||
AuthAdminService authAdminService;
|
||||
|
||||
@GetMapping("/udiwarehouse/trace/filter")
|
||||
public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
|
||||
warehouseQueryRequest.setCustomerId(authAdmin.getCustomerId());
|
||||
List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
|
||||
if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
|
||||
WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
|
||||
UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
|
||||
String udi = udiEntity.getUdi();
|
||||
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
|
||||
filterUdiInfoRequest.setNameCode(udi);
|
||||
|
||||
|
||||
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi);
|
||||
List<UdiTraceResponse> udiTraceResponseList = warehouseEntityList.stream().map(item ->
|
||||
{
|
||||
UdiTraceResponse udiTraceResponse = new UdiTraceResponse();
|
||||
BeanUtils.copyProperties(item, udiTraceResponse);
|
||||
if (udiInfoEntity != null) {
|
||||
udiTraceResponse.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
|
||||
udiTraceResponse.setCpmctymc(udiInfoEntity.getCpmctymc());
|
||||
udiTraceResponse.setGgxh(udiInfoEntity.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, "未找到该条码！");
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/coor/trace/findCode")
|
||||
public BaseResponse findCode(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<TraceUploadEntity> udiTraceResponseList = warehouseEntityList.stream().map(item ->
|
||||
{
|
||||
TraceUploadEntity udiTraceResponse = new TraceUploadEntity();
|
||||
udiTraceResponse.setUdiCode(item.getCode());
|
||||
udiTraceResponse.setBatchNo(item.getBatchNo());
|
||||
udiTraceResponse.setCorpName(item.getFromCorp());
|
||||
udiTraceResponse.setCount(item.getCount());
|
||||
udiTraceResponse.setCreditNum("9357002");
|
||||
try {
|
||||
udiTraceResponse.setDocumentsDate(DateUtil.timeToStamp(item.getActDate()) + "");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
udiTraceResponse.setDocumentsType(item.getAction());
|
||||
udiTraceResponse.setProductionDate(item.getProduceDate());
|
||||
udiTraceResponse.setExpireDate(item.getExpireDate());
|
||||
BeanUtils.copyProperties(item, udiTraceResponse);
|
||||
if (finalUdiRelevance != null) {
|
||||
udiTraceResponse.setProductionCorp(finalUdiRelevance.getYlqxzcrbarmc());
|
||||
udiTraceResponse.setProductName(finalUdiRelevance.getCpmctymc());
|
||||
udiTraceResponse.setSpecifications(finalUdiRelevance.getGgxh());
|
||||
}
|
||||
return udiTraceResponse;
|
||||
}).collect(Collectors.toList());
|
||||
if (udiTraceResponseList != null && udiTraceResponseList.size() > 0) {
|
||||
for (TraceUploadEntity traceUploadEntity : udiTraceResponseList) {
|
||||
String response = HttpClient.uCloudPost(coorUploadUrl, traceUploadEntity);
|
||||
logger.info(response);
|
||||
BaseResponse baseResponse =
|
||||
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
|
||||
});
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success("查询成功，等待上传");
|
||||
} else {
|
||||
return ResultVOUtils.error(500, "未找到该条码！");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,75 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.Unit;
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import com.glxp.udi.admin.req.inout.UnitKeyRequest;
|
||||
import com.glxp.udi.admin.req.inout.UnitSaveRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.inout.UnitService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class UnitController {
|
||||
|
||||
@Resource
|
||||
UnitService unitService;
|
||||
|
||||
|
||||
@GetMapping("warehouse/unit/list")
|
||||
public BaseResponse listUnits(@Valid ListPageRequest listPageRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<Unit> units = unitService.listUnit(listPageRequest);
|
||||
PageInfo<Unit> pageInfo = new PageInfo<>(units);
|
||||
PageSimpleResponse<Unit> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(units);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/unit/list/key")
|
||||
public BaseResponse listUnitsByKey(@Valid UnitKeyRequest keyRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<Unit> units = unitService.listUnitKey(keyRequest);
|
||||
PageInfo<Unit> pageInfo = new PageInfo<>(units);
|
||||
PageSimpleResponse<Unit> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(units);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/unit/save")
|
||||
public BaseResponse saveList(@RequestBody @Valid UnitSaveRequest unitSaveRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
unitService.deletAll();
|
||||
int b = unitService.saveUnits(unitSaveRequest);
|
||||
System.out.println(b + "-------------------");
|
||||
if (b < 0) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,138 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.entity.auth.AuthAdmin;
|
||||
import com.glxp.udi.admin.entity.inout.UnitMaintainEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.inout.UnitMaintainService;
|
||||
import com.glxp.udi.admin.util.GetAuthAdminUtil;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 往来单位信息维护
|
||||
*/
|
||||
@RestController
|
||||
public class UnitMaintainController {
|
||||
|
||||
@Resource
|
||||
private UnitMaintainService unitMaintainService;
|
||||
@Resource
|
||||
AuthAdminService authAdminService;
|
||||
|
||||
@GetMapping("/warehouse/unitMaintain/filter")
|
||||
public BaseResponse filterUnitMaintain(UnitMaintainFilterRequest unitMaintainFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
|
||||
unitMaintainFilterRequest.setCustomerId(authAdmin.getCustomerId() + "");
|
||||
|
||||
List<UnitMaintainEntity> unitMaintainEntities;
|
||||
unitMaintainEntities = unitMaintainService.filterList(unitMaintainFilterRequest);
|
||||
PageInfo<UnitMaintainEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(unitMaintainEntities);
|
||||
PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(unitMaintainEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/warehouse/unit/download")
|
||||
public BaseResponse downloadUnit(UnitMaintainFilterRequest unitMaintainFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
|
||||
unitMaintainFilterRequest.setCustomerId(authAdmin.getCustomerId() + "");
|
||||
|
||||
List<UnitMaintainEntity> unitMaintainEntities;
|
||||
unitMaintainEntities = unitMaintainService.filterList(unitMaintainFilterRequest);
|
||||
|
||||
PageInfo<UnitMaintainEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(unitMaintainEntities);
|
||||
PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(unitMaintainEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/unitMaintain/add")
|
||||
public BaseResponse addUnitMaintain(@RequestBody UnitMaintainEntity unitMaintainEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
|
||||
unitMaintainEntity.setCustomerId(authAdmin.getCustomerId() + "");
|
||||
unitMaintainService.insertUnitMaintain(unitMaintainEntity);
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/unitMaintain/modify")
|
||||
public BaseResponse modifyUnitMaintain(@RequestBody UnitMaintainEntity unitMaintainEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
//
|
||||
// ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
// if (attributes == null) {
|
||||
// throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
// }
|
||||
// AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
|
||||
// unitMaintainEntity.setCustomerId(authAdmin.getCustomerId() + "");
|
||||
unitMaintainService.updateUnit(unitMaintainEntity);
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/unitMaintain/delete")
|
||||
public BaseResponse deleteUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
unitMaintainService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.entity.contrast.WhitecodeEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.contrast.WhitecodeResponse;
|
||||
import com.glxp.udi.admin.service.contrast.WhitecodeService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
public class WhitecodeController {
|
||||
@Resource
|
||||
WhitecodeService whitecodeService;
|
||||
|
||||
//白名单下载
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/salewarehouse/whitecode/list")
|
||||
public BaseResponse listWhitecode(@Valid ListPageRequest listPageRequest, BindingResult bindingResult) {
|
||||
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
String userId = request.getHeader("ADMIN_ID");
|
||||
// AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
|
||||
List<WhitecodeEntity> whitecodeEntities = whitecodeService.findAll(listPageRequest);
|
||||
List<WhitecodeResponse> whitecodeResponses = whitecodeEntities.stream().map(item ->
|
||||
{
|
||||
WhitecodeResponse whitecodeResponse = new WhitecodeResponse();
|
||||
BeanUtils.copyProperties(item, whitecodeResponse);
|
||||
return whitecodeResponse;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
PageInfo<WhitecodeResponse> pageInfo = new PageInfo<>(whitecodeResponses);
|
||||
PageSimpleResponse<WhitecodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(whitecodeResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,97 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.constant.BussinessTypeUtils;
|
||||
import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.receipts.BussinessTypeService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 业务类型维护
|
||||
*/
|
||||
|
||||
@RestController
|
||||
public class BussinessTypeController {
|
||||
|
||||
|
||||
@Resource
|
||||
private BussinessTypeService bussinessTypeService;
|
||||
|
||||
|
||||
@GetMapping("/warehouse/bussinessType/filter")
|
||||
public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<BussinessTypeEntity> bussinessTypeEntities;
|
||||
|
||||
Map<String, String> data = BussinessTypeUtils.getBusssinessTypeMap();
|
||||
String type = data.getOrDefault(bussinessTypeFilterRequest.getUdiwmsType(), bussinessTypeFilterRequest.getUdiwmsType());
|
||||
bussinessTypeFilterRequest.setUdiwmsType(type);
|
||||
bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
|
||||
PageInfo<BussinessTypeEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(bussinessTypeEntities);
|
||||
PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(bussinessTypeEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/bussinessType/delete")
|
||||
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
bussinessTypeService.deleteById(id);
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/bussinessType/update")
|
||||
public BaseResponse updateBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (bussinessTypeEntity != null) {
|
||||
bussinessTypeService.updateBussinessType(bussinessTypeEntity);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/bussinessType/insert")
|
||||
public BaseResponse insertBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (bussinessTypeEntity != null) {
|
||||
bussinessTypeService.insertBussinessType(bussinessTypeEntity);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,134 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.Druginfo;
|
||||
import com.glxp.udi.admin.entity.receipt.ManuOrderEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ManuorderFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.inout.MipsManuorderResponse;
|
||||
import com.glxp.udi.admin.res.receipt.SelectManuorderResponse;
|
||||
import com.glxp.udi.admin.service.inout.DruginfoService;
|
||||
import com.glxp.udi.admin.service.receipts.ManuorderService;
|
||||
import com.glxp.udi.admin.service.receipts.ProductService;
|
||||
import com.glxp.udi.admin.util.HttpClient;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
public class ManuOrderController {
|
||||
@Resource
|
||||
private ManuorderService manuorderService;
|
||||
@Resource
|
||||
private DruginfoService druginfoService;
|
||||
|
||||
@Resource
|
||||
private ProductService productService;
|
||||
|
||||
@Value("${UDIC_MIPSDOWNLOAD_URL}")
|
||||
private String url;
|
||||
|
||||
@GetMapping("/warehouse/manuorder/filter")
|
||||
public BaseResponse filterReceipt(ManuorderFilterRequest manuorderFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ManuOrderEntity> manuOrderEntities;
|
||||
|
||||
manuOrderEntities = manuorderService.filterList(manuorderFilterRequest);
|
||||
|
||||
PageInfo<ManuOrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(manuOrderEntities);
|
||||
PageSimpleResponse<ManuOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(manuOrderEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("warehouse/manuorder/import")
|
||||
public BaseResponse importManuorder(ManuorderFilterRequest manuorderFilterRequest) {
|
||||
Map<String, Object> paramMap = new HashMap<>(16);
|
||||
paramMap.put("page", manuorderFilterRequest.getPage());
|
||||
paramMap.put("limit", manuorderFilterRequest.getLimit());
|
||||
paramMap.put("BatchNo", manuorderFilterRequest.getBatchNo());
|
||||
paramMap.put("startTime", manuorderFilterRequest.getStartTime());
|
||||
paramMap.put("endTime", manuorderFilterRequest.getEndTime());
|
||||
String response = HttpClient.mipsGet(url + "/mips/manuorder/filter", paramMap);
|
||||
MipsManuorderResponse mipsManuorderResponse;
|
||||
try {
|
||||
mipsManuorderResponse = (MipsManuorderResponse) JSONObject.parseObject(response, MipsManuorderResponse.class);
|
||||
} catch (Exception e) {
|
||||
return ResultVOUtils.error(911, "连接mips服务出错");
|
||||
}
|
||||
if (mipsManuorderResponse.getCode() == 20000) {
|
||||
List<ManuOrderEntity> mipsDrugEntities = mipsManuorderResponse.getData().getList();
|
||||
if (mipsDrugEntities != null) {
|
||||
List<SelectManuorderResponse> selectManuorderResponses = new ArrayList<>();
|
||||
for (ManuOrderEntity manuOrderEntity : mipsDrugEntities) {
|
||||
Druginfo druginfo = druginfoService.selectByNamecode(manuOrderEntity.getCodeNum());
|
||||
SelectManuorderResponse selectManuorderResponse = new SelectManuorderResponse();
|
||||
selectManuorderResponse.setBatchNo(manuOrderEntity.getBatchNo());
|
||||
selectManuorderResponse.setCloseFlag(manuOrderEntity.getCloseFlag());
|
||||
selectManuorderResponse.setCodeNum(manuOrderEntity.getCodeNum());
|
||||
selectManuorderResponse.setComments(manuOrderEntity.getComments());
|
||||
selectManuorderResponse.setDrugProductionDate(manuOrderEntity.getDrugProductionDate());
|
||||
selectManuorderResponse.setDrugShelfLifeToDate(manuOrderEntity.getDrugShelfLifeToDate());
|
||||
selectManuorderResponse.setLastModifyTime(manuOrderEntity.getLastModifyTime());
|
||||
selectManuorderResponse.setName(druginfo.getConame());
|
||||
selectManuorderResponse.setOrderNo(manuOrderEntity.getOrderNo());
|
||||
selectManuorderResponse.setOrderQty(manuOrderEntity.getOrderQty());
|
||||
selectManuorderResponse.setPackRatio(druginfo.getPackratio());
|
||||
selectManuorderResponse.setSpec(druginfo.getPackspec());
|
||||
if (productService.isExit(manuOrderEntity.getOrderNo()))
|
||||
selectManuorderResponse.setIsUpdate("是");
|
||||
else
|
||||
selectManuorderResponse.setIsUpdate("否");
|
||||
selectManuorderResponse.setUuid(druginfo.getUuid());
|
||||
selectManuorderResponse.setOrderID(manuOrderEntity.getID() + "");
|
||||
selectManuorderResponses.add(selectManuorderResponse);
|
||||
}
|
||||
PageInfo<SelectManuorderResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(selectManuorderResponses);
|
||||
PageSimpleResponse<SelectManuorderResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(selectManuorderResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
} else {
|
||||
return ResultVOUtils.error(911, "导入失败");
|
||||
}
|
||||
return ResultVOUtils.error(911, "导入失败");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/manuorder/delete")
|
||||
public BaseResponse deleteProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
manuorderService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity;
|
||||
import com.glxp.udi.admin.req.receipt.MipsBarcodeRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.receipts.MipsBarcodeService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.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 MipsBarcodeController {
|
||||
|
||||
@Resource
|
||||
private MipsBarcodeService mipsBarcodeService;
|
||||
|
||||
|
||||
@GetMapping("/warehouse/barcodes/filter")
|
||||
public BaseResponse filterBarcodes(MipsBarcodeRequest mipsBarcodeRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<MipsBarcodeEntity> manuOrderEntities;
|
||||
|
||||
manuOrderEntities = mipsBarcodeService.filterBarcodes(mipsBarcodeRequest);
|
||||
|
||||
PageInfo<MipsBarcodeEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(manuOrderEntities);
|
||||
PageSimpleResponse<MipsBarcodeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(manuOrderEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
}
|
||||
@ -1,248 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity;
|
||||
import com.glxp.udi.admin.entity.receipt.ProductOrderEntity;
|
||||
import com.glxp.udi.admin.entity.udid.UdiEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.AddProductRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ProductFilterRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ProductMipsRequest;
|
||||
import com.glxp.udi.admin.req.udid.VerifyCodeRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.receipt.MipsBarcodeResponse;
|
||||
import com.glxp.udi.admin.res.receipt.SelectManuorderResponse;
|
||||
import com.glxp.udi.admin.service.receipts.MipsBarcodeService;
|
||||
import com.glxp.udi.admin.service.receipts.ProductService;
|
||||
import com.glxp.udi.admin.util.FilterUdiUtils;
|
||||
import com.glxp.udi.admin.util.HttpClient;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 生产订单
|
||||
*/
|
||||
@RestController
|
||||
public class ProductController {
|
||||
|
||||
|
||||
@Resource
|
||||
private ProductService productService;
|
||||
@Resource
|
||||
private MipsBarcodeService mipsBarcodeService;
|
||||
@Value("${UDIC_MIPSDOWNLOAD_URL}")
|
||||
private String url;
|
||||
|
||||
/**
|
||||
* 生产订单搜索
|
||||
*
|
||||
* @param productFilterRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/warehouse/product/filter")
|
||||
public BaseResponse filterReceipt(ProductFilterRequest productFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ProductOrderEntity> productOrderEntities;
|
||||
|
||||
productOrderEntities = productService.filterList(productFilterRequest);
|
||||
|
||||
PageInfo<ProductOrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(productOrderEntities);
|
||||
PageSimpleResponse<ProductOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(productOrderEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/product/delete")
|
||||
public BaseResponse deleteProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
productService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/product/update")
|
||||
public BaseResponse updateProduct(@RequestBody ProductOrderEntity productOrderEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (productOrderEntity != null) {
|
||||
productService.updateProduct(productOrderEntity);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/product/insert")
|
||||
public BaseResponse insertProduct(@RequestBody AddProductRequest addProductRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (addProductRequest != null) {
|
||||
productService.insertProduct(addProductRequest);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/product/insertmips")
|
||||
public BaseResponse insertMips(@RequestBody ProductMipsRequest productMipsRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (productMipsRequest != null) {
|
||||
List<SelectManuorderResponse> selectManuorderResponses = productMipsRequest.getSelectManuorderResponseList();
|
||||
if (selectManuorderResponses != null && selectManuorderResponses.size() > 0) {
|
||||
List<ProductOrderEntity> productOrderEntities = new ArrayList<>();
|
||||
|
||||
for (SelectManuorderResponse selectManuorderResponse : selectManuorderResponses) {
|
||||
ProductOrderEntity productOrderEntity = new ProductOrderEntity();
|
||||
productOrderEntity.setCount(selectManuorderResponse.getOrderQty());
|
||||
productOrderEntity.setBatchNo(selectManuorderResponse.getBatchNo());
|
||||
productOrderEntity.setCloseFlag(Integer.parseInt(selectManuorderResponse.getCloseFlag()));
|
||||
productOrderEntity.setComments(selectManuorderResponse.getComments());
|
||||
productOrderEntity.setExpirationDate(selectManuorderResponse.getDrugShelfLifeToDate());
|
||||
productOrderEntity.setOrderNo(selectManuorderResponse.getOrderNo());
|
||||
productOrderEntity.setManufacturingDate(selectManuorderResponse.getDrugProductionDate());
|
||||
productOrderEntity.setUdi(selectManuorderResponse.getUuid());
|
||||
productOrderEntity.setOrderId(selectManuorderResponse.getOrderID());
|
||||
productOrderEntities.add(productOrderEntity);
|
||||
}
|
||||
productService.insertProductList(productOrderEntities);
|
||||
|
||||
for (ProductOrderEntity productOrderEntity : productOrderEntities) {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
paramMap.put("orderId", productOrderEntity.getOrderId());
|
||||
String response = HttpClient.mipsGet(url + "/mips/barcode/list", paramMap);
|
||||
MipsBarcodeResponse mipsBarcodeResponse;
|
||||
try {
|
||||
mipsBarcodeResponse = (MipsBarcodeResponse) JSONObject.parseObject(response, MipsBarcodeResponse.class);
|
||||
} catch (Exception e) {
|
||||
return ResultVOUtils.error(911, "连接mips服务出错");
|
||||
}
|
||||
if (mipsBarcodeResponse.getCode() == 20000) {
|
||||
List<MipsBarcodeResponse.DataBean.ListBean> mipsBarcodes = mipsBarcodeResponse.getData().getList();
|
||||
|
||||
if(mipsBarcodes!=null && mipsBarcodes.size()>0){
|
||||
List<MipsBarcodeEntity> mipsBarcodeEntities = new ArrayList<>();
|
||||
for (MipsBarcodeResponse.DataBean.ListBean mipsBean :mipsBarcodes){
|
||||
MipsBarcodeEntity mipsBarcodeEntity = new MipsBarcodeEntity();
|
||||
mipsBarcodeEntity.setBatchNo(productOrderEntity.getBatchNo());
|
||||
mipsBarcodeEntity.setCloseFlag(productOrderEntity.getCloseFlag()+"");
|
||||
mipsBarcodeEntity.setCode(mipsBean.getBarcode());
|
||||
mipsBarcodeEntity.setCodeLevel(mipsBean.getCodeLevel());
|
||||
mipsBarcodeEntity.setComments(productOrderEntity.getComments());
|
||||
mipsBarcodeEntity.setCount(productOrderEntity.getCount()+"");
|
||||
mipsBarcodeEntity.setExpirationDate(productOrderEntity.getExpirationDate());
|
||||
mipsBarcodeEntity.setLastModifyTime(mipsBean.getPackTime());
|
||||
mipsBarcodeEntity.setManufacturingDate(productOrderEntity.getManufacturingDate());
|
||||
mipsBarcodeEntity.setOrderId(productOrderEntity.getOrderNo());
|
||||
mipsBarcodeEntity.setPackFlag(mipsBean.getPackFlag());
|
||||
mipsBarcodeEntity.setPCode(mipsBean.getParentCodeID()+"");
|
||||
mipsBarcodeEntities.add(mipsBarcodeEntity);
|
||||
}
|
||||
mipsBarcodeService.insertList(mipsBarcodeEntities);
|
||||
}
|
||||
|
||||
|
||||
// if (mipsDrugEntities != null) {
|
||||
// List<SelectManuorderResponse> selectManuorderResponses = new ArrayList<>();
|
||||
// for(ManuOrderEntity manuOrderEntity:mipsDrugEntities){
|
||||
// Druginfo druginfo = druginfoService.selectByNamecode(manuOrderEntity.getCodeNum());
|
||||
// SelectManuorderResponse selectManuorderResponse = new SelectManuorderResponse();
|
||||
// selectManuorderResponse.setBatchNo(manuOrderEntity.getBatchNo());
|
||||
// selectManuorderResponse.setCloseFlag(manuOrderEntity.getCloseFlag());
|
||||
// selectManuorderResponse.setCodeNum(manuOrderEntity.getCodeNum());
|
||||
// selectManuorderResponse.setComments(manuOrderEntity.getComments());
|
||||
// selectManuorderResponse.setDrugProductionDate(manuOrderEntity.getDrugProductionDate());
|
||||
// selectManuorderResponse.setDrugShelfLifeToDate(manuOrderEntity.getDrugShelfLifeToDate());
|
||||
// selectManuorderResponse.setLastModifyTime(manuOrderEntity.getLastModifyTime());
|
||||
// selectManuorderResponse.setName(druginfo.getConame());
|
||||
// selectManuorderResponse.setOrderNo(manuOrderEntity.getOrderNo());
|
||||
// selectManuorderResponse.setOrderQty(manuOrderEntity.getOrderQty());
|
||||
// selectManuorderResponse.setPackRatio(druginfo.getPackratio());
|
||||
// selectManuorderResponse.setSpec(druginfo.getPackspec());
|
||||
// selectManuorderResponse.setUpdate(manuorderService.isExit(manuOrderEntity.getOrderNo()));
|
||||
// selectManuorderResponse.setUuid(druginfo.getUuid());
|
||||
// selectManuorderResponses.add(selectManuorderResponse);
|
||||
// }
|
||||
// PageInfo<SelectManuorderResponse> pageInfo;
|
||||
// pageInfo = new PageInfo<>(selectManuorderResponses);
|
||||
// PageSimpleResponse<SelectManuorderResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
// pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
// pageSimpleResponse.setList(selectManuorderResponses);
|
||||
// return ResultVOUtils.success(pageSimpleResponse);
|
||||
} else {
|
||||
return ResultVOUtils.error(911, "导入失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
// productService.insertProduct(addProductRequest);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 生产订单验证
|
||||
*
|
||||
* @param verifyCodeRequest
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/warehouse/product/verify")
|
||||
public BaseResponse verifyCode(@RequestBody VerifyCodeRequest verifyCodeRequest) {
|
||||
|
||||
String code = verifyCodeRequest.getKey();
|
||||
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
||||
return ResultVOUtils.success(udiEntity);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新验证数量
|
||||
*
|
||||
* @param deleteRequest
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/warehouse/product/updateCount")
|
||||
public BaseResponse updateCount(@RequestBody DeleteRequest deleteRequest) {
|
||||
ProductOrderEntity productOrderEntity = productService.selectById(deleteRequest.getId());
|
||||
int count = productOrderEntity.getCount();
|
||||
productOrderEntity.setCount(count + 1);
|
||||
productService.updateProduct(productOrderEntity);
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,192 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.dao.udid.DeviceMapper;
|
||||
import com.glxp.udi.admin.entity.inout.WarehouseEntity;
|
||||
import com.glxp.udi.admin.entity.receipt.ReceiptsEntity;
|
||||
import com.glxp.udi.admin.entity.receipt.ReceiptsdDetailEntity;
|
||||
import com.glxp.udi.admin.entity.udid.Device;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.AddReceiptRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ReceiptDetailRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ReceiptFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.inout.WarehouseService;
|
||||
import com.glxp.udi.admin.service.receipts.ReceiptDetailService;
|
||||
import com.glxp.udi.admin.service.receipts.ReceiptsService;
|
||||
import com.glxp.udi.admin.util.ReceiptBeanUtils;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
public class ReceiptsController {
|
||||
|
||||
@Resource
|
||||
private ReceiptsService receiptsService;
|
||||
@Resource
|
||||
private ReceiptDetailService receiptDetailService;
|
||||
@Resource
|
||||
private WarehouseService warehouseService;
|
||||
@Resource
|
||||
private DeviceMapper deviceMapper;
|
||||
|
||||
|
||||
@GetMapping("/warehouse/receipt/order/filter")
|
||||
public BaseResponse filterReceipt(ReceiptFilterRequest receiptFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ReceiptsEntity> receiptsEntities;
|
||||
|
||||
receiptsEntities = receiptsService.filterList(receiptFilterRequest);
|
||||
|
||||
PageInfo<ReceiptsEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(receiptsEntities);
|
||||
PageSimpleResponse<ReceiptsEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(receiptsEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("/warehouse/receipt/code/filter")
|
||||
public BaseResponse listReceiptDetail(ReceiptDetailRequest receiptDetailRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ReceiptsdDetailEntity> receiptsdDetailEntities;
|
||||
|
||||
receiptsdDetailEntities = receiptDetailService.listReceiptsDetail(receiptDetailRequest);
|
||||
|
||||
PageInfo<ReceiptsdDetailEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(receiptsdDetailEntities);
|
||||
PageSimpleResponse<ReceiptsdDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(receiptsdDetailEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/receipt/addList")
|
||||
public BaseResponse addList(@RequestBody AddReceiptRequest addReceiptRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<AddReceiptRequest.ReceiptRequest> receiptRequests = addReceiptRequest.getReceipts();
|
||||
List<ReceiptsEntity> receiptsEntityList = new ArrayList<>();
|
||||
if (receiptRequests != null && receiptRequests.size() > 0) {
|
||||
for (int i = 0; i < receiptRequests.size(); i++) {
|
||||
ReceiptsEntity receiptsEntity = ReceiptBeanUtils.requestToEntity(receiptRequests.get(i), i);
|
||||
receiptsEntityList.add(receiptsEntity);
|
||||
}
|
||||
receiptsService.insertReceipts(receiptsEntityList);
|
||||
for (int i = 0; i < receiptsEntityList.size(); i++) {
|
||||
ReceiptsEntity receiptsEntity = receiptsEntityList.get(i);
|
||||
List<WarehouseEntity> warehouseEntityList = warehouseService.findByReceiptId(receiptsEntity.getReceiptNo());
|
||||
try {
|
||||
filterReceipt(receiptsEntity.getId(), warehouseEntityList);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
||||
return ResultVOUtils.error(500, "UDI码错误");
|
||||
}
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
public void drugFilter(){
|
||||
|
||||
}
|
||||
|
||||
public void filterReceipt(String receiptId, List<WarehouseEntity> warehouseEntityList) {
|
||||
Map<String, Integer> groups = new HashMap<String, Integer>();
|
||||
List<ReceiptsdDetailEntity> receiptsdDetailEntities = new ArrayList<>();
|
||||
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
|
||||
String code = warehouseEntity.getCode().substring(2, 16);
|
||||
groups.put(code, 0);
|
||||
}
|
||||
for (String code : groups.keySet()) {
|
||||
int count = 0;
|
||||
WarehouseEntity temp = null;
|
||||
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
|
||||
if (warehouseEntity.getCode().substring(2, 16).equals(code)) {
|
||||
count++;
|
||||
temp = warehouseEntity;
|
||||
groups.put(code, count);
|
||||
}
|
||||
}
|
||||
Device device = deviceMapper.searchByBs(code);
|
||||
ReceiptsdDetailEntity receiptsdDetailEntity = new ReceiptsdDetailEntity();
|
||||
receiptsdDetailEntity.setReceiptId(receiptId);
|
||||
receiptsdDetailEntity.setCode(code);
|
||||
receiptsdDetailEntity.setName(device.getCpmctymc());
|
||||
receiptsdDetailEntity.setSpec(device.getGgxh());
|
||||
receiptsdDetailEntity.setPermitNo(device.getZczbhhzbapzbh());
|
||||
receiptsdDetailEntity.setCount(count);
|
||||
receiptsdDetailEntity.setEnterprise(device.getYlqxzcrbarmc());
|
||||
receiptsdDetailEntity.setStockRange(device.getTscchcztj());
|
||||
|
||||
if (temp != null) {
|
||||
receiptsdDetailEntity.setInoutDate(temp.getActDate());
|
||||
receiptsdDetailEntity.setUnit(temp.getFromCorp());
|
||||
receiptsdDetailEntity.setBatchNo(temp.getBatchNo());
|
||||
receiptsdDetailEntity.setExpireDate(temp.getExpireDate());
|
||||
receiptsdDetailEntity.setProduceDate(temp.getProduceDate());
|
||||
}
|
||||
receiptsdDetailEntity.setIsGift("");
|
||||
receiptsdDetailEntity.setRemark("");
|
||||
receiptsdDetailEntity.setTonCount(0);
|
||||
receiptsdDetailEntities.add(receiptsdDetailEntity);
|
||||
}
|
||||
receiptDetailService.insertReceiptsDetails(receiptsdDetailEntities);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/receipt/updateReceipt")
|
||||
public BaseResponse updateReceipt(@RequestBody ReceiptsEntity receiptsEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (receiptsEntity != null) {
|
||||
receiptsService.updateReceipts(receiptsEntity);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
|
||||
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@PostMapping("warehouse/receipt/deleteReceipt")
|
||||
public BaseResponse deleteReceipt(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
receiptsService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
}
|
||||
@ -1,91 +0,0 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.Unit;
|
||||
import com.glxp.udi.admin.entity.receipt.UnitMaintainEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.CombineUnitRequest;
|
||||
import com.glxp.udi.admin.req.receipt.UnitMaintainFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.inout.UnitService;
|
||||
import com.glxp.udi.admin.service.receipts.UnitMaintainService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 往来单位信息维护
|
||||
*/
|
||||
@RestController
|
||||
public class UnitMaintainController {
|
||||
|
||||
@Resource
|
||||
private UnitMaintainService unitMaintainService;
|
||||
@Resource
|
||||
private UnitService unitService;
|
||||
|
||||
@GetMapping("/warehouse/unitMaintain/filter")
|
||||
public BaseResponse filterUnitMaintain(UnitMaintainFilterRequest unitMaintainFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<UnitMaintainEntity> unitMaintainEntities;
|
||||
unitMaintainEntities = unitMaintainService.filterList(unitMaintainFilterRequest);
|
||||
PageInfo<UnitMaintainEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(unitMaintainEntities);
|
||||
PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(unitMaintainEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/unitMaintain/combine")
|
||||
public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<String> keys = combineRequest.getKeys();
|
||||
if (keys != null && keys.size() > 0) {
|
||||
for (String key : keys) {
|
||||
Unit unit = unitService.selectById(key);
|
||||
UnitMaintainEntity unitMaintainEntity = new UnitMaintainEntity();
|
||||
unitMaintainEntity.setThirdId(combineRequest.getThirdId());//关联第三方ID
|
||||
unitMaintainEntity.setAddr(unit.getAddr());
|
||||
unitMaintainEntity.setName(unit.getName());
|
||||
unitMaintainEntity.setSpell(unit.getSpell());
|
||||
unitMaintainEntity.setStatus(unit.getStatus());
|
||||
unitMaintainEntity.setType(unit.getType());
|
||||
unitMaintainEntity.setUnitId(unit.getUnitId());
|
||||
unitMaintainService.insertUnitMaintain(unitMaintainEntity);
|
||||
}
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("合并成功");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/unitMaintain/delete")
|
||||
public BaseResponse deleteUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
unitMaintainService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.glxp.udi.admin.dao.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.info.SetupEntity;
|
||||
import com.glxp.udi.admin.req.info.FilterSetupRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SetupDao {
|
||||
|
||||
SetupEntity findSetup(FilterSetupRequest filterSetupRequest);
|
||||
|
||||
boolean modifySetup(SetupEntity setupEntity);
|
||||
|
||||
boolean insertSetup(SetupEntity setupEntity);
|
||||
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package com.glxp.udi.admin.dao.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterErpOrderRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface MyErpOrderDao {
|
||||
|
||||
List<ErpOrderEntity> filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> findByStockCheck(@Param("orderids") List<String> orderids);
|
||||
|
||||
List<ErpOrderEntity> filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> findAllByDocids(@Param("docids") List<String> docids);
|
||||
|
||||
List<String> filterAllDocid(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
boolean insertErpOrders(@Param("erpOrderEntities") List<ErpOrderEntity> erpOrderEntities);
|
||||
|
||||
boolean insertErpOrder(ErpOrderEntity erpOrderEntity);
|
||||
|
||||
boolean updateErpOrder(ErpOrderEntity erpOrderEntity);
|
||||
|
||||
boolean deleteById(@Param("id") String id);
|
||||
|
||||
boolean deleteByPrimiyId(@Param("id") String id);
|
||||
|
||||
|
||||
Integer isExit(@Param("docid") String docid);
|
||||
|
||||
List<String> selectAllIds(@Param("docids") List<String> docids);
|
||||
|
||||
boolean deleteByOrderId(@Param("id") String id);
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.glxp.udi.admin.dao.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface UdiInfoDao {
|
||||
|
||||
List<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
List<UdiInfoEntity> filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode);
|
||||
|
||||
UdiInfoEntity findByUuid(@Param("uuid") String uuid);
|
||||
|
||||
List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid);
|
||||
|
||||
|
||||
UdiInfoEntity selectById(@Param("id") String id);
|
||||
|
||||
boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);
|
||||
|
||||
boolean insertUdiInfos(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities);
|
||||
|
||||
boolean updateUdiInfo(UdiInfoEntity udiInfoEntity);
|
||||
boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity);
|
||||
|
||||
boolean deleteById(@Param("id") String id);
|
||||
|
||||
boolean deleteByUuid(@Param("uuid") String uuid);
|
||||
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package com.glxp.udi.admin.dao.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
|
||||
import com.glxp.udi.admin.res.inout.UdiRelevanceResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface UdiRelevanceDao {
|
||||
|
||||
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
List<UdiRelevanceResponse> filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
// UdiRelevanceResponse selectUdiByUUid
|
||||
List<UdiRelevanceEntity> selectByUuid(@Param("uuid") String uuid);
|
||||
|
||||
UdiRelevanceEntity selectById(@Param("id") String id);
|
||||
|
||||
UdiRelevanceEntity selectByThirdId(@Param("thirdId") String thirdId);
|
||||
|
||||
boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
|
||||
|
||||
boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
|
||||
|
||||
boolean deleteById(@Param("id") String id);
|
||||
|
||||
boolean deleteByIds(@Param("ids") List<String> id);
|
||||
|
||||
boolean deleteByUuid(@Param("uuid") String uuid);
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package com.glxp.udi.admin.dao.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.Warehousetemp;
|
||||
import com.glxp.udi.admin.entity.inout.WarehousetempExample;
|
||||
import com.glxp.udi.admin.req.inout.WarehouseQueryRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface WarehousetempMapper {
|
||||
long countByExample(WarehousetempExample example);
|
||||
|
||||
int deleteByExample(WarehousetempExample example);
|
||||
|
||||
int deleteByPrimaryKey(Long id);
|
||||
|
||||
int insert(Warehousetemp record);
|
||||
|
||||
int insertSelective(Warehousetemp record);
|
||||
|
||||
List<Warehousetemp> selectByExample(WarehousetempExample example);
|
||||
|
||||
Warehousetemp selectByPrimaryKey(Long id);
|
||||
|
||||
int updateByExampleSelective(@Param("record") Warehousetemp record, @Param("example") WarehousetempExample example);
|
||||
|
||||
int updateByExample(@Param("record") Warehousetemp record, @Param("example") WarehousetempExample example);
|
||||
|
||||
int updateByPrimaryKeySelective(Warehousetemp record);
|
||||
|
||||
int updateByPrimaryKey(Warehousetemp record);
|
||||
|
||||
int insertTempWarehouses(@Param("warehouseEntities") List<Warehousetemp> warehouseEntities);
|
||||
|
||||
int deleteTempWarehouses(@Param("warehouseEntities") List<Long> warehouseEntities);
|
||||
|
||||
List<Warehousetemp> findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest);
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
package com.glxp.udi.admin.dao.receipt;
|
||||
|
||||
import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface BussinessTypeDao {
|
||||
|
||||
List<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
|
||||
|
||||
boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);
|
||||
|
||||
boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity);
|
||||
|
||||
boolean deleteById(@Param("id") String id);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.glxp.udi.admin.entity.info;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class SetupEntity {
|
||||
|
||||
private int id;
|
||||
private boolean erpSaleOutModify;
|
||||
private boolean erpGetSaleOut;
|
||||
private boolean erpSaleOutSign;
|
||||
private boolean filterSaleOutSign;
|
||||
private int erpGetSaleOutDay;
|
||||
|
||||
private boolean erpPruchaseModify;
|
||||
private boolean erpGetPurchaseIn;
|
||||
private boolean erpPruchaseSign;
|
||||
private int erpGetPurchaseDay;
|
||||
private boolean filterPurchaseSign;
|
||||
private String remark;
|
||||
private boolean forbidSameErp;
|
||||
|
||||
private boolean returnWareHouseOut;
|
||||
private boolean salesWareHouseOut;
|
||||
private boolean returnWareHouseIn;
|
||||
private boolean updateErpData;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.udi.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BussinessTypeEntity {
|
||||
private Integer id;
|
||||
private String thirdId;
|
||||
private String udiwmsType;
|
||||
private String thirdType;
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.glxp.udi.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ErpDetailCodeEntity {
|
||||
private String nameCode;
|
||||
private String packRatio;
|
||||
private String packSpec;
|
||||
private String authCode;
|
||||
private String coName;
|
||||
private String unit;
|
||||
private int bhzxxsbzsl;
|
||||
private int zxxsbzbhsydysl;
|
||||
private int isUseDy;
|
||||
private String batchNo;
|
||||
private String code;
|
||||
private int count;
|
||||
private String thirdProductNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package com.glxp.udi.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class OrderDetailEntity {
|
||||
|
||||
private String id;
|
||||
private String nameCode;
|
||||
private String packRatio;
|
||||
private String packLevel;
|
||||
private int bhxjsl;
|
||||
private int bhzxxsbzsl;
|
||||
|
||||
private String bhxjcpbm;
|
||||
private String bzcj;
|
||||
private String thirdProductNo;
|
||||
private String addType;
|
||||
private String deviceRecordKey;
|
||||
private String type;
|
||||
private String unit;
|
||||
private String coName;
|
||||
private String form;
|
||||
private String formSpec;
|
||||
private String packSpec;
|
||||
private String authCode;
|
||||
private String name;
|
||||
private String uuid;
|
||||
private int count;
|
||||
private int zxxsbzbhsydysl;
|
||||
private int isUseDy;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,132 @@
|
||||
package com.glxp.udi.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class TraceUploadEntity {
|
||||
|
||||
/**
|
||||
* udiCode : udi
|
||||
* documentsDate : 1619022931000
|
||||
* documentsType : type
|
||||
* corpName : 企业名称A
|
||||
* fromCorp : 往来单位B
|
||||
* productionCorp : 生产企业C
|
||||
* productName : 产品名称EEE
|
||||
* specifications : a12345
|
||||
* batchNo : b54321
|
||||
* productionDate : 1619123931000
|
||||
* expireDate : 1619323931000
|
||||
* count : 100
|
||||
*/
|
||||
|
||||
private String udiCode;
|
||||
private String documentsDate;
|
||||
private String documentsType;
|
||||
private String corpName;
|
||||
private String fromCorp;
|
||||
private String productionCorp;
|
||||
private String productName;
|
||||
private String specifications;
|
||||
private String batchNo;
|
||||
private String productionDate;
|
||||
private String expireDate;
|
||||
private int count;
|
||||
private String creditNum;
|
||||
|
||||
public String getUdiCode() {
|
||||
return udiCode;
|
||||
}
|
||||
|
||||
public void setUdiCode(String udiCode) {
|
||||
this.udiCode = udiCode;
|
||||
}
|
||||
|
||||
public String getDocumentsDate() {
|
||||
return documentsDate;
|
||||
}
|
||||
|
||||
public void setDocumentsDate(String documentsDate) {
|
||||
this.documentsDate = documentsDate;
|
||||
}
|
||||
|
||||
public String getDocumentsType() {
|
||||
return documentsType;
|
||||
}
|
||||
|
||||
public void setDocumentsType(String documentsType) {
|
||||
this.documentsType = documentsType;
|
||||
}
|
||||
|
||||
public String getCorpName() {
|
||||
return corpName;
|
||||
}
|
||||
|
||||
public void setCorpName(String corpName) {
|
||||
this.corpName = corpName;
|
||||
}
|
||||
|
||||
public String getFromCorp() {
|
||||
return fromCorp;
|
||||
}
|
||||
|
||||
public void setFromCorp(String fromCorp) {
|
||||
this.fromCorp = fromCorp;
|
||||
}
|
||||
|
||||
public String getProductionCorp() {
|
||||
return productionCorp;
|
||||
}
|
||||
|
||||
public void setProductionCorp(String productionCorp) {
|
||||
this.productionCorp = productionCorp;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public String getSpecifications() {
|
||||
return specifications;
|
||||
}
|
||||
|
||||
public void setSpecifications(String specifications) {
|
||||
this.specifications = specifications;
|
||||
}
|
||||
|
||||
public String getBatchNo() {
|
||||
return batchNo;
|
||||
}
|
||||
|
||||
public void setBatchNo(String batchNo) {
|
||||
this.batchNo = batchNo;
|
||||
}
|
||||
|
||||
public String getProductionDate() {
|
||||
return productionDate;
|
||||
}
|
||||
|
||||
public void setProductionDate(String productionDate) {
|
||||
this.productionDate = productionDate;
|
||||
}
|
||||
|
||||
public String getExpireDate() {
|
||||
return expireDate;
|
||||
}
|
||||
|
||||
public void setExpireDate(String expireDate) {
|
||||
this.expireDate = expireDate;
|
||||
}
|
||||
|
||||
public int getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(int count) {
|
||||
this.count = count;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,342 @@
|
||||
package com.glxp.udi.admin.entity.inout;
|
||||
|
||||
public class UdiInfoEntity {
|
||||
private Integer id;
|
||||
private String nameCode;
|
||||
private String packRatio;
|
||||
private String packLevel;
|
||||
private Integer bhxjsl;
|
||||
private Integer bhzxxsbzsl;
|
||||
private Integer zxxsbzbhsydysl;
|
||||
private String bhxjcpbm;
|
||||
private String sjcpbm; //
|
||||
private String bzcj;
|
||||
private String addType;
|
||||
private String deviceRecordKey;
|
||||
private Integer isUseDy;
|
||||
private String cpmctymc;
|
||||
private String cplb;
|
||||
private String flbm;
|
||||
private String ggxh;
|
||||
private String qxlb;
|
||||
private String tyshxydm;
|
||||
private String ylqxzcrbarmc;
|
||||
private String zczbhhzbapzbh;
|
||||
private String ylqxzcrbarywmc;
|
||||
private String sydycpbs;
|
||||
private String uuid;
|
||||
private Integer versionNumber;
|
||||
private Integer diType;
|
||||
private String thirdId;
|
||||
private String thirdName;
|
||||
private String customerId;
|
||||
|
||||
|
||||
//本地生成信息
|
||||
private String batchNo;
|
||||
private String produceDate;
|
||||
private String expireDate;
|
||||
private String serialNo;
|
||||
private String udi;
|
||||
private String code;
|
||||
private Integer count;
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getNameCode() {
|
||||
return nameCode;
|
||||
}
|
||||
|
||||
public void setNameCode(String nameCode) {
|
||||
this.nameCode = nameCode;
|
||||
}
|
||||
|
||||
public String getPackRatio() {
|
||||
return packRatio;
|
||||
}
|
||||
|
||||
public void setPackRatio(String packRatio) {
|
||||
this.packRatio = packRatio;
|
||||
}
|
||||
|
||||
public String getPackLevel() {
|
||||
return packLevel;
|
||||
}
|
||||
|
||||
public void setPackLevel(String packLevel) {
|
||||
this.packLevel = packLevel;
|
||||
}
|
||||
|
||||
public Integer getBhxjsl() {
|
||||
if (bhxjsl == null || bhxjsl == 0) {
|
||||
return 1;
|
||||
}
|
||||
return bhxjsl;
|
||||
}
|
||||
|
||||
public void setBhxjsl(Integer bhxjsl) {
|
||||
this.bhxjsl = bhxjsl;
|
||||
}
|
||||
|
||||
public Integer getBhzxxsbzsl() {
|
||||
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
|
||||
return 1;
|
||||
}
|
||||
return bhzxxsbzsl;
|
||||
}
|
||||
|
||||
public void setBhzxxsbzsl(Integer bhzxxsbzsl) {
|
||||
this.bhzxxsbzsl = bhzxxsbzsl;
|
||||
}
|
||||
|
||||
public Integer getZxxsbzbhsydysl() {
|
||||
if (zxxsbzbhsydysl == null || zxxsbzbhsydysl == 0) {
|
||||
return 1;
|
||||
}
|
||||
return zxxsbzbhsydysl;
|
||||
}
|
||||
|
||||
public void setZxxsbzbhsydysl(Integer zxxsbzbhsydysl) {
|
||||
this.zxxsbzbhsydysl = zxxsbzbhsydysl;
|
||||
}
|
||||
|
||||
public String getBhxjcpbm() {
|
||||
return bhxjcpbm;
|
||||
}
|
||||
|
||||
public void setBhxjcpbm(String bhxjcpbm) {
|
||||
this.bhxjcpbm = bhxjcpbm;
|
||||
}
|
||||
|
||||
public String getSjcpbm() {
|
||||
return sjcpbm;
|
||||
}
|
||||
|
||||
public void setSjcpbm(String sjcpbm) {
|
||||
this.sjcpbm = sjcpbm;
|
||||
}
|
||||
|
||||
public String getBzcj() {
|
||||
return bzcj;
|
||||
}
|
||||
|
||||
public void setBzcj(String bzcj) {
|
||||
this.bzcj = bzcj;
|
||||
}
|
||||
|
||||
public String getAddType() {
|
||||
return addType;
|
||||
}
|
||||
|
||||
public void setAddType(String addType) {
|
||||
this.addType = addType;
|
||||
}
|
||||
|
||||
public String getDeviceRecordKey() {
|
||||
return deviceRecordKey;
|
||||
}
|
||||
|
||||
public void setDeviceRecordKey(String deviceRecordKey) {
|
||||
this.deviceRecordKey = deviceRecordKey;
|
||||
}
|
||||
|
||||
public int getIsUseDy() {
|
||||
return isUseDy;
|
||||
}
|
||||
|
||||
public void setIsUseDy(int isUseDy) {
|
||||
this.isUseDy = isUseDy;
|
||||
}
|
||||
|
||||
public String getCpmctymc() {
|
||||
return cpmctymc;
|
||||
}
|
||||
|
||||
public void setCpmctymc(String cpmctymc) {
|
||||
this.cpmctymc = cpmctymc;
|
||||
}
|
||||
|
||||
public String getCplb() {
|
||||
return cplb;
|
||||
}
|
||||
|
||||
public void setCplb(String cplb) {
|
||||
this.cplb = cplb;
|
||||
}
|
||||
|
||||
public String getFlbm() {
|
||||
return flbm;
|
||||
}
|
||||
|
||||
public void setFlbm(String flbm) {
|
||||
this.flbm = flbm;
|
||||
}
|
||||
|
||||
public String getGgxh() {
|
||||
return ggxh;
|
||||
}
|
||||
|
||||
public void setGgxh(String ggxh) {
|
||||
this.ggxh = ggxh;
|
||||
}
|
||||
|
||||
public String getQxlb() {
|
||||
return qxlb;
|
||||
}
|
||||
|
||||
public void setQxlb(String qxlb) {
|
||||
this.qxlb = qxlb;
|
||||
}
|
||||
|
||||
public String getTyshxydm() {
|
||||
return tyshxydm;
|
||||
}
|
||||
|
||||
public void setTyshxydm(String tyshxydm) {
|
||||
this.tyshxydm = tyshxydm;
|
||||
}
|
||||
|
||||
public String getYlqxzcrbarmc() {
|
||||
return ylqxzcrbarmc;
|
||||
}
|
||||
|
||||
public void setYlqxzcrbarmc(String ylqxzcrbarmc) {
|
||||
this.ylqxzcrbarmc = ylqxzcrbarmc;
|
||||
}
|
||||
|
||||
public String getZczbhhzbapzbh() {
|
||||
return zczbhhzbapzbh;
|
||||
}
|
||||
|
||||
public void setZczbhhzbapzbh(String zczbhhzbapzbh) {
|
||||
this.zczbhhzbapzbh = zczbhhzbapzbh;
|
||||
}
|
||||
|
||||
public String getYlqxzcrbarywmc() {
|
||||
return ylqxzcrbarywmc;
|
||||
}
|
||||
|
||||
public void setYlqxzcrbarywmc(String ylqxzcrbarywmc) {
|
||||
this.ylqxzcrbarywmc = ylqxzcrbarywmc;
|
||||
}
|
||||
|
||||
public String getSydycpbs() {
|
||||
return sydycpbs;
|
||||
}
|
||||
|
||||
public void setSydycpbs(String sydycpbs) {
|
||||
this.sydycpbs = sydycpbs;
|
||||
}
|
||||
|
||||
public String getUuid() {
|
||||
return uuid;
|
||||
}
|
||||
|
||||
public void setUuid(String uuid) {
|
||||
this.uuid = uuid;
|
||||
}
|
||||
|
||||
public int getVersionNumber() {
|
||||
return versionNumber;
|
||||
}
|
||||
|
||||
public void setVersionNumber(int versionNumber) {
|
||||
this.versionNumber = versionNumber;
|
||||
}
|
||||
|
||||
public int getDiType() {
|
||||
return diType;
|
||||
}
|
||||
|
||||
public void setDiType(int diType) {
|
||||
this.diType = diType;
|
||||
}
|
||||
|
||||
public String getThirdId() {
|
||||
return thirdId;
|
||||
}
|
||||
|
||||
public void setThirdId(String thirdId) {
|
||||
this.thirdId = thirdId;
|
||||
}
|
||||
|
||||
public String getThirdName() {
|
||||
return thirdName;
|
||||
}
|
||||
|
||||
public void setThirdName(String thirdName) {
|
||||
this.thirdName = thirdName;
|
||||
}
|
||||
|
||||
public String getBatchNo() {
|
||||
return batchNo;
|
||||
}
|
||||
|
||||
public void setBatchNo(String batchNo) {
|
||||
this.batchNo = batchNo;
|
||||
}
|
||||
|
||||
public String getProduceDate() {
|
||||
return produceDate;
|
||||
}
|
||||
|
||||
public void setProduceDate(String produceDate) {
|
||||
this.produceDate = produceDate;
|
||||
}
|
||||
|
||||
public String getExpireDate() {
|
||||
return expireDate;
|
||||
}
|
||||
|
||||
public void setExpireDate(String expireDate) {
|
||||
this.expireDate = expireDate;
|
||||
}
|
||||
|
||||
public String getSerialNo() {
|
||||
return serialNo;
|
||||
}
|
||||
|
||||
public void setSerialNo(String serialNo) {
|
||||
this.serialNo = serialNo;
|
||||
}
|
||||
|
||||
public String getUdi() {
|
||||
return udi;
|
||||
}
|
||||
|
||||
public void setUdi(String udi) {
|
||||
this.udi = udi;
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setCode(String code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
if (count == null)
|
||||
return 1;
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(Integer count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public String getCustomerId() {
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setCustomerId(String customerId) {
|
||||
this.customerId = customerId;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.glxp.udi.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UdiRelevanceEntity {
|
||||
|
||||
private String id;
|
||||
private String thirdId;
|
||||
private String thirdName;
|
||||
private String uuid;
|
||||
private Boolean isUseDy;
|
||||
private String updateTime;
|
||||
private String batchNo;
|
||||
private String warehouseName;
|
||||
|
||||
}
|
||||
@ -0,0 +1,201 @@
|
||||
package com.glxp.udi.admin.entity.inout;
|
||||
|
||||
public class Warehousetemp {
|
||||
private Long id;
|
||||
|
||||
private String action;
|
||||
|
||||
private String mainaction;
|
||||
|
||||
private String code;
|
||||
|
||||
private String corporderid;
|
||||
|
||||
private String actor;
|
||||
|
||||
private String actdate;
|
||||
|
||||
private Integer wrongcode;
|
||||
|
||||
private String uppercorporderid;
|
||||
|
||||
private String fromcorpid;
|
||||
|
||||
private String fromcorp;
|
||||
|
||||
private String orderid;
|
||||
|
||||
private String batchno;
|
||||
|
||||
private String producedate;
|
||||
|
||||
private String expiredate;
|
||||
|
||||
private String serialno;
|
||||
|
||||
private String udi;
|
||||
|
||||
private Integer count;
|
||||
private Integer type;
|
||||
private Long customerId;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getAction() {
|
||||
return action;
|
||||
}
|
||||
|
||||
public void setAction(String action) {
|
||||
this.action = action == null ? null : action.trim();
|
||||
}
|
||||
|
||||
public String getMainaction() {
|
||||
return mainaction;
|
||||
}
|
||||
|
||||
public void setMainaction(String mainaction) {
|
||||
this.mainaction = mainaction == null ? null : mainaction.trim();
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setCode(String code) {
|
||||
this.code = code == null ? null : code.trim();
|
||||
}
|
||||
|
||||
public String getCorporderid() {
|
||||
return corporderid;
|
||||
}
|
||||
|
||||
public void setCorporderid(String corporderid) {
|
||||
this.corporderid = corporderid == null ? null : corporderid.trim();
|
||||
}
|
||||
|
||||
public String getActor() {
|
||||
return actor;
|
||||
}
|
||||
|
||||
public void setActor(String actor) {
|
||||
this.actor = actor == null ? null : actor.trim();
|
||||
}
|
||||
|
||||
public String getActdate() {
|
||||
return actdate;
|
||||
}
|
||||
|
||||
public void setActdate(String actdate) {
|
||||
this.actdate = actdate == null ? null : actdate.trim();
|
||||
}
|
||||
|
||||
public Integer getWrongcode() {
|
||||
return wrongcode;
|
||||
}
|
||||
|
||||
public void setWrongcode(Integer wrongcode) {
|
||||
this.wrongcode = wrongcode;
|
||||
}
|
||||
|
||||
public String getUppercorporderid() {
|
||||
return uppercorporderid;
|
||||
}
|
||||
|
||||
public void setUppercorporderid(String uppercorporderid) {
|
||||
this.uppercorporderid = uppercorporderid == null ? null : uppercorporderid.trim();
|
||||
}
|
||||
|
||||
public String getFromcorpid() {
|
||||
return fromcorpid;
|
||||
}
|
||||
|
||||
public void setFromcorpid(String fromcorpid) {
|
||||
this.fromcorpid = fromcorpid == null ? null : fromcorpid.trim();
|
||||
}
|
||||
|
||||
public String getFromcorp() {
|
||||
return fromcorp;
|
||||
}
|
||||
|
||||
public void setFromcorp(String fromcorp) {
|
||||
this.fromcorp = fromcorp == null ? null : fromcorp.trim();
|
||||
}
|
||||
|
||||
public String getOrderid() {
|
||||
return orderid;
|
||||
}
|
||||
|
||||
public void setOrderid(String orderid) {
|
||||
this.orderid = orderid == null ? null : orderid.trim();
|
||||
}
|
||||
|
||||
public String getBatchno() {
|
||||
return batchno;
|
||||
}
|
||||
|
||||
public void setBatchno(String batchno) {
|
||||
this.batchno = batchno == null ? null : batchno.trim();
|
||||
}
|
||||
|
||||
public String getProducedate() {
|
||||
return producedate;
|
||||
}
|
||||
|
||||
public void setProducedate(String producedate) {
|
||||
this.producedate = producedate == null ? null : producedate.trim();
|
||||
}
|
||||
|
||||
public String getExpiredate() {
|
||||
return expiredate;
|
||||
}
|
||||
|
||||
public void setExpiredate(String expiredate) {
|
||||
this.expiredate = expiredate == null ? null : expiredate.trim();
|
||||
}
|
||||
|
||||
public String getSerialno() {
|
||||
return serialno;
|
||||
}
|
||||
|
||||
public void setSerialno(String serialno) {
|
||||
this.serialno = serialno == null ? null : serialno.trim();
|
||||
}
|
||||
|
||||
public String getUdi() {
|
||||
return udi;
|
||||
}
|
||||
|
||||
public void setUdi(String udi) {
|
||||
this.udi = udi == null ? null : udi.trim();
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(Integer count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public Integer getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(Integer type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public Long getCustomerId() {
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setCustomerId(Long customerId) {
|
||||
this.customerId = customerId;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,35 @@
|
||||
package com.glxp.udi.admin.entity.receipt;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProductOrderDetailEntity {
|
||||
|
||||
private int id;
|
||||
private String udi;
|
||||
private String orderNo;
|
||||
private String batchNo;
|
||||
private String manufacturingDate;
|
||||
private String expirationDate;
|
||||
private int closeFlag;
|
||||
private String comments;
|
||||
private int count;
|
||||
private String dlstaus;
|
||||
private int fromType;
|
||||
|
||||
private String orderId;//查询用
|
||||
|
||||
private String type;
|
||||
private String unit;
|
||||
private String coName;
|
||||
private String form;
|
||||
private String formSpec;
|
||||
private String packSpec;
|
||||
private String authCode;
|
||||
private String name;
|
||||
private String nameCode;
|
||||
private String packRatio;
|
||||
private String packLevel;
|
||||
private String uuid;
|
||||
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.glxp.udi.admin.entity.receipt;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class StockDetailEntity {
|
||||
|
||||
private String orderId;
|
||||
private String code;
|
||||
private String pCode;
|
||||
private String packFlag;
|
||||
private String codeLevel;
|
||||
private String batchNo;
|
||||
private String manufacturingDate;
|
||||
private String expirationDate;
|
||||
private String closeFlag;
|
||||
private String count;
|
||||
private String lastModifyTime;
|
||||
private String type;
|
||||
private String unit;
|
||||
private String coName;
|
||||
private String form;
|
||||
private String formSpec;
|
||||
private String packSpec;
|
||||
private String authCode;
|
||||
private String name;
|
||||
private String nameCode;
|
||||
private String packRatio;
|
||||
private String packLevel;
|
||||
private String uuid;
|
||||
private String minCount;
|
||||
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
package com.glxp.udi.admin.req.info;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterSetupRequest {
|
||||
|
||||
private int id;
|
||||
private String erpSign;
|
||||
private String erpSaleOutModify;
|
||||
private String erpPruchaseModify;
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package com.glxp.udi.admin.req.inout;
|
||||
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class FilterErpOrderRequest extends ListPageRequest {
|
||||
|
||||
private String docid;
|
||||
private String goodsname;
|
||||
private String companyname;
|
||||
private String orderId;
|
||||
private String orderIdFk;
|
||||
private String startDate;
|
||||
private String endDate;
|
||||
private String billAction;
|
||||
private String billcode;
|
||||
private String fbillflag;
|
||||
List<String> orderIds;
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.glxp.udi.admin.req.inout;
|
||||
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterUdiInfoRequest extends ListPageRequest {
|
||||
|
||||
private String ylqxzcrbarmc;
|
||||
private String cpmctymc;
|
||||
private String nameCode;
|
||||
private String uuid;
|
||||
private String ggxh;
|
||||
private String thirdId;
|
||||
private String customerId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.glxp.udi.admin.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterWarehouseRequest {
|
||||
|
||||
private String code;
|
||||
private Long customerId;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.udi.admin.req.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
|
||||
import com.glxp.udi.admin.entity.inout.WarehouseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class PostErpOrderRequest {
|
||||
public List<ErpOrderEntity> erpOrderEntities;
|
||||
List<WarehouseEntity> codes;
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package com.glxp.udi.admin.req.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.WarehouseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class PostOrderRequest {
|
||||
List<PostOrder> postOrders;
|
||||
|
||||
public List<PostOrder> getPostOrder() {
|
||||
return postOrders;
|
||||
}
|
||||
|
||||
public void setPostOrder(List<PostOrder> postOrder) {
|
||||
this.postOrders = postOrder;
|
||||
}
|
||||
|
||||
public static class PostOrder {
|
||||
public List<String> erpOrders;
|
||||
List<WarehouseEntity> codes;
|
||||
private String billType;
|
||||
private String orderId;
|
||||
|
||||
public String getStockIdFk() {
|
||||
return stockIdFk;
|
||||
}
|
||||
|
||||
public void setStockIdFk(String stockIdFk) {
|
||||
this.stockIdFk = stockIdFk;
|
||||
}
|
||||
|
||||
private String stockIdFk;
|
||||
|
||||
public String getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(String orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public String getBillType() {
|
||||
return billType;
|
||||
}
|
||||
|
||||
public void setBillType(String billType) {
|
||||
this.billType = billType;
|
||||
}
|
||||
|
||||
public List<String> getErpOrders() {
|
||||
return erpOrders;
|
||||
}
|
||||
|
||||
public void setErpOrders(List<String> erpOrders) {
|
||||
this.erpOrders = erpOrders;
|
||||
}
|
||||
|
||||
public List<WarehouseEntity> getCodes() {
|
||||
return codes;
|
||||
}
|
||||
|
||||
public void setCodes(List<WarehouseEntity> codes) {
|
||||
this.codes = codes;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.glxp.udi.admin.req.receipt;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterBatchnoCount {
|
||||
private String batchNo;
|
||||
private String codeLevel;
|
||||
private String packFlag;
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.udi.admin.req.receipt;
|
||||
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterStockRequest extends ListPageRequest {
|
||||
private String code;
|
||||
private String codeLevel;
|
||||
private String pCode;
|
||||
private String orderId;
|
||||
private String batchNo;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.udi.admin.res.auth;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class LoginResponse {
|
||||
|
||||
private String id;
|
||||
private String token;
|
||||
private List<Long> authRules;
|
||||
private String creditNum;
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package com.glxp.udi.admin.res.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UdiRelevanceResponse {
|
||||
|
||||
private int id;
|
||||
private String thirdId;
|
||||
private String thirdName;
|
||||
private String uuid;
|
||||
private String nameCode;
|
||||
private String packLevel;
|
||||
private String packRatio;
|
||||
private Integer bhxjsl;
|
||||
private Integer bhzxxsbzsl;
|
||||
private Integer zxxsbzbhsydysl;
|
||||
private String bhxjcpbm;
|
||||
private String sjcpbm; //
|
||||
private String bzcj;
|
||||
private String addType;
|
||||
private String deviceRecordKey;
|
||||
private int isUseDy;
|
||||
private String cpmctymc;
|
||||
private String cplb;
|
||||
private String flbm;
|
||||
private String ggxh;
|
||||
private String qxlb;
|
||||
private String tyshxydm;
|
||||
private String ylqxzcrbarmc;
|
||||
private String zczbhhzbapzbh;
|
||||
private String ylqxzcrbarywmc;
|
||||
private String sydycpbs;
|
||||
private int versionNumber;
|
||||
private int diType;
|
||||
private String batchNo;
|
||||
private String warehouseName;
|
||||
private String customerId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.udi.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,16 @@
|
||||
package com.glxp.udi.admin.service.info;
|
||||
|
||||
|
||||
import com.glxp.udi.admin.entity.info.SetupEntity;
|
||||
import com.glxp.udi.admin.req.info.FilterSetupRequest;
|
||||
|
||||
public interface SetupService {
|
||||
|
||||
SetupEntity selectSetup();
|
||||
|
||||
SetupEntity findSetup(FilterSetupRequest filterSetupRequest);
|
||||
|
||||
boolean modifySetup(SetupEntity setupEntity);
|
||||
|
||||
boolean insertSetup(SetupEntity setupEntity);
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.glxp.udi.admin.service.info.impl;
|
||||
|
||||
import com.glxp.udi.admin.dao.info.SetupDao;
|
||||
import com.glxp.udi.admin.entity.info.SetupEntity;
|
||||
import com.glxp.udi.admin.req.info.FilterSetupRequest;
|
||||
import com.glxp.udi.admin.service.info.SetupService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Service
|
||||
public class SetupServiceImpl implements SetupService {
|
||||
@Resource
|
||||
SetupDao setupDao;
|
||||
|
||||
|
||||
@Override
|
||||
public SetupEntity selectSetup() {
|
||||
FilterSetupRequest filterSetupRequest = new FilterSetupRequest();
|
||||
filterSetupRequest.setId(1);
|
||||
return setupDao.findSetup(filterSetupRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SetupEntity findSetup(FilterSetupRequest filterSetupRequest) {
|
||||
return setupDao.findSetup(filterSetupRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean modifySetup(SetupEntity setupEntity) {
|
||||
|
||||
return setupDao.modifySetup(setupEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertSetup(SetupEntity setupEntity) {
|
||||
return setupDao.insertSetup(setupEntity);
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
package com.glxp.udi.admin.service.receipts;
|
||||
package com.glxp.udi.admin.service.inout;
|
||||
|
||||
|
||||
import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
|
||||
@ -0,0 +1,40 @@
|
||||
package com.glxp.udi.admin.service.inout;
|
||||
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterErpOrderRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface MyErpOrderService {
|
||||
|
||||
List<ErpOrderEntity> filterAllMyErpOrder(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> findByStockCheck(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> findAllByDocids(List<String> docids);
|
||||
|
||||
List<String> filterAllDocid(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
List<ErpOrderEntity> filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest);
|
||||
|
||||
boolean insertErpOrders(List<ErpOrderEntity> erpOrderEntities);
|
||||
|
||||
boolean insertErpOrder(ErpOrderEntity erpOrderEntity);
|
||||
|
||||
boolean updateErpOrder(ErpOrderEntity erpOrderEntity);
|
||||
|
||||
List<String> selectAllIds(List<String> docids);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
boolean deleteByPrimiyId(String id);
|
||||
|
||||
boolean deleteByOrderId(String id);
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.glxp.udi.admin.service.inout;
|
||||
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface UdiInfoService {
|
||||
|
||||
List<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
List<UdiInfoEntity> filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
UdiInfoEntity findByNameCode(String nameCode);
|
||||
|
||||
UdiInfoEntity selectById(String nameCode);
|
||||
|
||||
UdiInfoEntity findByUuid(String uuid);
|
||||
|
||||
List<UdiInfoEntity> findByUuids(String uuid);
|
||||
|
||||
boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);
|
||||
|
||||
boolean insertUdiInfos(List<UdiInfoEntity> udiInfoEntities);
|
||||
|
||||
boolean updateUdiInfo(UdiInfoEntity udiInfoEntity);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
boolean deleteByUuid(String uuid);
|
||||
|
||||
boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity);
|
||||
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.glxp.udi.admin.service.inout;
|
||||
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
|
||||
import com.glxp.udi.admin.res.inout.UdiRelevanceResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface UdiRelevanceService {
|
||||
|
||||
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
List<UdiRelevanceResponse> filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
|
||||
List<UdiRelevanceEntity> selectByUuid(String uuid);
|
||||
|
||||
UdiRelevanceEntity selectById(String id);
|
||||
UdiRelevanceEntity selectByThirdId(String thirdId);
|
||||
|
||||
boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
|
||||
|
||||
boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
boolean deleteByIds(List<String> id);
|
||||
|
||||
boolean deleteByUuid(String uuid);
|
||||
|
||||
}
|
||||
@ -0,0 +1,123 @@
|
||||
package com.glxp.udi.admin.service.inout.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.udi.admin.dao.inout.MyErpOrderDao;
|
||||
import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterErpOrderRequest;
|
||||
import com.glxp.udi.admin.service.inout.MyErpOrderService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class MyErpOrderServiceImpl implements MyErpOrderService {
|
||||
|
||||
@Resource
|
||||
MyErpOrderDao myErpOrderDao;
|
||||
|
||||
@Override
|
||||
public List<ErpOrderEntity> filterAllMyErpOrder(FilterErpOrderRequest filterErpOrderRequest) {
|
||||
if (filterErpOrderRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
return myErpOrderDao.filterMyErpOrder(filterErpOrderRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ErpOrderEntity> findByStockCheck(FilterErpOrderRequest filterErpOrderRequest) {
|
||||
|
||||
if (filterErpOrderRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit());
|
||||
return myErpOrderDao.findByStockCheck(filterErpOrderRequest.getOrderIds());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ErpOrderEntity> filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest) {
|
||||
if (filterErpOrderRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit());
|
||||
return myErpOrderDao.filterMyErpOrder(filterErpOrderRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ErpOrderEntity> filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest) {
|
||||
if (filterErpOrderRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit());
|
||||
return myErpOrderDao.filterMyErpMainOrder(filterErpOrderRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ErpOrderEntity> filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest) {
|
||||
if (filterErpOrderRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterErpOrderRequest.getPage() != null && filterErpOrderRequest.getLimit() != null) {
|
||||
int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit());
|
||||
}
|
||||
|
||||
return myErpOrderDao.filterMyErpDetailOrder(filterErpOrderRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ErpOrderEntity> findAllByDocids(List<String> docids) {
|
||||
return myErpOrderDao.findAllByDocids(docids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> filterAllDocid(FilterErpOrderRequest filterErpOrderRequest) {
|
||||
return myErpOrderDao.filterAllDocid(filterErpOrderRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ErpOrderEntity> filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest) {
|
||||
return myErpOrderDao.filterAllDocidE(filterErpOrderRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertErpOrders(List<ErpOrderEntity> erpOrderEntities) {
|
||||
return myErpOrderDao.insertErpOrders(erpOrderEntities);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertErpOrder(ErpOrderEntity erpOrderEntity) {
|
||||
return myErpOrderDao.insertErpOrder(erpOrderEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateErpOrder(ErpOrderEntity erpOrderEntity) {
|
||||
return myErpOrderDao.updateErpOrder(erpOrderEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> selectAllIds(List<String> docids) {
|
||||
return myErpOrderDao.selectAllIds(docids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(String id) {
|
||||
return myErpOrderDao.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteByPrimiyId(String id) {
|
||||
return myErpOrderDao.deleteByPrimiyId(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteByOrderId(String id) {
|
||||
return myErpOrderDao.deleteByOrderId(id);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,102 @@
|
||||
package com.glxp.udi.admin.service.inout.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.udi.admin.dao.inout.UdiInfoDao;
|
||||
import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
|
||||
import com.glxp.udi.admin.service.inout.UdiInfoService;
|
||||
import com.glxp.udi.admin.util.FilterUdiUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class UdiInfoServiceImpl implements UdiInfoService {
|
||||
|
||||
@Resource
|
||||
UdiInfoDao udiInfoDao;
|
||||
|
||||
@Override
|
||||
public List<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) {
|
||||
if (filterUdiInfoRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
|
||||
List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiInfoEntity> filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest) {
|
||||
if (filterUdiInfoRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
|
||||
List<UdiInfoEntity> data = udiInfoDao.filterUdiInfoGp(filterUdiInfoRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) {
|
||||
if (filterUdiInfoRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiInfoEntity findByNameCode(String nameCode) {
|
||||
String prefix = FilterUdiUtils.getDiStr(nameCode);
|
||||
return udiInfoDao.findByNameCode(prefix);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiInfoEntity selectById(String nameCode) {
|
||||
return udiInfoDao.selectById(nameCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiInfoEntity findByUuid(String uuid) {
|
||||
return udiInfoDao.findByUuid(uuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiInfoEntity> findByUuids(String uuid) {
|
||||
return udiInfoDao.findByUuids(uuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertUdiInfo(UdiInfoEntity udiInfoEntity) {
|
||||
return udiInfoDao.insertUdiInfo(udiInfoEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertUdiInfos(List<UdiInfoEntity> udiInfoEntities) {
|
||||
return udiInfoDao.insertUdiInfos(udiInfoEntities);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) {
|
||||
return udiInfoDao.updateUdiInfo(udiInfoEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(String id) {
|
||||
return udiInfoDao.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteByUuid(String uuid) {
|
||||
return udiInfoDao.deleteByUuid(uuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity) {
|
||||
return udiInfoDao.updateUdiInfoByUuid(udiInfoEntity);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,84 @@
|
||||
package com.glxp.udi.admin.service.inout.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.udi.admin.dao.inout.UdiRelevanceDao;
|
||||
import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity;
|
||||
import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
|
||||
import com.glxp.udi.admin.res.inout.UdiRelevanceResponse;
|
||||
import com.glxp.udi.admin.service.inout.UdiRelevanceService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class UdiRelevanceServiceImpl implements UdiRelevanceService {
|
||||
@Resource
|
||||
UdiRelevanceDao udiRelevanceDao;
|
||||
|
||||
@Override
|
||||
public List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest) {
|
||||
if (filterUdiInfoRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
|
||||
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiRelevance(filterUdiInfoRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiRelevanceResponse> filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest) {
|
||||
if (filterUdiInfoRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterUdiInfoRequest.getPage() != null) {
|
||||
int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
|
||||
}
|
||||
|
||||
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiInfoRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiRelevanceEntity> selectByUuid(String uuid) {
|
||||
return udiRelevanceDao.selectByUuid(uuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiRelevanceEntity selectById(String id) {
|
||||
return udiRelevanceDao.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiRelevanceEntity selectByThirdId(String thirdId) {
|
||||
return udiRelevanceDao.selectByThirdId(thirdId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) {
|
||||
return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) {
|
||||
return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(String id) {
|
||||
return udiRelevanceDao.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteByIds(List<String> ids) {
|
||||
return udiRelevanceDao.deleteByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteByUuid(String uuid) {
|
||||
return udiRelevanceDao.deleteByUuid(uuid);
|
||||
}
|
||||
}
|
||||
@ -1,14 +1,33 @@
|
||||
package com.glxp.udi.admin.service.receipts;
|
||||
|
||||
|
||||
import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity;
|
||||
import com.glxp.udi.admin.entity.receipt.StockDetailEntity;
|
||||
import com.glxp.udi.admin.req.receipt.FilterBatchnoCount;
|
||||
import com.glxp.udi.admin.req.receipt.FilterStockRequest;
|
||||
import com.glxp.udi.admin.req.receipt.MipsBarcodeRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface MipsBarcodeService {
|
||||
|
||||
List<MipsBarcodeEntity> filterAll(MipsBarcodeRequest mipsBarcodeRequest) ;
|
||||
|
||||
List<MipsBarcodeEntity> selectByOrderId(MipsBarcodeRequest mipsBarcodeRequest);
|
||||
|
||||
List<MipsBarcodeEntity> selectAllByOrderId(String orderId);
|
||||
|
||||
List<MipsBarcodeEntity> filterBarcodes(MipsBarcodeRequest mipsBarcodeRequest);
|
||||
|
||||
List<StockDetailEntity> filterStock(FilterStockRequest filterStockRequest);
|
||||
|
||||
Integer selectCountByBatchno(FilterBatchnoCount fIlterBatchnoCount);
|
||||
|
||||
boolean insertList(List<MipsBarcodeEntity> barcodeEntities);
|
||||
|
||||
boolean deleteByCodes(List<String> codes);
|
||||
|
||||
boolean deleteByOrderId(String orderId);
|
||||
|
||||
boolean updateDtFlag(List<String> codes);
|
||||
}
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
package com.glxp.udi.admin.service.receipts.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.udi.admin.dao.receipt.BussinessTypeDao;
|
||||
import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
|
||||
import com.glxp.udi.admin.service.receipts.BussinessTypeService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
@Service
|
||||
public class BussinessTypeServiceImpl implements BussinessTypeService {
|
||||
|
||||
@Resource
|
||||
BussinessTypeDao bussinessTypeDao;
|
||||
|
||||
@Override
|
||||
public List<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
|
||||
if (bussinessTypeFilterRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
|
||||
List<BussinessTypeEntity> data = bussinessTypeDao.filterList(bussinessTypeFilterRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity) {
|
||||
return bussinessTypeDao.insertBussinessType(bussinessTypeEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity) {
|
||||
return bussinessTypeDao.updateBussinessType(bussinessTypeEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(String id) {
|
||||
return bussinessTypeDao.deleteById(id);
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue