Merge remote-tracking branch 'origin/master'
# Conflicts: # api-udims/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java # api-udims/src/main/java/com/glxp/udi/admin/controller/inout/BusRoleRlController.java # api-udims/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java # api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderMdEntity.java # api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java # api-udims/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java # api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/PlatformServiceImpl.java # api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java # api-udims/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xmlmaster
x_z
3 years ago
commit
13034f5803
@ -0,0 +1,161 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.auth.AuthAdmin;
|
||||
import com.glxp.udi.admin.entity.auth.CustomerInfoEntity;
|
||||
import com.glxp.udi.admin.entity.inout.BusRoleRlEntity;
|
||||
import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.inout.BusRoleRlFilterRequest;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.inout.BusRoleRlResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.auth.CustomerInfoService;
|
||||
import com.glxp.udi.admin.service.inout.BusRoleRlService;
|
||||
import com.glxp.udi.admin.service.inout.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.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 java.util.List;
|
||||
|
||||
@RestController
|
||||
public class BusRoleRlController {
|
||||
|
||||
@Resource
|
||||
private BusRoleRlService busRoleRlService;
|
||||
@Resource
|
||||
private CustomerInfoService customerInfoService;
|
||||
@Resource
|
||||
private BussinessTypeService bussinessTypeService;
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
|
||||
@GetMapping("/udiwms/busRl/filter")
|
||||
public BaseResponse filterbBusRl(BusRoleRlFilterRequest busRoleRlFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<BusRoleRlResponse> busRoleRlResponses;
|
||||
busRoleRlResponses = busRoleRlService.filterJoinList(busRoleRlFilterRequest);
|
||||
PageInfo<BusRoleRlResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(busRoleRlResponses);
|
||||
PageSimpleResponse<BusRoleRlResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(busRoleRlResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("/udiwms/busRl/filterAll")
|
||||
public BaseResponse filterbBusRlAll(BusRoleRlFilterRequest busRoleRlFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
|
||||
BeanUtils.copyProperties(busRoleRlFilterRequest, bussinessTypeFilterRequest);
|
||||
List<BussinessTypeEntity> bussinessTypeEntities;
|
||||
bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
|
||||
|
||||
List<BusRoleRlEntity> busRoleRlResponses;
|
||||
busRoleRlResponses = busRoleRlService.filterList(busRoleRlFilterRequest);
|
||||
|
||||
for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
|
||||
for (BusRoleRlEntity busRoleRlResponse : busRoleRlResponses) {
|
||||
if (bussinessTypeEntity.getAction().equals(busRoleRlResponse.getBusAction())) {
|
||||
bussinessTypeEntity.setCheck(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PageInfo<BussinessTypeEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(bussinessTypeEntities);
|
||||
PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(bussinessTypeEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("/udiwms/bussinessType/filter")
|
||||
public BaseResponse filterByRole(BusRoleRlFilterRequest busRoleRlFilterRequest,
|
||||
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);
|
||||
}
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
String userId = request.getHeader("ADMIN_ID");
|
||||
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
|
||||
|
||||
|
||||
if (authAdmin.getCustomerId() == 110) {//系统管理员角色
|
||||
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
|
||||
BeanUtils.copyProperties(busRoleRlFilterRequest, bussinessTypeFilterRequest);
|
||||
List<BussinessTypeEntity> bussinessTypeEntities;
|
||||
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);
|
||||
|
||||
} else {
|
||||
CustomerInfoEntity customerInfoEntity = customerInfoService.
|
||||
selectById(authAdmin.getCustomerId());
|
||||
busRoleRlFilterRequest.setRoleId(customerInfoEntity.getRoleId() + "");
|
||||
List<BusRoleRlResponse> busRoleRlResponses;
|
||||
busRoleRlResponses = busRoleRlService.filterJoinList(busRoleRlFilterRequest);
|
||||
PageInfo<BusRoleRlResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(busRoleRlResponses);
|
||||
PageSimpleResponse<BusRoleRlResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(busRoleRlResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/udiwms/busRl/update")
|
||||
public BaseResponse postBusRl(@RequestBody BusRoleRlFilterRequest busRoleRlFilterRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
busRoleRlService.deleteById(busRoleRlFilterRequest.getRoleId() + "");
|
||||
if (busRoleRlFilterRequest.getActions() != null && busRoleRlFilterRequest.getActions().size() > 0) {
|
||||
for (String action : busRoleRlFilterRequest.getActions()) {
|
||||
BusRoleRlEntity busRoleRlEntity = new BusRoleRlEntity();
|
||||
busRoleRlEntity.setRoleId(busRoleRlFilterRequest.getRoleId());
|
||||
busRoleRlEntity.setBusAction(action);
|
||||
busRoleRlService.insertBusRoleRl(busRoleRlEntity);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("关联成功");
|
||||
} else {
|
||||
return ResultVOUtils.success("未选择业务单据类型！");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.BussinessContrastTypeEntity;
|
||||
import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeConstrastFilterRequest;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.basic.BussinessTypResponse;
|
||||
import com.glxp.udi.admin.service.inout.BussinessTypeContrastService;
|
||||
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 BussinessTypeContrastController {
|
||||
|
||||
|
||||
@Resource
|
||||
private BussinessTypeContrastService bussinessTypeService;
|
||||
|
||||
|
||||
@GetMapping("/udiwms/btcontrast/filter")
|
||||
public BaseResponse filterJoinBussinessType(BussinessTypeConstrastFilterRequest bussinessTypeFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<BussinessContrastTypeEntity> bussinessTypeEntities;
|
||||
bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
|
||||
PageInfo<BussinessContrastTypeEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(bussinessTypeEntities);
|
||||
PageSimpleResponse<BussinessContrastTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(bussinessTypeEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/udiwms/btcontrast/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("/udiwms/btcontrast/update")
|
||||
public BaseResponse updateBussinessType(@RequestBody BussinessContrastTypeEntity 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("/udiwms/btcontrast/insert")
|
||||
public BaseResponse insertBussinessType(@RequestBody BussinessContrastTypeEntity 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("添加成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.glxp.udi.admin.dao.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.BussinessContrastTypeEntity;
|
||||
import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeConstrastFilterRequest;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
|
||||
import com.glxp.udi.admin.res.basic.BussinessTypResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface BussinessTypeContrastDao {
|
||||
|
||||
List<BussinessContrastTypeEntity> filterList(BussinessTypeConstrastFilterRequest bussinessTypeFilterRequest);
|
||||
|
||||
boolean insertBussinessType(BussinessContrastTypeEntity bussinessTypeEntity);
|
||||
|
||||
boolean updateBussinessType(BussinessContrastTypeEntity bussinessTypeEntity);
|
||||
|
||||
boolean deleteById(@Param("id") String id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.udi.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BussinessContrastTypeEntity {
|
||||
|
||||
private Integer id;
|
||||
private Integer sourceAction;
|
||||
private Integer targetAction;
|
||||
private Integer customerId;
|
||||
private Integer unitId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,352 @@
|
||||
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 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 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;
|
||||
|
||||
private Boolean isCheck;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
public Boolean getCheck() {
|
||||
return isCheck;
|
||||
}
|
||||
|
||||
public void setCheck(Boolean check) {
|
||||
isCheck = check;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.glxp.udi.admin.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class OrderUploadRequest {
|
||||
private List<String> orderIds;
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
package com.glxp.udi.admin.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class PostUdimsOrderRequest {
|
||||
|
||||
List<OrderBean> orderBeans;
|
||||
private String customerId;
|
||||
|
||||
@Data
|
||||
public static class OrderBean {
|
||||
private String orderId;
|
||||
private String corpOrderId;
|
||||
private String action;
|
||||
private String actDate;
|
||||
private String actor;
|
||||
private String mainAction;
|
||||
private String fromCorpId;
|
||||
private String fromCorp;
|
||||
private String remark;
|
||||
private List<CodeBean> codes;
|
||||
|
||||
@Data
|
||||
public static class CodeBean {
|
||||
private String action;
|
||||
private String mainAction;
|
||||
private String code;
|
||||
private String corpOrderId;
|
||||
private String actor;
|
||||
private String actDate;
|
||||
private String fromCorpId;
|
||||
private String fromCorp;
|
||||
private String orderId;
|
||||
private String batchNo;
|
||||
private String produceDate;
|
||||
private String expireDate;
|
||||
private String serialNo;
|
||||
private Integer count;
|
||||
private String packageLevel;
|
||||
private String warehouseCode;
|
||||
|
||||
private String customerId;
|
||||
private String nameCode;
|
||||
private String supId;//供应商ID
|
||||
private String invStorageCode;
|
||||
private String invWarehouseCode;
|
||||
private String relId;
|
||||
private Integer status;
|
||||
private String locStorageCode;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.udi.admin.req.receipt;
|
||||
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BussinessTypeConstrastFilterRequest extends ListPageRequest {
|
||||
|
||||
|
||||
private String sourceAction;
|
||||
private Integer customerId;
|
||||
private Integer unitId;
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package com.glxp.udi.admin.res.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class SpmsBusTypeResponse {
|
||||
|
||||
private Integer id;
|
||||
private String action;
|
||||
private String name;
|
||||
private Boolean enable;
|
||||
private String remark;
|
||||
private String mainAction;
|
||||
private String thirdSysFk;
|
||||
private String thirdId;
|
||||
private String thirdName;
|
||||
private Boolean enabled;
|
||||
private String localAction;
|
||||
private Boolean checkEnable; //是否根据业务单据类型校验
|
||||
private Boolean advanceType; //是否预入库
|
||||
private Boolean changeEnable;
|
||||
private Boolean genUnit;
|
||||
// private Boolean innerOrder;
|
||||
private Boolean spUse;
|
||||
private String localName;
|
||||
private Boolean secCheckEnable;
|
||||
|
||||
|
||||
private boolean checkUdims;
|
||||
private boolean checkPdaEd;
|
||||
private boolean checkPdaUn;
|
||||
private boolean checkPc;
|
||||
private boolean checkWebNew;
|
||||
private boolean checkChange;
|
||||
|
||||
private boolean secCheckUdims;
|
||||
private boolean secCheckPdaEd;
|
||||
private boolean secCheckPdaUn;
|
||||
private boolean secCheckPc;
|
||||
private boolean secCheckWebNew;
|
||||
private boolean secCheckChange;
|
||||
private int corpType;
|
||||
private String storageCode;
|
||||
|
||||
//补单类型
|
||||
private String supplementOrderType;
|
||||
|
||||
//启用默认补单
|
||||
private boolean enableSupplementOrder;
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.glxp.udi.admin.service.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.BussinessContrastTypeEntity;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeConstrastFilterRequest;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface BussinessTypeContrastService {
|
||||
|
||||
List<BussinessContrastTypeEntity> filterList(BussinessTypeConstrastFilterRequest bussinessTypeFilterRequest);
|
||||
|
||||
boolean insertBussinessType(BussinessContrastTypeEntity bussinessTypeEntity);
|
||||
|
||||
boolean updateBussinessType(BussinessContrastTypeEntity bussinessTypeEntity);
|
||||
|
||||
boolean deleteById(@Param("id") String id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package com.glxp.udi.admin.service.inout.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.udi.admin.dao.inout.BussinessTypeContrastDao;
|
||||
import com.glxp.udi.admin.entity.inout.BussinessContrastTypeEntity;
|
||||
import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeConstrastFilterRequest;
|
||||
import com.glxp.udi.admin.service.inout.BussinessTypeContrastService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class BussinessTypeContrastServiceImpl implements BussinessTypeContrastService {
|
||||
|
||||
@Resource
|
||||
BussinessTypeContrastDao bussinessTypeContrastDao;
|
||||
|
||||
|
||||
@Override
|
||||
public List<BussinessContrastTypeEntity> filterList(BussinessTypeConstrastFilterRequest bussinessTypeFilterRequest) {
|
||||
if (bussinessTypeFilterRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (bussinessTypeFilterRequest.getPage() != null) {
|
||||
int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
|
||||
}
|
||||
List<BussinessContrastTypeEntity> data = bussinessTypeContrastDao.filterList(bussinessTypeFilterRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertBussinessType(BussinessContrastTypeEntity bussinessTypeEntity) {
|
||||
return bussinessTypeContrastDao.insertBussinessType(bussinessTypeEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateBussinessType(BussinessContrastTypeEntity bussinessTypeEntity) {
|
||||
return bussinessTypeContrastDao.updateBussinessType(bussinessTypeEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(String id) {
|
||||
return bussinessTypeContrastDao.deleteById(id);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.udi.admin.dao.inout.BussinessTypeContrastDao">
|
||||
|
||||
<select id="filterList" parameterType="com.glxp.udi.admin.req.receipt.BussinessTypeConstrastFilterRequest"
|
||||
resultType="com.glxp.udi.admin.entity.inout.BussinessContrastTypeEntity">
|
||||
SELECT * FROM bussiness_type_contrast
|
||||
<where>
|
||||
<if test="sourceAction != ''and sourceAction != null">
|
||||
AND name LIKE concat(#{sourceAction},'%')
|
||||
</if>
|
||||
<if test="customerId != ''and customerId != null">
|
||||
AND customerId =#{customerId}
|
||||
</if>
|
||||
<if test="unitId != ''and unitId != null">
|
||||
AND unitId =#{unitId}
|
||||
</if>
|
||||
</where>
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertBussinessType" keyProperty="id"
|
||||
parameterType="com.glxp.udi.admin.entity.inout.BussinessTypeEntity">
|
||||
replace
|
||||
INTO bussiness_type_contrast
|
||||
(sourceAction,targetAction,customerId,unitId)
|
||||
values
|
||||
(
|
||||
#{sourceAction},
|
||||
#{targetAction},
|
||||
#{customerId},
|
||||
#{unitId}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<update id="updateBussinessType" parameterType="com.glxp.udi.admin.entity.inout.BussinessTypeEntity">
|
||||
UPDATE bussiness_type_contrast
|
||||
<trim prefix="set" suffixOverrides=",">
|
||||
<if test="sourceAction != null">sourceAction = #{sourceAction},</if>
|
||||
<if test="targetAction != null">targetAction = #{targetAction},</if>
|
||||
<if test="customerId != null">customerId = #{customerId},</if>
|
||||
<if test="unitId != null">unitId = #{unitId},</if>
|
||||
</trim>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteById" parameterType="Map">
|
||||
DELETE
|
||||
FROM bussiness_type_contrast
|
||||
WHERE id = #{id}
|
||||
</delete>
|
||||
|
||||
|
||||
<select id="selectById" parameterType="Map" resultType="com.glxp.udi.admin.entity.inout.BussinessTypeEntity">
|
||||
select *
|
||||
FROM bussiness_type_contrast
|
||||
WHERE id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue