|
|
|
@ -290,8 +290,8 @@ public class CollectionController {
|
|
|
|
|
@PostMapping
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException {
|
|
|
|
|
if (collectionCrForm.getCollection_item0List()!=null && collectionCrForm.getCollection_item0List().size()>0) {
|
|
|
|
|
List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(), Collection_item0Entity.class);
|
|
|
|
|
List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(), Collection_item0Entity.class);
|
|
|
|
|
if (Collection_item0List != null && Collection_item0List.size() > 0) {
|
|
|
|
|
for (Collection_item0Entity collectionItem0Entity : Collection_item0List) {
|
|
|
|
|
if (StringUtils.isNotEmpty(collectionItem0Entity.getSalesorderId())) {
|
|
|
|
|
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId());
|
|
|
|
@ -324,26 +324,27 @@ public class CollectionController {
|
|
|
|
|
} else {
|
|
|
|
|
return ActionResult.fail("销售订单不存在");
|
|
|
|
|
}
|
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
|
collectionCrForm.setCreatorUserName(userInfo.getUserId());
|
|
|
|
|
collectionCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
return ActionResult.fail("请填写收款明细");
|
|
|
|
|
}
|
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
|
UserInfo userInfo = userProvider.get();
|
|
|
|
|
collectionCrForm.setCreatorUserName(userInfo.getUserId());
|
|
|
|
|
collectionCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
|
// collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
|
|
|
|
|
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
entity.setStatus("0");
|
|
|
|
|
collectionService.save(entity);
|
|
|
|
|
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
entity.setStatus("0");
|
|
|
|
|
collectionService.save(entity);
|
|
|
|
|
// List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class);
|
|
|
|
|
for (Collection_item0Entity entitys : Collection_item0List) {
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setCollectionId(entity.getId());
|
|
|
|
|
collection_item0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
|
}
|
|
|
|
|
for (Collection_item0Entity entitys : Collection_item0List) {
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setCollectionId(entity.getId());
|
|
|
|
|
collection_item0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.fail("请填写收款明细");
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|