|
|
|
@ -703,9 +703,10 @@ public class SaleorderitemController {
|
|
|
|
|
}
|
|
|
|
|
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
|
|
|
|
|
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);
|
|
|
|
|
List<ReceiptoutsoitemModel> jg_receiptoutModelList = new ArrayList<>();
|
|
|
|
|
if (jg_receiptoutList.size()>0) {
|
|
|
|
|
List<Receiptout_item0Entity> list = saleorderitemService.getReceiptout(jg_receiptoutList.get(0).getId());
|
|
|
|
|
List<ReceiptoutsoitemModel> jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class);
|
|
|
|
|
jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class);
|
|
|
|
|
for (ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList) {
|
|
|
|
|
jg_receiptoutModel.setDocumentNo(jg_receiptoutList.get(0).getDocumentNo());
|
|
|
|
|
jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate().getTime());
|
|
|
|
@ -718,19 +719,20 @@ public class SaleorderitemController {
|
|
|
|
|
Map<String,Object> warehouseMap = new HashMap<>();
|
|
|
|
|
jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap));
|
|
|
|
|
}
|
|
|
|
|
vo.setReceiptoutsoitemList(jg_receiptoutModelList);
|
|
|
|
|
}
|
|
|
|
|
vo.setReceiptoutsoitemList(jg_receiptoutModelList);
|
|
|
|
|
QueryWrapper<ArinvoicesEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id);
|
|
|
|
|
ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper);
|
|
|
|
|
List<Arinvoices_item0soitemModel> jg_arinvoices_item0ModelList = new ArrayList<>();
|
|
|
|
|
if (ObjectUtils.isNotEmpty(arinvoicesEntity)) {
|
|
|
|
|
List<Arinvoices_item0soitemEntity> jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(arinvoicesEntity.getId());
|
|
|
|
|
List<Arinvoices_item0soitemModel> jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List, Arinvoices_item0soitemModel.class);
|
|
|
|
|
jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List, Arinvoices_item0soitemModel.class);
|
|
|
|
|
for (Arinvoices_item0soitemModel jg_arinvoices_item0Model : jg_arinvoices_item0ModelList) {
|
|
|
|
|
jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent()));
|
|
|
|
|
}
|
|
|
|
|
vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList);
|
|
|
|
|
}
|
|
|
|
|
vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList);
|
|
|
|
|
QueryWrapper<Collection_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper1.lambda().eq(Collection_item0Entity::getSalesorderId,id);
|
|
|
|
|
List<Collection_item0Entity> collection_item0Entity = collection_item0Service.list(queryWrapper1);
|
|
|
|
@ -740,11 +742,11 @@ public class SaleorderitemController {
|
|
|
|
|
List<CollectionsoitemEntity> jg_collectionList = saleorderitemService.GetCollectionsoitemList(collection_item0Entity1.getCollectionId());
|
|
|
|
|
collectionsoitemEntityList.addAll(jg_collectionList);
|
|
|
|
|
}
|
|
|
|
|
List<CollectionsoitemModel> jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class);
|
|
|
|
|
for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) {
|
|
|
|
|
}
|
|
|
|
|
vo.setCollectionsoitemList(jg_collectionModelList);
|
|
|
|
|
}
|
|
|
|
|
List<CollectionsoitemModel> jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class);
|
|
|
|
|
for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) {
|
|
|
|
|
}
|
|
|
|
|
vo.setCollectionsoitemList(jg_collectionModelList);
|
|
|
|
|
List<SalesbacksoitemEntity> jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id);
|
|
|
|
|
List<SalesbacksoitemModel> jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class);
|
|
|
|
|
for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){
|
|
|
|
|