feat: update 商品新增

zhongnanhuang
1 parent 5cbe46ae
Showing 3 changed files with 323 additions and 113 deletions
src/pages/Order/components/OrderDrawer.tsx
src/services/definition.ts
src/services/request.ts
@@ -3,6 +3,8 @@ import {
   postKingdeeRepCustomer,
   postKingdeeRepCustomerDetail,
   postKingdeeRepMaterial,
+  postKingdeeRepMaterialUnit,
+  postKingdeeRepMeasureUnit,
   postServiceOrderAddOrder,
   postServiceOrderQuerySalesCode,
   postServiceOrderUpdateOrder,
@@ -43,6 +45,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   const [customer, setCustomer] = useState({});
   const [kingdeeCstomerModalVisible, setKingdeeCstomerModalVisible] =
     useState(false);
+  const [
+    productParametersDisabledFlagList,
+    setProductParametersDisabledFlagList,
+  ] = useState([]);
   // const [productInvStockOptionsList, setProductInvStockOptionsList] = useState(
   //   [],
   // ); //商品的仓库选项
@@ -249,38 +255,85 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     currentRowData: any,
     index: any,
   ) {
-    let copyList = form.getFieldValue('list');
-    let currentData = copyList[currentRowData.field.key];
-    currentData.productCode = option?.number;
-    currentData.parameters = option?.model;
-    currentData.unit = option?.base_unit_name;
+    let newProductParametersDisabledFlagList = [
+      ...productParametersDisabledFlagList,
+    ];
+    let newProductUnitOptionsList = [...productUnitOptionsList];
+    newProductUnitOptionsList[index] = [];
-    //商品id
-    currentData.materialId = option?.id;
+    //是新增商品
+    if (option.type === 'add') {
+      //商品参数开放权限可以编辑
+      newProductParametersDisabledFlagList[index] = false;
-    //单位
-    currentData.unit = option.base_unit_name;
-    currentData.unitId = option.base_unit_id;
+      //清空商品信息
+      let copyList = form.getFieldValue('list');
+      let currentData = copyList[index];
+      currentData.productCode = undefined;
+      currentData.parameters = undefined;
+      currentData.unit = undefined;
+      currentData.subOrderPayment = undefined;
+      currentData.quantity = undefined;
+      currentData.notes = undefined;
+      currentData.productPrice = undefined;
+      form.setFieldValue('list', copyList);
-    form.setFieldValue('list', copyList);
+      //查询计量单价列表
+      let res = await postKingdeeRepMeasureUnit({ data: {} });
+      if (res && res?.rows) {
+        for (let row of res?.rows) {
+          newProductUnitOptionsList[index].push({
+            label: row.name,
+            value: row.id,
+          });
+        }
+      }
+    } else {
+      //选择的是已有的商品，进行内容自动填充
+      let copyList = form.getFieldValue('list');
+      let currentData = copyList[index];
+      currentData.productCode = option?.number;
+      currentData.parameters = option?.model;
+      currentData.unit = option?.base_unit_name;
-    //商品所在的仓库选项填充
-    // 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);
+      //商品id
+      currentData.materialId = option?.id;
-    //商品单位填充，目前一个商品暂时只有一个单位
-    let newProductUnitOptionsList = [...productUnitOptionsList];
-    newProductUnitOptionsList[index] = [
-      { label: option.base_unit_name, value: option.base_unit_id },
-    ];
+      //单位
+      currentData.unit = option.base_unit_name;
+      currentData.unitId = option.base_unit_id;
+
+      form.setFieldValue('list', copyList);
+
+      //商品所在的仓库选项填充
+      // 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);
+
+      //商品单位填充，查询商品单位列表
+      let res = await postKingdeeRepMaterialUnit({
+        data: { material_id: option.id },
+      });
+      if (res && res.rows) {
+        for (let row of res.rows) {
+          newProductUnitOptionsList[index].push({
+            label: row.unit_name,
+            value: row.unit_id,
+          });
+        }
+      }
+      //商品参数不允许编辑
+      newProductParametersDisabledFlagList[index] = true;
+    }
+
+    setProductParametersDisabledFlagList(newProductParametersDisabledFlagList);
     setProductUnitOptionsList(newProductUnitOptionsList);
   }
@@ -308,6 +361,18 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   }
   /**
+   * 选择商品单位后自动填充
+   * @param option
+   * @param index
+   */
+  function autoFillUnit(option: any, index: any) {
+    let copyList = form.getFieldValue('list');
+    let currentData = copyList[index];
+    currentData.unit = option?.label;
+    form.setFieldValue('list', copyList);
+  }
+
+  /**
    * 计算子订单金额
    * @param listMeta 当前商品信息
    */
