diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index 5cb38d77..49cc8ae3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -1172,6 +1172,7 @@ public class SaleorderitemController { SaleorderitemEntity entity = saleorderitemService.getInfo(id); if (entity != null) { List querypaymentdoclist = saleorderitemService.querypaymentdoc(id); + if (querypaymentdoclist.size()>0){ if (querypaymentdoclist.get(0).getAdvance().equals("0") && querypaymentdoclist.get(0).getIsPay().equals("1")) { String result = ""; int sum = 0; @@ -1188,6 +1189,7 @@ public class SaleorderitemController { return ActionResult.fail("提示:请先作废付款申请 " + result + "等" + sum + "个付款申请"); } } + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId()); queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId); diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml index be998849..d5742879 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml @@ -6,15 +6,11 @@ SELECT a.*, b.contract_name contractName, - c.supplier_nm customerName, - e.advance, - e.is_pay AS isPay + c.supplier_nm customerName FROM jg_salesorder a left join jg_contract b on a.contract_id = b.id and b.delete_mark = '0' left join jg_customer c on a.customer_id = c.id and c.delete_mark = '0' - LEFT JOIN jg_salesorder_item0 d ON a.id=d.sales_order_id AND d.delete_mark='0' - LEFT JOIN jg_poundlist e ON e.id=d.poundlist_id AND e.delete_mark='0' ${ew.customSqlSegment} and a.document_no LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%') @@ -40,8 +36,6 @@ and a.creator_time > #{saleorderitemPagination.startDate} AND a.creator_time <= #{saleorderitemPagination.endDate} - GROUP BY - a.document_no ORDER BY ${saleorderitemPagination.sidx} ${saleorderitemPagination.sort} @@ -187,6 +181,8 @@ FROM a.id=#{id} AND a.delete_mark='0' + AND + f.document_no is not null GROUP BY d.document_no diff --git a/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue b/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue index d74e6905..b6bd5122 100644 --- a/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue +++ b/SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue @@ -11,11 +11,11 @@ - + - + - + @@ -193,4 +193,4 @@ export default { } } } - \ No newline at end of file +