|
|
|
@ -144,7 +144,7 @@ public class BasicUnitMaintainController {
|
|
|
|
|
return ResultVOUtils.success("修改成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// @AuthRuleAnnotation("")
|
|
|
|
|
// @AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/unit/download")
|
|
|
|
|
public BaseResponse downloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
|
|
|
|
|
BindingResult bindingResult) {
|
|
|
|
@ -174,7 +174,7 @@ public class BasicUnitMaintainController {
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/basic/unit/download")
|
|
|
|
|
public BaseResponse scdownloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
|
|
|
|
|
BindingResult bindingResult) {
|
|
|
|
|
BindingResult bindingResult) {
|
|
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
@ -273,6 +273,7 @@ public class BasicUnitMaintainController {
|
|
|
|
|
ErpUnitsResponse erpUnitsResponse = combineRequest.getErpUnitsResponse();
|
|
|
|
|
BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
|
|
|
|
|
basicUnitMaintainEntity.setId(Integer.parseInt(combineRequest.getKey()));
|
|
|
|
|
basicUnitMaintainEntity.setUpdateTime(new Date());
|
|
|
|
|
if (combineRequest.getThirdSys() != null) {
|
|
|
|
|
if ("thirdId".equals(combineRequest.getThirdSys())) {
|
|
|
|
|
basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId());
|
|
|
|
@ -322,6 +323,7 @@ public class BasicUnitMaintainController {
|
|
|
|
|
udiRelevanceEntity.setThirdId4("");
|
|
|
|
|
udiRelevanceEntity.setThirdName4("");
|
|
|
|
|
}
|
|
|
|
|
udiRelevanceEntity.setUpdateTime(new Date());
|
|
|
|
|
basicUnitMaintainService.updateById(udiRelevanceEntity);
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.success("解除绑定成功!");
|
|
|
|
|