@@ -616,89 +681,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           }}
           initialValue={data.contactAddress}
           options={productCustomerContactOptions}
-          // fieldProps={{
-          //   optionItemRender(item) {
-          //     if (item.type === 'add') {
-          //       return (
-          //         <div title={item.name + '（新增收货人）'}>
-          //           <span style={{ color: '#333333' }}>{item.name}</span>
-          //           {' | '}
-          //           <span style={{ color: 'orange' }}>自定义</span>
-          //         </div>
-          //       );
-          //     }
-          //     return (
-          //       <div
-          //         title={
-          //           item.name +
-          //           ' | ' +
-          //           item.customerContactNumber +
-          //           ' | ' +
-          //           (item.customerShippingAddress === undefined
-          //             ? '无地址'
-          //             : item.customerShippingAddress) +
-          //           ' | ' +
-          //           item.institutionContactName +
-          //           ' | ' +
-          //           item.institution
-          //         }
-          //       >
-          //         <span style={{ color: '#333333' }}>{item.name}</span>
-          //         {' | '}
-          //         <span style={{ color: '#339999' }}>
-          //           {item.customerContactNumber === undefined
-          //             ? '无电话号码'
-          //             : item.customerContactNumber}
-          //         </span>
-          //         {' | '}
-          //         <span style={{ color: '#666666' }}>
-          //           {item.customerShippingAddress === undefined
-          //             ? '无地址'
-          //             : item.customerShippingAddress}
-          //         </span>
-          //         {' | '}
-          //         <span style={{ color: '#666666' }}>
-          //           {item.institutionContactName === undefined
-          //             ? '无课题组'
-          //             : item.institutionContactName}
-          //         </span>
-          //         {' | '}
-          //         <span style={{ color: '#666666' }}>
-          //           {item.institution === undefined ? '无单位' : item.institution}
-          //         </span>
-          //       </div>
-          //     );
-          //   },
-          // }}
-          // debounceTime={1000}
-          // request={async (value, { params }) => {
-          //   const keywords = value.keyWords;
-          //   const res = await postKingdeeRepCustomer({
-          //     data: { search: keywords },
-          //     params: params,
-          //   });
-          //   console.log(res)
-          //   let options = res?.rows?.map((c: any) => {
-          //     return {
-          //       ...c,
-          //       label: c.name,
-          //       value: c.id,
-          //       key: c.id,
-          //     };
-          //   });
-
-          //   //第一个商品默认为要新增的商品
-          //   if (keywords.trim() !== '') {
-          //     options.unshift({
-          //       name: keywords,
-          //       type: 'add',
-          //       label: keywords,
-          //       value: 3.1415926,
-          //       key: keywords,
-          //     });
-          //   }
-          //   return options;
-          // }}
         />
         <ProFormText
           width="lg"
@@ -939,7 +921,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                           return (
                             <div title={item.name + '（新增商品信息）'}>
                               <span style={{ color: '#333333' }}>
-                                {item.name}
+                                {item.label}
                               </span>
                               {' | '}
                               <span style={{ color: 'orange' }}>新增商品</span>
@@ -1016,7 +998,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                         </span>
                       </>
                     }
-                    placeholder="未输入商品名称"
+                    placeholder="商品编码"
                   />,
                   // <ProFormSelect
                   //   key="inv_stock"
@@ -1033,7 +1015,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     label="商品参数"
                     placeholder="请输入商品参数"
                     rules={[{ required: true, message: '商品参数必填' }]}
-                    disabled
+                    disabled={
+                      productParametersDisabledFlagList[listMeta.index] !==
+                      false
+                    }
                   />,
                   <ProFormDigit
                     key={'quantity' + listMeta.index}
@@ -1071,6 +1056,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     name="unitId"
                     width="lg"
                     label="单位"
+                    showSearch
+                    onChange={(_, option) => {
+                      autoFillUnit(option, listMeta.index);
+                    }}
                     options={productUnitOptionsList[listMeta.index]}
                     rules={[{ required: true, message: '商品单位必填' }]}
                   />,
@@ -720,6 +720,58 @@ export interface MaterialStockRow {
   invStockPosition?: string;
 }
