委托验收后补单问题

master
anthonyywj2 3 years ago
parent a8ca3b3947
commit 091f7e0695

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

@ -376,7 +376,7 @@ public class OrderController {
supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
//修改往来单位及当前库存号 //修改往来单位及当前库存号
supplementOrder.setFromCorpId(orderEntity.getLocStorageCode()); supplementOrder.setFromCorpId(orderEntity.getLocStorageCode());
supplementOrder.setLocStorageCode(orderEntity.getFromCorpId()); supplementOrder.setLocStorageCode(entrustReceEntity.getEntrustInv());
String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
supplementOrder.setFromCorp(name); supplementOrder.setFromCorp(name);
supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE); supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE);

@ -177,6 +177,7 @@ public class StockOrderController {
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK); basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
basicUnitMaintainEntity.setName(stockOrderPostRequest.getCorpName()); basicUnitMaintainEntity.setName(stockOrderPostRequest.getCorpName());
basicUnitMaintainEntity.setUpdateTime(new Date());
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
} }
} }

@ -648,6 +648,7 @@ public class WareHouseController {
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK); basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
basicUnitMaintainEntity.setName(addOrderRequest.getFromCorp()); basicUnitMaintainEntity.setName(addOrderRequest.getFromCorp());
basicUnitMaintainEntity.setUpdateTime(new Date());
addOrderRequest.setFromCorp(basicUnitMaintainEntity.getName()); addOrderRequest.setFromCorp(basicUnitMaintainEntity.getName());
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
} }

Loading…
Cancel
Save