feat: update 金蝶商品获取

zhongnanhuang
1 parent 98b84d37
Showing 5 changed files with 419 additions and 65 deletions
src/pages/Order/components/FinancialReceiptsModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -49,7 +49,7 @@ export default ({ setVisible, onClose }) =&gt; {
   ];
   const [editableKeys, setEditableRowKeys] = useState<React.Key[]>(() =>
     // defaultData.map((item) => item.id),
-    [3, 4],
+    [1, 2, 3, 4],
   );
   const columns: ProColumns<DataSourceType>[] = [
     {
 import { RESPONSE_CODE } from '@/constants/enum';
 import {
+  postKingdeeRepMaterial,
+  postKingdeeRepMaterialStock,
   postServiceOrderAddOrder,
   postServiceOrderQueryCustomerNameInformation,
-  postServiceOrderQueryProductInformation,
   postServiceOrderQuerySalesCode,
   postServiceOrderUpdateOrder,
 } from '@/services';
@@ -37,6 +38,9 @@ import {
 export default ({ onClose, data, subOrders, orderOptType }) => {
   const [invoicingStatus, setInvoicingStatus] = useState('');
   const [salesCodeOptions, setSalesCodeOptions] = useState([]);
+  const [productInvStockOptionsList, setProductInvStockOptionsList] = useState(
+    [],
+  ); //商品的仓库选项
   const [form] = Form.useForm<{
     salesCode: '';
     customerName: '';
@@ -185,13 +189,30 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    * @param option 商品名称所对应的商品数据
    * @param currentRowData list中当前行的数据
    */
-  function autoFillProductInfo(option: any, currentRowData: any) {
+  async function autoFillProductInfo(
+    option: any,
+    currentRowData: any,
+    index: any,
+  ) {
     let copyList = form.getFieldValue('list');
     let currentData = copyList[currentRowData.field.key];
-    currentData.productCode = option?.productCode;
-    currentData.parameters = option?.specifications;
-    currentData.unit = option?.unit;
+    currentData.productCode = option?.number;
+    currentData.parameters = option?.model;
+    currentData.unit = option?.base_unit_name;
     form.setFieldValue('list', copyList);
+
+    //商品所在的仓库选项填充
+    console.log(currentData);
+    let res = await postKingdeeRepMaterialStock({
+      data: {
+        material_id: option.id,
+      },
+    });
+    let newProductInvStockOptionsList = [...productInvStockOptionsList];
+    newProductInvStockOptionsList[index] = res?.rows?.map((item) => {
+      return { label: item.inv_stock, value: item.inv_stock_id };
+    });
+    setProductInvStockOptionsList(newProductInvStockOptionsList);
   }
  
   /**
@@ -648,15 +669,15 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   placeholder="请搜索商品"
                   rules={[{ required: true, message: '商品名称必填' }]}
                   onChange={(_, option) => {
-                    autoFillProductInfo(option, listMeta);
+                    autoFillProductInfo(option, listMeta, listMeta.index);
                   }}
                   fieldProps={{
                     optionItemRender(item) {
                       if (item.type === 'add') {
                         return (
-                          <div title={item.productName + '（新增商品信息）'}>
+                          <div title={item.name + '（新增商品信息）'}>
                             <span style={{ color: '#333333' }}>
-                              {item.productName}
+                              {item.name}
                             </span>
                             {' | '}
                             <span style={{ color: 'orange' }}>新增商品</span>
@@ -668,40 +689,37 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                           title={
                             item.label +
                             ' | ' +
-                            (item.specifications === undefined
-                              ? '无参数'
-                              : item.specifications) +
+                            (item.model === undefined ? '无参数' : item.model) +
                             ' | ' +
-                            item.unit
+                            item.base_unit_name
                           }
                         >
                           <span style={{ color: '#333333' }}>{item.label}</span>
                           {' | '}
                           <span style={{ color: '#339999' }}>
-                            {item.specifications === undefined
-                              ? '无参数'
-                              : item.specifications}
+                            {item.model === undefined ? '无参数' : item.model}
                           </span>
                           {' | '}
                           <span style={{ color: '#666666' }}>
-                            {item.unit === undefined ? '无单位' : item.unit}
+                            {item.base_unit_name === undefined
+                              ? '无单位'
+                              : item.base_unit_name}
                           </span>
                         </div>
                       );
                     },
                   }}
-                  request={async (value, { params }) => {
+                  debounceTime={1000}
+                  request={async (value) => {
                     const keywords = value.keyWords;
-                    const { data } =
-                      await postServiceOrderQueryProductInformation({
-                        data: { productName: keywords },
-                        params: params,
-                      });
-                    let options = data.map((p: any) => {
+                    const res = await postKingdeeRepMaterial({
+                      data: { search: keywords },
+                    });
+                    let options = res?.rows?.map((p: any) => {
                       return {
                         ...p,
-                        label: p.productName,
-                        value: p.id + '|' + p.productName,
+                        label: p.name,
+                        value: p.id + '|' + p.name,
                         key: p.id,
                       };
                     });
@@ -719,20 +737,13 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     return options;
                   }}
                 />,
-                <ProFormText
-                  key={'productCode' + listMeta.index}
+                <ProFormSelect
+                  key="inv_stock"
+                  placeholder="请选择商品仓库"
+                  name="invStock"
                   width="lg"
-                  name="productCode"
-                  disabled
-                  label={
-                    <>
-                      <span>商品编码</span>
-                      <span className="pl-2 text-xs text-gray-400">
-                        新增商品时，商品编码由系统自动生成
-                      </span>
-                    </>
-                  }
-                  placeholder="未输入商品名称"
+                  label="仓库"
+                  options={productInvStockOptionsList[listMeta.index]}
                 />,
                 <ProFormText
                   key={'parameters' + listMeta.index}
@@ -898,23 +898,6 @@ const OrderPage = () =&gt; {
               ''
             )}
  
-            {false ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  setFinancialReceiptsModalVisible(true);
-                  setOrderRow(record);
-                  setSelectedRows([optRecord]);
-                  setIsEdit(true);
-                }}
-              >
-                收款记录
-              </Button>
-            ) : (
-              ''
-            )}
-
             {optRecord.subPath?.includes('invoicing') ? (
               <Button
                 className="p-0"
@@ -1419,6 +1402,22 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Space.Compact direction="vertical" align="end">
                 <Space>
+                  {record.mainPath?.includes('updateHirePurchase') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setFinancialReceiptsModalVisible(true);
+                        setOrderRow(record);
+                        setSelectedRows([record]);
+                        setIsEdit(true);
+                      }}
+                    >
+                      收款记录
+                    </Button>
+                  ) : (
+                    ''
+                  )}
                   {record.mainPath?.includes('procureConvertProcure') ? (
                     <Button
                       className="p-0"
@@ -370,6 +370,87 @@ export interface FilePathDto {
   url?: string;
 }
  
+export interface InventoryMaterialStockReq {
+  auxPropId?: string;
+  isShowStockPosition?: boolean;
+  isShowZeroImQty?: boolean;
+  materialId?: string;
+}
+
+export interface MaterialListReply {
+  count?: string;
+  /** @format int32 */
+  currentPage?: number;
+  /** @format int32 */
+  currentPageSize?: number;
+  /** @format int32 */
+  page?: number;
+  /** @format int32 */
+  pageSize?: number;
+  rows?: Array<MaterialListReplyRow>;
+  /** @format int32 */
+  totalPage?: number;
+}
+
+export interface MaterialListReplyRow {
+  barcode?: string;
+  baseUnitId?: string;
+  baseUnitName?: string;
+  baseUnitNumber?: string;
+  brandId?: string;
+  brandName?: string;
+  brandNumber?: string;
+  checkType?: string;
+  helpCode?: string;
+  id?: string;
+  isAsstAttr?: boolean;
+  isBatch?: boolean;
+  isKfPeriod?: boolean;
+  isMultiUnit?: boolean;
+  isSerial?: boolean;
+  isShowAuxBarcode?: boolean;
+  isWeight?: boolean;
+  model?: string;
+  mulLabel?: Array<Mullabel>;
+  name?: string;
+  number?: string;
+  parentId?: string;
+  parentName?: string;
+  parentNumber?: string;
+  producingPace?: string;
+  remark?: string;
+  units?: Array<Unit>;
+  url?: string;
+}
+
+export interface MaterialMaterialListReq {
+  createEndTime?: string;
+  createStartTime?: string;
+  enable?: string;
+  ids?: Array<string>;
+  isDataPerm?: boolean;
+  modifyEndTime?: string;
+  modifyStartTime?: string;
+  page?: string;
+  pageSize?: string;
+  parent?: Array<string>;
+  search?: string;
+  showUnits?: boolean;
+}
+
+export interface MaterialStockRes {
+  rows?: Array<MaterialStockRow>;
+}
+
+export interface MaterialStockRow {
+  invBaseUnit?: string;
+  invImQty?: string;
+  invQty?: string;
+  invStock?: string;
+  invStockId?: string;
+  invStockPosition?: string;
+}
+
 export interface ModelAndView {
   empty?: boolean;
   model?: any;
@@ -382,6 +463,12 @@ export interface ModelAndView {
   viewName?: string;
 }
  
+export interface Mullabel {
+  id?: string;
+  name?: string;
+  number?: string;
+}
+
 export interface OrderAddVO {
   baseInfo?: OrderBaseInfoVO;
   inspectionStageInfo?: OrderInspectionStageVO;
@@ -891,6 +978,46 @@ export interface SysLogQueryVO {
   username?: string;
 }
  
+export interface Unit {
+  /** @format float */
+  coefficient?: number;
+  conversionUnitConversionType?: string;
+  conversionUnitCreatetime?: string;
+  conversionUnitDisableDate?: string;
+  conversionUnitEnable?: string;
+  conversionUnitId?: string;
+  conversionUnitIsLeaf?: boolean;
+  /** @format int32 */
+  conversionUnitLevel?: number;
+  conversionUnitLongNumber?: string;
+  conversionUnitModifyTime?: string;
+  conversionUnitName?: string;
+  conversionUnitNumber?: string;
+  conversionUnitPrecision?: string;
+  conversionUnitPrecisionAccount?: string;
+  id?: string;
+  /** @format int32 */
+  index?: number;
+  isDefault?: boolean;
+  isFloat?: boolean;
+  materialId?: string;
+  unitConversionType?: string;
+  unitCreateTime?: string;
+  unitDisableDate?: string;
+  unitEnable?: string;
+  unitId?: string;
+  unitIsLeaf?: boolean;
+  /** @format int32 */
+  unitLevel?: number;
+  unitLongNumber?: string;
+  unitModifyTime?: string;
+  unitNumber?: string;
+  unitPrecision?: string;
+  /** @format int32 */
+  unitPrecisionAccount?: number;
+  unitidName?: string;
+}
+
 export interface UpdatePwdVO {
   confirmPassword?: string;
   password?: string;
@@ -26,6 +26,10 @@ import type {
   DictionaryQueryVO,
   DictionaryVO,
   Dto,
+  InventoryMaterialStockReq,
+  MaterialListReply,
+  MaterialMaterialListReq,
+  MaterialStockRes,
   ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
@@ -567,8 +571,8 @@ export const patchError = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
-/** @description response type for getKingdeeTestGetToken */
-export interface GetKingdeeTestGetTokenResponse {
+/** @description response type for getKingdeeRepGetToken */
+export interface GetKingdeeRepGetTokenResponse {
   /**
    * @description
    *   OK
@@ -591,21 +595,163 @@ export interface GetKingdeeTestGetTokenResponse {
   404: any;
 }
  
-export type GetKingdeeTestGetTokenResponseSuccess =
-  GetKingdeeTestGetTokenResponse[200];
+export type GetKingdeeRepGetTokenResponseSuccess =
+  GetKingdeeRepGetTokenResponse[200];
 /**
  * @description
  *   getToken
- * @tags kingdee-test-controller
+ * @tags kingdee-erp-controller
  * @produces *
  */
-export const getKingdeeTestGetToken = /* #__PURE__ */ (() => {
+export const getKingdeeRepGetToken = /* #__PURE__ */ (() => {
   const method = 'get';
-  const url = '/kingdee/test/getToken';
-  function request(): Promise<GetKingdeeTestGetTokenResponseSuccess> {
+  const url = '/kingdee/rep/getToken';
+  function request(): Promise<GetKingdeeRepGetTokenResponseSuccess> {
     return requester(request.url, {
       method: request.method,
-    }) as unknown as Promise<GetKingdeeTestGetTokenResponseSuccess>;
+    }) as unknown as Promise<GetKingdeeRepGetTokenResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postKingdeeRepMaterial */
+export interface PostKingdeeRepMaterialOption {
+  /**
+   * @description
+   *   req
+   */
+  body: {
+    /**
+        @description
+          req */
+    req: MaterialMaterialListReq;
+  };
+}
+
+/** @description response type for postKingdeeRepMaterial */
+export interface PostKingdeeRepMaterialResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: MaterialListReply;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostKingdeeRepMaterialResponseSuccess =
+  PostKingdeeRepMaterialResponse[200];
+/**
+ * @description
+ *   listMaterial
+ * @tags kingdee-erp-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postKingdeeRepMaterial = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/kingdee/rep/material';
+  function request(
+    option: PostKingdeeRepMaterialOption,
+  ): Promise<PostKingdeeRepMaterialResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostKingdeeRepMaterialResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postKingdeeRepMaterialStock */
+export interface PostKingdeeRepMaterialStockOption {
+  /**
+   * @description
+   *   req
+   */
+  body: {
+    /**
+        @description
+          req */
+    req: InventoryMaterialStockReq;
+  };
+}
+
+/** @description response type for postKingdeeRepMaterialStock */
+export interface PostKingdeeRepMaterialStockResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: MaterialStockRes;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostKingdeeRepMaterialStockResponseSuccess =
+  PostKingdeeRepMaterialStockResponse[200];
+/**
+ * @description
+ *   listMaterialStock
+ * @tags kingdee-erp-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postKingdeeRepMaterialStock = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/kingdee/rep/materialStock';
+  function request(
+    option: PostKingdeeRepMaterialStockOption,
+  ): Promise<PostKingdeeRepMaterialStockResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostKingdeeRepMaterialStockResponseSuccess>;
   }
  
   /** http method */
@@ -8127,6 +8273,77 @@ export const postServiceOrderUpdateAnnex = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postServiceOrderUpdateHirePurchase */
+export interface PostServiceOrderUpdateHirePurchaseOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderUpdateHirePurchase */
+export interface PostServiceOrderUpdateHirePurchaseResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderUpdateHirePurchaseResponseSuccess =
+  PostServiceOrderUpdateHirePurchaseResponse[200];
+/**
+ * @description
+ *   修改分期付款信息
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderUpdateHirePurchase = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/updateHirePurchase';
+  function request(
+    option: PostServiceOrderUpdateHirePurchaseOption,
+  ): Promise<PostServiceOrderUpdateHirePurchaseResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderUpdateHirePurchaseResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderUpdateOrder */
 export interface PostServiceOrderUpdateOrderOption {
   /**