+export interface MaterialUnitListRes {
+  count?: string;
+  /** @format int32 */
+  currentPage?: number;
+  /** @format int32 */
+  currentPageSize?: number;
+  /** @format int32 */
+  page?: number;
+  /** @format int32 */
+  pageSize?: number;
+  rows?: Array<MaterialUnitListResRow>;
+  /** @format int32 */
+  totalPage?: number;
+}
+
+export interface MaterialUnitListResRow {
+  /** @format double */
+  coefficient?: number;
+  conversionUnitId?: string;
+  conversionUnitName?: string;
+  id?: string;
+  /** @format int32 */
+  index?: number;
+  isDefault?: boolean;
+  isFloat?: boolean;
+  materialId?: string;
+  unitId?: string;
+  unitName?: string;
+}
+
+export interface MeasureUnitListRes {
+  count?: string;
+  /** @format int32 */
+  currentPage?: number;
+  /** @format int32 */
+  currentPageSize?: number;
+  /** @format int32 */
+  page?: number;
+  /** @format int32 */
+  pageSize?: number;
+  rows?: Array<MeasureUnitListResRow>;
+  /** @format int32 */
+  totalPage?: number;
+}
+
+export interface MeasureUnitListResRow {
+  id?: string;
+  name?: string;
+  number?: string;
+  precision?: string;
+}
+
 export interface ModelAndView {
   empty?: boolean;
   model?: any;
@@ -1298,6 +1350,29 @@ export interface Unit {
   unitidName?: string;
 }
+export interface UnitMaterialUnitListReq {
+  createEndTime?: string;
+  createStartTime?: string;
+  materialId?: Array<string>;
+  modifyEndTime?: string;
+  modifyStartTime?: string;
+  page?: string;
+  pageSize?: string;
+  search?: string;
+  unPage?: string;
+}
+
+export interface UnitMeasureUnitListReq {
+  createEndTime?: string;
+  createStartTime?: string;
+  enable?: string;
+  modifyEndTime?: string;
+  modifyStartTime?: string;
+  page?: string;
+  pageSize?: string;
+  search?: string;
+}
+
 export interface UpdateHirePurchaseDto {
   /**
    * @description
@@ -36,6 +36,8 @@ import type {
   MaterialListReply,
   MaterialMaterialListReq,
   MaterialStockRes,
+  MaterialUnitListRes,
+  MeasureUnitListRes,
   ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
@@ -62,6 +64,8 @@ import type {
   ServerResult,
   SysLogQueryVO,
   SystemCustomFieldReq,
+  UnitMaterialUnitListReq,
+  UnitMeasureUnitListReq,
   UpdateHirePurchaseDto,
   UpdatePwdVO,
 } from './definition';
@@ -983,6 +987,148 @@ export const postKingdeeRepMaterialStock = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postKingdeeRepMaterialUnit */
+export interface PostKingdeeRepMaterialUnitOption {
+  /**
+   * @description
+   *   req
+   */
+  body: {
+    /**
+        @description
+          req */
+    req: UnitMaterialUnitListReq;
+  };
+}
+
+/** @description response type for postKingdeeRepMaterialUnit */
+export interface PostKingdeeRepMaterialUnitResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: MaterialUnitListRes;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostKingdeeRepMaterialUnitResponseSuccess =
+  PostKingdeeRepMaterialUnitResponse[200];
+/**
+ * @description
+ *   getMaterialDetail
+ * @tags kingdee-erp-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postKingdeeRepMaterialUnit = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/kingdee/rep/materialUnit';
+  function request(
+    option: PostKingdeeRepMaterialUnitOption,
+  ): Promise<PostKingdeeRepMaterialUnitResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostKingdeeRepMaterialUnitResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postKingdeeRepMeasureUnit */
+export interface PostKingdeeRepMeasureUnitOption {
+  /**
+   * @description
+   *   req
+   */
+  body: {
+    /**
+        @description
+          req */
+    req: UnitMeasureUnitListReq;
+  };
+}
+
+/** @description response type for postKingdeeRepMeasureUnit */
+export interface PostKingdeeRepMeasureUnitResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: MeasureUnitListRes;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostKingdeeRepMeasureUnitResponseSuccess =
+  PostKingdeeRepMeasureUnitResponse[200];
+/**
+ * @description
+ *   getCustomerDetail
+ * @tags kingdee-erp-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postKingdeeRepMeasureUnit = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/kingdee/rep/measureUnit';
+  function request(
+    option: PostKingdeeRepMeasureUnitOption,
+  ): Promise<PostKingdeeRepMeasureUnitResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostKingdeeRepMeasureUnitResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postKingdeeRepSystemCustomField */
 export interface PostKingdeeRepSystemCustomFieldOption {
   /**