feat: 1223

PurelzMgnead
1 parent ba842ae6
Showing 12 changed files with 151 additions and 11 deletions
src/pages/Order/FeedBack/OrderList.tsx
src/pages/Order/FeedBack/constant.ts
src/pages/Order/Order/components/ProcureCheckModal.tsx
src/pages/Order/Order/index copy.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/OrderList/ProcureCheckModal.tsx
src/pages/Order/OrderWarning/index copy.tsx
src/pages/Order/constant.ts
src/pages/OrderPrint/components/HoujiePrinter.tsx
src/pages/OrderPrint/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -705,7 +705,11 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
       }
       //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
-      if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
+      if (
+        orderStatus === 'UNAUDITED' ||
+        orderStatus === 'LEADER_AUDITED' ||
+        orderStatus === 'PROCURE_REJECT'
+      ) {
         if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
           orderStatusTagText = '财务待审核';
         } else {
@@ -3542,6 +3546,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                             //是审核通过及之后的订单
                             if (
                               orderStatus !== 'UNAUDITED' &&
+                              orderStatus !== 'PROCURE_REJECT' &&
                               orderStatus !== 'AUDIT_FAILED' &&
                               orderStatus !== 'LEADER_PROCESS' &&
                               orderStatus !== 'SALES_CONFIRM' &&
@@ -3557,6 +3562,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                             if (
                               roleCode !== 'admin' &&
                               (orderStatus === 'UNAUDITED' ||
+                                orderStatus === 'PROCURE_REJECT' ||
                                 orderStatus === 'AUDIT_FAILED')
                             ) {
                               message.error('请选择已审核的订单进行编辑');
@@ -3610,6 +3616,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                           let orderStatus = selectedSubOrders[i].orderStatus;
                           if (
                             orderStatus !== 'UNAUDITED' &&
+                            orderStatus !== 'PROCURE_REJECT' &&
                             orderStatus !== 'FINANCE_PROCESS' &&
                             orderStatus !== 'LEADER_AUDITED'
                           ) {
@@ -3795,6 +3802,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
                             selectedSubOrders[i].orderStatus !==
+                              'PROCURE_REJECT' &&
+                            selectedSubOrders[i].orderStatus !==
                               'FINANCE_PROCESS' &&
                             selectedSubOrders[i].orderStatus !==
                               'LEADER_AUDITED'
@@ -181,6 +181,7 @@ export const ORDER_STATUS_OPTIONS = {
   WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
   SALES_CONFIRM: '销售待确认',
   UNAUDITED: '未审核',
+  PROCURE_REJECT: '采购驳回至销售',
   LEADER_PROCESS: '领导待审核',
   MODIFY_APPLY_WAIT_FOR_AUDIT: '修改待审核',
   LEADER_AUDITED: '领导已审核',
@@ -265,6 +266,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['COMMON_INVOICED', 'processing'],
   ['AFTER_INVOICED', 'success'],
   ['UNAUDITED', 'warning'],
+  ['PROCURE_REJECT', 'warning'],
   ['AUDITED', 'processing'],
   ['WAIT_SHIP', 'processing'],
   ['SHIPPED', 'processing'],
@@ -50,6 +50,7 @@ export default ({ setCheckVisible, isMainOrder, orders, onClose }) =&gt; {
           return [
             defaultDoms[0],
             <>
+              <Button>驳回至销售</Button>
               <Popconfirm
                 title="是否转回仓库"
                 description={
@@ -712,7 +712,11 @@ const OrderPage = () =&gt; {
       }
       //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
-      if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
+      if (
+        orderStatus === 'UNAUDITED' ||
+        orderStatus === 'LEADER_AUDITED' ||
+        orderStatus === 'PROCURE_REJECT'
+      ) {
         if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
           orderStatusTagText = '财务待审核';
         } else {
@@ -3523,6 +3527,7 @@ const OrderPage = () =&gt; {
                             //是审核通过及之后的订单
                             if (
                               orderStatus !== 'UNAUDITED' &&
+                              orderStatus !== 'PROCURE_REJECT' &&
                               orderStatus !== 'AUDIT_FAILED' &&
                               orderStatus !== 'LEADER_PROCESS' &&
                               orderStatus !== 'SALES_CONFIRM' &&
@@ -3538,6 +3543,7 @@ const OrderPage = () =&gt; {
                             if (
                               roleCode !== 'admin' &&
                               (orderStatus === 'UNAUDITED' ||
+                                orderStatus === 'PROCURE_REJECT' ||
                                 orderStatus === 'AUDIT_FAILED')
                             ) {
                               message.error('请选择已审核的订单进行编辑');
@@ -3591,6 +3597,7 @@ const OrderPage = () =&gt; {
                           let orderStatus = selectedSubOrders[i].orderStatus;
                           if (
                             orderStatus !== 'UNAUDITED' &&
+                            orderStatus !== 'PROCURE_REJECT' &&
                             orderStatus !== 'FINANCE_PROCESS' &&
                             orderStatus !== 'LEADER_AUDITED'
                           ) {
@@ -3754,6 +3761,8 @@ const OrderPage = () =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
                             selectedSubOrders[i].orderStatus !==
+                              'PROCURE_REJECT' &&
+                            selectedSubOrders[i].orderStatus !==
                               'FINANCE_PROCESS' &&
                             selectedSubOrders[i].orderStatus !==
                               'LEADER_AUDITED'
@@ -718,7 +718,11 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
       }
       //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
-      if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
+      if (
+        orderStatus === 'UNAUDITED' ||
+        orderStatus === 'LEADER_AUDITED' ||
+        orderStatus === 'PROCURE_REJECT'
+      ) {
         if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
           orderStatusTagText = '财务待审核';
         } else {
@@ -3552,6 +3556,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                             //是审核通过及之后的订单
                             if (
                               orderStatus !== 'UNAUDITED' &&
+                              orderStatus !== 'PROCURE_REJECT' &&
                               orderStatus !== 'AUDIT_FAILED' &&
                               orderStatus !== 'LEADER_PROCESS' &&
                               orderStatus !== 'SALES_CONFIRM' &&
@@ -3567,6 +3572,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                             if (
                               roleCode !== 'admin' &&
                               (orderStatus === 'UNAUDITED' ||
+                                orderStatus === 'PROCURE_REJECT' ||
                                 orderStatus === 'AUDIT_FAILED')
                             ) {
                               message.error('请选择已审核的订单进行编辑');
@@ -3620,6 +3626,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                           let orderStatus = selectedSubOrders[i].orderStatus;
                           if (
                             orderStatus !== 'UNAUDITED' &&
+                            orderStatus !== 'PROCURE_REJECT' &&
                             orderStatus !== 'FINANCE_PROCESS' &&
                             orderStatus !== 'LEADER_AUDITED'
                           ) {
@@ -3804,6 +3811,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
                             selectedSubOrders[i].orderStatus !==
+                              'PROCURE_REJECT' &&
+                            selectedSubOrders[i].orderStatus !==
                               'FINANCE_PROCESS' &&
                             selectedSubOrders[i].orderStatus !==
                               'LEADER_AUDITED'
@@ -2,6 +2,7 @@ import { RESPONSE_CODE } from &#39;@/constants/enum&#39;;
 import {
   postServiceOrderProcureCheckOrder,
   postServiceOrderProcureConvertWarehouseKeeper,
+  postServiceOrderPurchaseRejectionToSale,
   postServiceOrderQuerySupplier,
 } from '@/services';
 import {
@@ -50,6 +51,25 @@ export default ({ setCheckVisible, isMainOrder, orders, onClose }) =&gt; {
           return [
             defaultDoms[0],
             <>
+              <Button
+                type="primary"
+                onClick={async () => {
+                  let res = await postServiceOrderPurchaseRejectionToSale({
+                    data: {
+                      subIds: ids,
+                      checkNotes: checkNotes,
+                    },
+                  });
+
+                  if (res?.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(res.message);
+                    onClose();
+                    return true;
+                  }
+                }}
+              >
+                驳回至销售
+              </Button>
               <Popconfirm
                 title="是否转回仓库"
                 description={
@@ -662,7 +662,11 @@ const OrderPage = () =&gt; {
       }
       //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
-      if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
+      if (
+        orderStatus === 'UNAUDITED' ||
+        orderStatus === 'LEADER_AUDITED' ||
+        orderStatus === 'PROCURE_REJECT'
+      ) {
         if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
           orderStatusTagText = '财务待审核';
         } else {
@@ -3481,6 +3485,7 @@ const OrderPage = () =&gt; {
                             //是审核通过及之后的订单
                             if (
                               orderStatus !== 'UNAUDITED' &&
+                              orderStatus !== 'PROCURE_REJECT' &&
                               orderStatus !== 'AUDIT_FAILED' &&
                               orderStatus !== 'LEADER_PROCESS' &&
                               orderStatus !== 'SALES_CONFIRM' &&
@@ -3496,6 +3501,7 @@ const OrderPage = () =&gt; {
                             if (
                               roleCode !== 'admin' &&
                               (orderStatus === 'UNAUDITED' ||
+                                orderStatus === 'PROCURE_REJECT' ||
                                 orderStatus === 'AUDIT_FAILED')
                             ) {
                               message.error('请选择已审核的订单进行编辑');
@@ -3549,6 +3555,7 @@ const OrderPage = () =&gt; {
                           let orderStatus = selectedSubOrders[i].orderStatus;
                           if (
                             orderStatus !== 'UNAUDITED' &&
+                            orderStatus !== 'PROCURE_REJECT' &&
                             orderStatus !== 'FINANCE_PROCESS' &&
                             orderStatus !== 'LEADER_AUDITED'
                           ) {
@@ -3712,6 +3719,8 @@ const OrderPage = () =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
                             selectedSubOrders[i].orderStatus !==
+                              'PROCURE_REJECT' &&
+                            selectedSubOrders[i].orderStatus !==
                               'FINANCE_PROCESS' &&
                             selectedSubOrders[i].orderStatus !==
                               'LEADER_AUDITED'
@@ -182,6 +182,7 @@ export const ORDER_STATUS_OPTIONS = {
   WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
   SALES_CONFIRM: '销售待确认',
   UNAUDITED: '未审核',
+  PROCURE_REJECT: '采购驳回至销售',
   LEADER_PROCESS: '领导待审核',
   MODIFY_APPLY_WAIT_FOR_AUDIT: '修改待审核',
   LEADER_AUDITED: '领导已审核',
@@ -260,6 +261,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['COMMON_INVOICED', 'processing'],
   ['AFTER_INVOICED', 'success'],
   ['UNAUDITED', 'warning'],
+  ['PROCURE_REJECT', 'warning'],
   ['AUDITED', 'processing'],
   ['WAIT_SHIP', 'processing'],
   ['SHIPPED', 'processing'],
@@ -221,7 +221,7 @@ export default ({ mainOrder, subOrders }) =&gt; {
             <td className="xl76" colSpan={2} style={{ msoIgnore: 'colSpan' }}>
               客户签名：
             </td>
-            <td className="xl76">核准：屠亚辉</td>
+            <td className="xl76">核准：冯强</td>
             <td
               className="xl78"
               colSpan={2}
@@ -234,7 +234,7 @@ export default ({ mainOrder, subOrders }) =&gt; {
               colSpan={2}
               style={{ borderRight: 'none', borderBottom: 'none' }}
             >
-              开单人：张玉红
+              开单人：许铭轩
             </td>
           </tr>
           <tr style={{ display: 'none', width: 0 }}>
@@ -339,7 +339,7 @@ function App() {
             <td className="xl76" colSpan={2} style={{ msoIgnore: 'colspan' }}>
               客户签名：
             </td>
-            <td className="xl76">核准：屠亚辉</td>
+            <td className="xl76">核准：冯强</td>
             <td
               className="xl78"
               colSpan={2}
@@ -352,7 +352,7 @@ function App() {
               colSpan={2}
               style={{ borderRight: 'none', borderBottom: 'none' }}
             >
-              开单人：张玉红
+              开单人：许铭轩
             </td>
           </tr>
           <tr style={{ display: 'none', width: 0 }}>
@@ -2395,6 +2395,12 @@ export interface OrderCompletionReportVO {
   orderStatus?: number;
 }
+export interface OrderDistrictSelVo {
+  /** @format int64 */
+  oid?: number;
+  orderType?: string;
+}
+
 export interface OrderFieldLockApplyQueryVO {
   /** @format int64 */
   applyUserId?: number;
@@ -4618,6 +4624,7 @@ export interface InvoiceDetail {
 }
 export interface InvoiceReissueRecord {
+  auditNotes?: string;
   createByName?: string;
   /**
    * @description
@@ -74,6 +74,7 @@ import type {
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
+  OrderDistrictSelVo,
   OrderFieldLockApplyQueryVO,
   OrderMainProDo,
   OrderOptLogQueryVO,
@@ -3062,13 +3063,13 @@ export const postDistrictFindProvinceAndCityAndDistrict =
 export interface PostDistrictSelOrderProvinceOption {
   /**
    * @description
-   *   oId
+   *   OrderDistrictSelVo
    */
   body: {
     /**
         @description
-          oId */
-    oId: number;
+          OrderDistrictSelVo */
+    OrderDistrictSelVo: OrderDistrictSelVo;
   };
 }
@@ -22077,6 +22078,77 @@ export const getServiceOrderProvideToken = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderPurchaseRejectionToSale */
+export interface PostServiceOrderPurchaseRejectionToSaleOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderPurchaseRejectionToSale */
+export interface PostServiceOrderPurchaseRejectionToSaleResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderPurchaseRejectionToSaleResponseSuccess =
+  PostServiceOrderPurchaseRejectionToSaleResponse[200];
+/**
+ * @description
+ *   采购驳回至销售
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderPurchaseRejectionToSale = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/purchaseRejectionToSale';
+  function request(
+    option: PostServiceOrderPurchaseRejectionToSaleOption,
+  ): Promise<PostServiceOrderPurchaseRejectionToSaleResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderPurchaseRejectionToSaleResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderQueryAfterSalesInfoSnapshot */
 export interface PostServiceOrderQueryAfterSalesInfoSnapshotOption {
   /**