修改销售作废和去掉采购

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<SaleorderitemEntity> 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<Salesorder_item0Entity> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
             queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId);

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}
     <if test="saleorderitemPagination.documentNo != null and saleorderitemPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%')
@@ -40,8 +36,6 @@
     <if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null">
         and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.creator_time &lt;= #{saleorderitemPagination.endDate}
     </if>
-    GROUP BY
-    a.document_no
     <if test="saleorderitemPagination.sidx != null and saleorderitemPagination.sidx != ''">
         ORDER BY ${saleorderitemPagination.sidx} ${saleorderitemPagination.sort}
     </if>
@@ -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
     </select>

SC-web/src/views/dashboard/admin/components/PurchasingTodayList.vue

@@ -11,11 +11,11 @@
         <el-table-column prop="Number" width="50px" label="序号">
         </el-table-column>
         <el-table-column prop="FFullName" label="部门"> </el-table-column>
-        <el-table-column prop="bangdan" label="采购磅单数(张)">
+        <el-table-column prop="bangdan" label="磅单数(张)">
         </el-table-column>
-        <el-table-column prop="settlement" label="采购吨位(吨)">
+        <el-table-column prop="settlement" label="吨位(吨)">
         </el-table-column>
-        <el-table-column prop="amout" label="采购总额"> </el-table-column>
+        <el-table-column prop="amout" label="总额"> </el-table-column>
         <el-table-column prop="notPaypalAmounts" label="代付款总额">
         </el-table-column>
         <el-table-column prop="paypalamounts" label="已付款总额">
@@ -193,4 +193,4 @@ export default {
     }
   }
 }
-</style>
+</style>