Merge branch 'master_cj_zq' into master_sample_order

@@ -298,8 +298,15 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         if (contract == null) {
         if (contract == null) {
             throw new DefaultClientException("合同不存在！");
             throw new DefaultClientException("合同不存在！");
         }
         }
-        Boolean standardStandardized = contract.getStandardStandardized();
-        if (!BooleanUtils.isTrue(standardStandardized)) {
+        String contractType = contract.getType();
+        if (("DISTRIB_STD".equals(contractType) || "INTL_STD_CONTRACT".equals(contractType) || "PROCESS_STD_AGMT".equals(contractType)
+                || "DRAFT_DIST_AGMT".equals(contractType) || "INTL_OPEN_SPEC_AGMT".equals(contractType))
+                && !"PASS".equals(contract.getStandardApproved())) {
+            // 标准、未锁规合同
+            throw new DefaultClientException("合同不规范，请补充！");
+        } else if (("DIST_STOCK_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType))
+                && !"PASS".equals(contract.getFormalApproved())) {
+            // 库存合同
             throw new DefaultClientException("合同不规范，请补充！");
             throw new DefaultClientException("合同不规范，请补充！");
         }
         }
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();

@@ -494,6 +494,19 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             vo.setEndTime(endTime);
             vo.setEndTime(endTime);
         }
         }
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 总欠款筛选
+        String debtAmountScope = vo.getDebtAmountScope();
+        if ("SCOPE_1".equals(debtAmountScope)) {
+            vo.setDebtStartValue(new BigDecimal(5000000));
+        } else if ("SCOPE_2".equals(debtAmountScope)) {
+            vo.setDebtStartValue(new BigDecimal(3000000));
+            vo.setDebtEndValue(new BigDecimal(5000000));
+        } else if ("SCOPE_3".equals(debtAmountScope)) {
+            vo.setDebtStartValue(new BigDecimal(1000000));
+            vo.setDebtEndValue(new BigDecimal(3000000));
+        } else if ("SCOPE_4".equals(debtAmountScope)) {
+            vo.setDebtEndValue(new BigDecimal(1000000));
+        }
         // 开启分页
         // 开启分页
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ReceiptLedgerReportBo> dataList = getBaseMapper().report(vo);
         List<ReceiptLedgerReportBo> dataList = getBaseMapper().report(vo);

@@ -132,6 +132,24 @@
                 AND tb.debt_status = #{vo.debtStatus}
                 AND tb.debt_status = #{vo.debtStatus}
             </if>
             </if>
         </where>
         </where>
+        ORDER BY
+        CASE
+            WHEN d.name like '宁波办%' THEN 1
+            WHEN d.name like '温州办%' THEN 2
+            WHEN d.name like '东莞办%' THEN 3
+            WHEN d.name like '佛山办%' THEN 4
+            WHEN d.name like '苏州办%' THEN 5
+            WHEN d.name like '常州办%' THEN 6
+            WHEN d.name like '北方办%' THEN 7
+            WHEN d.name like '紫铜办%' THEN 8
+            WHEN d.name like '外贸办%' THEN 9
+        ELSE 10  -- 其他办事处按字母顺序排在后面
+        END,
+        d.name ASC,
+        r.name ASC,
+        cs.short_name ASC,
+        oc.name ASC,
+        tb.shipment_date DESC
     </select>
     </select>
 
 
     <select id="queryByCustomerShortName" resultMap="ReceiptLedgerInfo">
     <select id="queryByCustomerShortName" resultMap="ReceiptLedgerInfo">
@@ -231,7 +249,8 @@
                tb.region,
                tb.region,
                r.name as region_name,
                r.name as region_name,
                max(cc.company_credit_limit) as quota,
                max(cc.company_credit_limit) as quota,
-               max(cc.company_settlement_period) as settle_term
+               max(cc.company_settlement_period) as settle_term,
+               sum(distinct rl.end_account_receivable) as end_account_total
         from base_data_customer_short tb
         from base_data_customer_short tb
         left join sys_dept d on tb.dept_id = d.id
         left join sys_dept d on tb.dept_id = d.id
         left join sys_dept r on tb.region = r.id
         left join sys_dept r on tb.region = r.id
@@ -254,11 +273,27 @@
         group by tb.short_name,tb.type,tb.dept_id,tb.region
         group by tb.short_name,tb.type,tb.dept_id,tb.region
         having 1=1
         having 1=1
         <if test="vo.debtStartValue != null">
         <if test="vo.debtStartValue != null">
-            and sum(rl.end_account_receivable) >= #{debtStartValue}
+            and sum(distinct rl.end_account_receivable) >= #{vo.debtStartValue}
         </if>
         </if>
         <if test="vo.debtEndValue != null">
         <if test="vo.debtEndValue != null">
-            and sum(rl.end_account_receivable) &lt;= #{debtEndValue}
+            and sum(distinct rl.end_account_receivable) &lt;= #{vo.debtEndValue}
         </if>
         </if>
+        order by
+        case
+            when d.name like '宁波办%' then 1
+            when d.name like '温州办%' then 2
+            when d.name like '东莞办%' then 3
+            when d.name like '佛山办%' then 4
+            when d.name like '苏州办%' then 5
+            when d.name like '常州办%' then 6
+            when d.name like '北方办%' then 7
+            when d.name like '紫铜办%' then 8
+            when d.name like '外贸办%' then 9
+        else 10  -- 其他办事处按字母顺序排在后面
+        end,
+        d.name asc,
+        r.name asc,
+        sum(distinct rl.end_account_receivable) desc
     </select>
     </select>
 
 
     <select id="statisticsDebtByShortName" resultType="java.util.Map">
     <select id="statisticsDebtByShortName" resultType="java.util.Map">