bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购验收导出修改

This commit is contained in:
syruan 2025-01-13 10:27:36 +08:00
parent 6c481ff197
commit cce2ddf4f9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java
View File

@ -45,7 +45,6 @@ public class PurchaseCheckInfo extends BaseEntity {
private String code; private String code;
/** 采购日期 */ /** 采购日期 */
@Excel(name = "采购日期", sort = 1)
@ApiModelProperty(value = "采购日期") @ApiModelProperty(value = "采购日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date purchaseTime; private Date purchaseTime;

16
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -334,7 +334,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional(rollbackFor = Exception.class)
public AjaxResult insertPurchaseCheckInfo(PurchaseCheckDto purchaseCheckInfo) { public AjaxResult insertPurchaseCheckInfo(PurchaseCheckDto purchaseCheckInfo) {
purchaseCheckInfo.getPurchaseCheckInfo().setCreateTime(DateUtils.getNowDate()); purchaseCheckInfo.getPurchaseCheckInfo().setCreateTime(DateUtils.getNowDate());
purchaseCheckInfo.getPurchaseCheckInfo().setCreateBy(SecurityUtils.getUsername()); purchaseCheckInfo.getPurchaseCheckInfo().setCreateBy(SecurityUtils.getUsername());
@ -352,15 +352,21 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
if (0 < count) { if (0 < count) {
return insertPurchaseCheckDetails(purchaseCheckInfo.getPurchaseCheckDetailsList(), taskId); return insertPurchaseCheckDetails(purchaseCheckInfo.getPurchaseCheckDetailsList(), taskId);
} else { } else {
return AjaxResult.error("新增任务失败,purchase_check_info表插入0条"); return AjaxResult.error("新增任务失败,新购任务信息表插入0条");
} }
} catch (final DataAccessException e) { } catch (final DataAccessException dae) {
return AjaxResult.error("数据库操作失败:" + e.getMessage()); throw new ServiceException("数据库错误:" + dae.getMessage());
} catch (final Exception e) { } catch (final Exception e) {
return AjaxResult.error("新增任务失败:" + e.getMessage()); throw new ServiceException("新增任务失败:" + e.getMessage());
} }
} }
/**
* 插入新购验收任务详情
* @param purchaseCheckDetailsList 新购验收物资明细
* @param taskId 任务id
* @return 结果
*/
private AjaxResult insertPurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList, Long taskId) { private AjaxResult insertPurchaseCheckDetails(List<PurchaseCheckDetails> purchaseCheckDetailsList, Long taskId) {
if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) { if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) {
for (PurchaseCheckDetails details : purchaseCheckDetailsList) { for (PurchaseCheckDetails details : purchaseCheckDetailsList) {