|
|
@@ -443,11 +443,13 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
|
|
|
OutboundItem outboundItem = new OutboundItem();
|
|
|
outboundItem.setItemId(outboundItemVO.getItemId());
|
|
|
- outboundItem.setRemarks(outboundItemVO.getRemarks());
|
|
|
- outboundItemMapper.update(outboundItem,
|
|
|
- new UpdateWrapper<OutboundItem>().lambda()
|
|
|
- .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
|
|
|
- );
|
|
|
+ if (outboundItemVO.getRemarks() != null || outboundItemVO.getRemarks() != " ") {
|
|
|
+ outboundItem.setRemarks(outboundItemVO.getRemarks());
|
|
|
+ outboundItemMapper.update(outboundItem,
|
|
|
+ new UpdateWrapper<OutboundItem>().lambda()
|
|
|
+ .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
|
|
|
+ );
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
//endregion
|
|
|
@@ -602,8 +604,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
invMap.put("delOutDetail", outboundVO.getDeleteItemList());
|
|
|
inventoryService.operatingInventoryInformation(invMap);
|
|
|
//endregion
|
|
|
- }
|
|
|
- else{
|
|
|
+ } else {
|
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_OUT.getMessage());
|
|
|
}
|
|
|
//endregion
|
|
|
@@ -701,8 +702,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
//region 反写出库总单 反写订单总单
|
|
|
this.updatePrimaryTotal(outboundVO, true);
|
|
|
//endregion
|
|
|
- }
|
|
|
- else{
|
|
|
+ } else {
|
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_OUT.getMessage());
|
|
|
}
|
|
|
//endregion
|