Merge remote-tracking branch 'origin/master'

src/api/qms/qcUnqualifiedReview/types.ts

@@ -334,6 +334,26 @@ export interface QcUnqualifiedReviewQuery extends PageQuery {
      * 日期范围参数
      */
     params?: any;
+
+  /**
+   * 处置类型
+   */
+  dispositionType?: string | number;
+
+  /**
+   * 流程状态
+   */
+  processStatus?: string;
+}
+
+/**
+ * 完成审批任务请求接口
+ */
+export interface CompleteTaskRequest {
+  reviewId: string | number;
+  taskId: string | number;
+  approved: boolean;
+  comment: string;
 }
 
 

src/api/wms/baseLocation/types.ts

@@ -4,10 +4,14 @@ export interface BaseLocationVO {
    */
   locationId: string | number;
 
+  // /**
+  //  * 所属仓库区域
+  //  */
+  // areaId: string | number;
   /**
-   * 所属仓库
+   * 所属仓库区域
    */
-  warehouseId: string | number;
+  areaId: string | number;
 
   /**
    * 库位编码
@@ -39,6 +43,16 @@ export interface BaseLocationVO {
    */
   updateTime: string;
 
+  /**
+   * 区域编码
+   */
+  areaCode: string;
+
+  /**
+   * 区域名称
+   */
+  areaName: string;
+
 }
 
 export interface BaseLocationForm extends BaseEntity {
@@ -46,10 +60,15 @@ export interface BaseLocationForm extends BaseEntity {
    * 表主键
    */
   locationId?: string | number;
+
+  // /**
+  //  * 所属仓库
+  //  */
+  // warehouseId?: string | number;
   /**
-   * 所属仓库
+   * 所属仓库区域
    */
-  warehouseId?: string | number;
+  areaId?: string | number;
 
   /**
    * 库位编码
@@ -75,10 +94,14 @@ export interface BaseLocationForm extends BaseEntity {
 
 export interface BaseLocationQuery extends PageQuery {
 
+  // /**
+  //  * 所属仓库
+  //  */
+  // warehouseId?: string | number;
   /**
-   * 所属仓库
+   * 所属仓库区域
    */
-  warehouseId?: string | number;
+  areaId?: string | number;
 
   /**
    * 库位编码
@@ -99,6 +122,7 @@ export interface BaseLocationQuery extends PageQuery {
      * 日期范围参数
      */
     params?: any;
+
 }
 
 

src/api/wms/instockDetail/types.ts

@@ -70,6 +70,18 @@ export interface InstockDetailVO {
 
   materialCategoryName?: string;
 
+
+  /**
+   * 是否质检
+   */
+  isInspection: string;
+
+  /**
+   * 分包数量
+   */
+  apportionQty: number;
+
+
 }
 
 export interface InstockDetailForm extends BaseEntity {
@@ -140,6 +152,16 @@ export interface InstockDetailForm extends BaseEntity {
 
   materialCategoryName?: string;
 
+  /**
+   * 是否质检
+   */
+  isInspection?: string;
+
+  /**
+   * 分包数量
+   */
+  apportionQty?: number;
+
 }
 
 export interface InstockDetailQuery extends PageQuery {
@@ -211,6 +233,16 @@ export interface InstockDetailQuery extends PageQuery {
 
   materialCategoryName?: string;
 
+  /**
+   * 是否质检
+   */
+  isInspection?: string;
+
+  /**
+   * 分包数量
+   */
+  apportionQty?: number;
+
     /**
      * 日期范围参数
      */

src/api/wms/instockOrder/types.ts

@@ -51,6 +51,11 @@ export interface InstockOrderVO {
    */
   warehouseId: string | number;
 
+  /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+  instockMethond: string;
+
 }
 
 export interface InstockOrderForm extends BaseEntity {
@@ -106,6 +111,11 @@ export interface InstockOrderForm extends BaseEntity {
    */
   warehouseId?: string | number;
 
+    /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+    instockMethond?: string;
+
 }
 
 export interface InstockOrderQuery extends PageQuery {
@@ -162,6 +172,11 @@ export interface InstockOrderQuery extends PageQuery {
    */
   warehouseId?: string | number;
 
+  /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+  instockMethond?: string;
+
     /**
      * 日期范围参数
      */

src/api/wms/orderInfo/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { OrderInfoVO, OrderInfoForm, OrderInfoQuery } from '@/api/wms/orderInfo/types';
+
+/**
+ * 查询生产订单信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listOrderInfo = (query?: OrderInfoQuery): AxiosPromise<OrderInfoVO[]> => {
+  return request({
+    url: '/wms/orderInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询生产订单信息详细
+ * @param productOrderId
+ */
+export const getOrderInfo = (productOrderId: string | number): AxiosPromise<OrderInfoVO> => {
+  return request({
+    url: '/wms/orderInfo/' + productOrderId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增生产订单信息
+ * @param data
+ */
+export const addOrderInfo = (data: OrderInfoForm) => {
+  return request({
+    url: '/wms/orderInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改生产订单信息
+ * @param data
+ */
+export const updateOrderInfo = (data: OrderInfoForm) => {
+  return request({
+    url: '/wms/orderInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除生产订单信息
+ * @param productOrderId
+ */
+export const delOrderInfo = (productOrderId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/orderInfo/' + productOrderId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询生产订单信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getProdOrderInfoList(query) {
+  return request({
+    url: '/wms/orderInfo/getProdOrderInfoList',
+    method: 'get',
+    params: query
+  });
+};

src/api/wms/orderInfo/types.ts

@@ -0,0 +1,431 @@
+export interface OrderInfoVO {
+  /**
+   * 主键标识
+   */
+  productOrderId: string | number;
+
+  /**
+   * 订单编号
+   */
+  orderCode: string;
+
+  /**
+   * 销售订单ID
+   */
+  saleOrderId: string | number;
+
+  /**
+   * 项目编号
+   */
+  projectNo: string;
+
+  /**
+   * 订单类型（1外部销售 2对内生产)
+   */
+  orderType: string;
+
+  /**
+   * 物料ID
+   */
+  materialId: string | number;
+
+  /**
+   * 物料BOM_ID;默认选择最新的正常状态的bom，可修改
+   */
+  materialBomId: string | number;
+
+  /**
+   * 派工类型(1产线 2工艺路线 3工序)
+   */
+  dispatchType: string;
+
+  /**
+   * 派工ID;（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键）
+   */
+  dispatchId: string | number;
+
+  /**
+   * 销售数量;销售订单的销售数量，如果无订单则需要输入
+   */
+  saleAmount: number;
+
+  /**
+   * 计划交货日期
+   */
+  planDeliveryDate: string;
+
+  /**
+   * 计划数量
+   */
+  planAmount: number;
+
+  /**
+   * 已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的
+   */
+  dispatchAmount: number;
+
+  /**
+   * 完成数量
+   */
+  completeAmount: number;
+
+  /**
+   * 发布时间
+   */
+  releaseTime: string;
+
+  /**
+   * 计划开始时间
+   */
+  planBeginTime: string;
+
+  /**
+   * 计划结束时间
+   */
+  planEndTime: string;
+
+  /**
+   * 开始时间
+   */
+  realBeginTime: string;
+
+  /**
+   * 完成时间
+   */
+  realEndTime: string;
+
+  /**
+   * 订单状态（0待发布 1已发布 2已完成 3已开始 4暂停 8已撤回 9已删除）
+   */
+  orderStatus: string;
+
+  /**
+   * 库存锁定标识（1是 0否）
+   */
+  stockLockFlag: string;
+
+  /**
+   * 前置生产订单ID
+   */
+  preOrderId: string | number;
+
+  /**
+   * 前置订单编号
+   */
+  preOrderCode: string;
+
+  /**
+   * 完成标识（0正常 1降级 2超额）
+   */
+  finishFlag: string;
+
+  /**
+   * 是否已下达工单（1是 0否）
+   */
+  releaseFlag: string;
+
+  /**
+   * 订单版本
+   */
+  orderVersion: string;
+
+  /**
+   * 工厂ID
+   */
+  factoryId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface OrderInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  productOrderId?: string | number;
+
+  /**
+   * 订单编号
+   */
+  orderCode?: string;
+
+  /**
+   * 销售订单ID
+   */
+  saleOrderId?: string | number;
+
+  /**
+   * 项目编号
+   */
+  projectNo?: string;
+
+  /**
+   * 订单类型（1外部销售 2对内生产)
+   */
+  orderType?: string;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 物料BOM_ID;默认选择最新的正常状态的bom，可修改
+   */
+  materialBomId?: string | number;
+
+  /**
+   * 派工类型(1产线 2工艺路线 3工序)
+   */
+  dispatchType?: string;
+
+  /**
+   * 派工ID;（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键）
+   */
+  dispatchId?: string | number;
+
+  /**
+   * 销售数量;销售订单的销售数量，如果无订单则需要输入
+   */
+  saleAmount?: number;
+
+  /**
+   * 计划交货日期
+   */
+  planDeliveryDate?: string;
+
+  /**
+   * 计划数量
+   */
+  planAmount?: number;
+
+  /**
+   * 已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的
+   */
+  dispatchAmount?: number;
+
+  /**
+   * 完成数量
+   */
+  completeAmount?: number;
+
+  /**
+   * 发布时间
+   */
+  releaseTime?: string;
+
+  /**
+   * 计划开始时间
+   */
+  planBeginTime?: string;
+
+  /**
+   * 计划结束时间
+   */
+  planEndTime?: string;
+
+  /**
+   * 开始时间
+   */
+  realBeginTime?: string;
+
+  /**
+   * 完成时间
+   */
+  realEndTime?: string;
+
+  /**
+   * 订单状态（0待发布 1已发布 2已完成 3已开始 4暂停 8已撤回 9已删除）
+   */
+  orderStatus?: string;
+
+  /**
+   * 库存锁定标识（1是 0否）
+   */
+  stockLockFlag?: string;
+
+  /**
+   * 前置生产订单ID
+   */
+  preOrderId?: string | number;
+
+  /**
+   * 前置订单编号
+   */
+  preOrderCode?: string;
+
+  /**
+   * 完成标识（0正常 1降级 2超额）
+   */
+  finishFlag?: string;
+
+  /**
+   * 是否已下达工单（1是 0否）
+   */
+  releaseFlag?: string;
+
+  /**
+   * 订单版本
+   */
+  orderVersion?: string;
+
+  /**
+   * 工厂ID
+   */
+  factoryId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface OrderInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  productOrderId?: string | number;
+
+  /**
+   * 订单编号
+   */
+  orderCode?: string;
+
+  /**
+   * 销售订单ID
+   */
+  saleOrderId?: string | number;
+
+  /**
+   * 项目编号
+   */
+  projectNo?: string;
+
+  /**
+   * 订单类型（1外部销售 2对内生产)
+   */
+  orderType?: string;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 物料BOM_ID;默认选择最新的正常状态的bom，可修改
+   */
+  materialBomId?: string | number;
+
+  /**
+   * 派工类型(1产线 2工艺路线 3工序)
+   */
+  dispatchType?: string;
+
+  /**
+   * 派工ID;（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键）
+   */
+  dispatchId?: string | number;
+
+  /**
+   * 销售数量;销售订单的销售数量，如果无订单则需要输入
+   */
+  saleAmount?: number;
+
+  /**
+   * 计划交货日期
+   */
+  planDeliveryDate?: string;
+
+  /**
+   * 计划数量
+   */
+  planAmount?: number;
+
+  /**
+   * 已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的
+   */
+  dispatchAmount?: number;
+
+  /**
+   * 完成数量
+   */
+  completeAmount?: number;
+
+  /**
+   * 发布时间
+   */
+  releaseTime?: string;
+
+  /**
+   * 计划开始时间
+   */
+  planBeginTime?: string;
+
+  /**
+   * 计划结束时间
+   */
+  planEndTime?: string;
+
+  /**
+   * 开始时间
+   */
+  realBeginTime?: string;
+
+  /**
+   * 完成时间
+   */
+  realEndTime?: string;
+
+  /**
+   * 订单状态（0待发布 1已发布 2已完成 3已开始 4暂停 8已撤回 9已删除）
+   */
+  orderStatus?: string;
+
+  /**
+   * 库存锁定标识（1是 0否）
+   */
+  stockLockFlag?: string;
+
+  /**
+   * 前置生产订单ID
+   */
+  preOrderId?: string | number;
+
+  /**
+   * 前置订单编号
+   */
+  preOrderCode?: string;
+
+  /**
+   * 完成标识（0正常 1降级 2超额）
+   */
+  finishFlag?: string;
+
+  /**
+   * 是否已下达工单（1是 0否）
+   */
+  releaseFlag?: string;
+
+  /**
+   * 订单版本
+   */
+  orderVersion?: string;
+
+  /**
+   * 工厂ID
+   */
+  factoryId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

src/api/wms/wmsBaseArea/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { WmsBaseAreaVO, WmsBaseAreaForm, WmsBaseAreaQuery } from '@/api/wms/wmsBaseArea/types';
+
+/**
+ * 查询区域基础信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listWmsBaseArea = (query?: WmsBaseAreaQuery): AxiosPromise<WmsBaseAreaVO[]> => {
+  return request({
+    url: '/wms/wmsBaseArea/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询区域基础信息详细
+ * @param areaId
+ */
+export const getWmsBaseArea = (areaId: string | number): AxiosPromise<WmsBaseAreaVO> => {
+  return request({
+    url: '/wms/wmsBaseArea/' + areaId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增区域基础信息
+ * @param data
+ */
+export const addWmsBaseArea = (data: WmsBaseAreaForm) => {
+  return request({
+    url: '/wms/wmsBaseArea',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改区域基础信息
+ * @param data
+ */
+export const updateWmsBaseArea = (data: WmsBaseAreaForm) => {
+  return request({
+    url: '/wms/wmsBaseArea',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除区域基础信息
+ * @param areaId
+ */
+export const delWmsBaseArea = (areaId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/wmsBaseArea/' + areaId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询区域基础信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getWmsBaseAreaList (query) {
+    return request({
+        url: '/wms/wmsBaseArea/getWmsBaseAreaList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/wmsBaseArea/types.ts

@@ -0,0 +1,161 @@
+export interface WmsBaseAreaVO {
+  /**
+   * 区域ID
+   */
+  areaId: string | number;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId: string | number;
+
+  /**
+   * 区域编码
+   */
+  areaCode: string;
+
+  /**
+   * 区域名称
+   */
+  areaName: string;
+
+  /**
+   * 区域类型（1存储区 2拣货区 3暂存区 4不合格品区）
+   */
+  areaType: string;
+
+  /**
+   * 区域负责人
+   */
+  areaManager: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 仓库编码
+   */
+  warehouseCode: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName: string;
+
+}
+
+export interface WmsBaseAreaForm extends BaseEntity {
+  /**
+   * 区域ID
+   */
+  areaId?: string | number;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 区域编码
+   */
+  areaCode?: string;
+
+  /**
+   * 区域名称
+   */
+  areaName?: string;
+
+  /**
+   * 区域类型（1存储区 2拣货区 3暂存区 4不合格品区）
+   */
+  areaType?: string;
+
+  /**
+   * 区域负责人
+   */
+  areaManager?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+    /**
+   * 仓库编码
+   */
+    warehouseCode?: string;
+
+    /**
+     * 仓库名称
+     */
+    warehouseName?: string;
+
+}
+
+export interface WmsBaseAreaQuery extends PageQuery {
+
+  /**
+   * 区域ID
+   */
+  areaId?: string | number;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 区域编码
+   */
+  areaCode?: string;
+
+  /**
+   * 区域名称
+   */
+  areaName?: string;
+
+  /**
+   * 区域类型（1存储区 2拣货区 3暂存区 4不合格品区）
+   */
+  areaType?: string;
+
+  /**
+   * 区域负责人
+   */
+  areaManager?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+      /**
+   * 仓库编码
+   */
+      warehouseCode?: string;
+
+      /**
+       * 仓库名称
+       */
+      warehouseName?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/router/index.ts

@@ -213,6 +213,19 @@ export const constantRoutes: RouteRecordRaw[] = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
+  },
+  {
+    path: '/qms/qcUnqualifiedApproval',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'approval',
+        component: () => import('@/views/qms/qcUnqualifiedApproval/approval.vue'),
+        name: 'qcUnqualifiedApproval',
+        meta: { title: '不合格品主管审批', activeMenu: '/qms/qcUnqualifiedApproval', noCache: true }
+      }
+    ]
   }
 ];
 
@@ -489,8 +502,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         meta: { title: '保养工单申请', activeMenu: '/dms/maint/maintEdit', noCache: true }
       }
     ]
-  },
-
+  }
 
 ];
 

src/views/mes/baseMaterialInfo/addMaterialInWMS.vue

@@ -43,7 +43,7 @@
         <el-table-column label="旧物料编码" align="center" prop="oldMaterialCode" v-if="columns[2].visible" width="100"/>
         <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="150"/>
         <el-table-column label="物料类型ID" align="center" prop="materialTypeId" v-if="columns[4].visible"/>
-        <el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[5].visible">
+        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[5].visible">
 
         </el-table-column>
         <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[6].visible"/>
@@ -212,7 +212,7 @@ const columns = ref<FieldOption[]>([
   { key: 3, label: `物料名称`, visible: true },
   { key: 4, label: `物料类型ID`, visible: false },
   { key: 5, label: `物料大类`, visible: true },
-  { key: 6, label: `物料小类`, visible: true },
+  { key: 6, label: `物料小类`, visible: false },
   { key: 7, label: `批次标识`, visible: false },
   { key: 8, label: `小批次数量`, visible: false },
   { key: 9, label: `计量单位ID`, visible: false },
@@ -239,12 +239,12 @@ const columns = ref<FieldOption[]>([
   { key: 30, label: `自动出库标识`, visible: false },
   { key: 31, label: `辅料标识`, visible: false },
   { key: 32, label: `低值易耗品标识`, visible: false },
-  { key: 33, label: `品牌`, visible: true },
-  { key: 34, label: `层级`, visible: true },
-  { key: 35, label: `花纹`, visible: true },
-  { key: 36, label: `速度级别`, visible: true },
-  { key: 37, label: `负荷载重`, visible: true },
-  { key: 38, label: `轮胎标记`, visible: true },
+  { key: 33, label: `品牌`, visible: false },
+  { key: 34, label: `层级`, visible: false },
+  { key: 35, label: `花纹`, visible: false },
+  { key: 36, label: `速度级别`, visible: false },
+  { key: 37, label: `负荷载重`, visible: false },
+  { key: 38, label: `轮胎标记`, visible: false },
   { key: 39, label: `最小停放时间`, visible: false },
   { key: 40, label: `最大停放时间`, visible: false },
   { key: 41, label: `标准重量`, visible: false },

src/views/qms/qcUnqualifiedApproval/approval.vue

@@ -0,0 +1,299 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never" class="mb-[10px]">
+      <div style="display: flex; justify-content: space-between">
+        <div>
+          <el-button type="primary" @click="handleApprovalRecord">流程进度</el-button>
+        </div>
+        <div>
+          <el-button @click="goBack()">返回</el-button>
+        </div>
+      </div>
+    </el-card>
+
+    <el-card shadow="never" class="mb-[10px]">
+      <h4>不合格品主表信息</h4>
+      <el-form :model="approvalForm" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="不合格检测单号">
+              <el-input v-model="approvalForm.unqualifiedReviewNo" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质检单号">
+              <el-input v-model="approvalForm.inspectionNo" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="检测类型">
+              <el-input v-model="approvalForm.typeName" readonly />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="生产日期">
+              <el-input :value="parseTime(approvalForm.productionDate, '{y}-{m}-{d}')" readonly />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="派工单号">
+              <el-input v-model="approvalForm.workOrderNo" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工序名称">
+              <el-input v-model="approvalForm.processName" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="物料名称">
+              <el-input v-model="approvalForm.materialName" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料编码">
+              <el-input v-model="approvalForm.materialCode" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- <el-col :span="12">
+            <el-form-item label="物料规格">
+              <el-input v-model="approvalForm.materialSpec" readonly />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="供应商名称">
+              <el-input v-model="approvalForm.supplierName" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="供应商编码">
+              <el-input v-model="approvalForm.supplierCode" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质检数量">
+              <el-input v-model="approvalForm.inspectionQty" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="批次号">
+              <el-input v-model="approvalForm.batchNo" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="质检人">
+              <el-input v-model="approvalForm.inspector" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- <el-col :span="12">
+            <el-form-item label="评审人">
+              <el-input v-model="approvalForm.reviewer" readonly />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="评审开始时间">
+              <el-input :value="parseTime(approvalForm.reviewStartTime, '{y}-{m}-{d} {h}:{i}:{s}')" readonly />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="评审结束时间">
+              <el-input :value="parseTime(approvalForm.reviewEndTime, '{y}-{m}-{d} {h}:{i}:{s}')" readonly />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-form-item label="处置类型">
+          <el-tag :type="getDispositionTypeTag(approvalForm.reviewResult)">
+            {{ getDispositionTypeName(approvalForm.reviewResult) }}
+          </el-tag>
+        </el-form-item>
+        <!-- <el-form-item label="备注">
+          <el-input v-model="approvalForm.remark" type="textarea" :rows="3" readonly />
+        </el-form-item> -->
+        <!-- <el-form-item label="审批意见" prop="comment">
+          <el-input
+            v-model="approvalForm.comment"
+            type="textarea"
+            :rows="4"
+            placeholder="请输入审批意见"
+            :maxlength="500"
+            show-word-limit
+          />
+        </el-form-item> -->
+      </el-form>
+    </el-card>
+
+    <el-card shadow="never" class="mt-4">
+      <h4>不合格品子表明细</h4>
+      <el-table v-loading="detailLoading" :data="detailRecordList" border>
+        <el-table-column type="index" label="序号" width="55" align="center"/>
+        <el-table-column label="检测项编码" align="center" prop="itemCode" />
+        <el-table-column label="检测名称" align="center" prop="itemName" />
+        <el-table-column label="检测位置" align="center" prop="inspectionPosition" />
+        <el-table-column label="检测方法" align="center" prop="inspectionMethod">
+          <template #default="scope">
+            <dict-tag :options="qc_methond" :value="scope.row.inspectionMethod" />
+          </template>
+        </el-table-column>
+        <el-table-column label="检测方式" align="center" prop="detectType">
+          <template #default="scope">
+            <dict-tag :options="detect_type" :value="scope.row.detectType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="检测结果" align="center" prop="detectResult">
+          <template #default="scope">
+            <dict-tag :options="qc_result" :value="scope.row.detectResult"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="检测值" align="center" prop="detectValue" />
+        <el-table-column label="控制上限" align="center" prop="upperLimit" />
+        <el-table-column label="控制下限" align="center" prop="lowerLimit" />
+        <el-table-column label="规格检测值" align="center" prop="specInspectionValue" />
+        <el-table-column label="规格上限" align="center" prop="specUpper" />
+        <el-table-column label="规格下限" align="center" prop="specLower" />
+        <el-table-column label="检查项说明" align="center" prop="description" :show-overflow-tooltip="true"/>
+      </el-table>
+      <pagination v-show="detailTotal > 0" :total="detailTotal" v-model:page="detailQueryParams.pageNum" v-model:limit="detailQueryParams.pageSize" @pagination="getDetailList" />
+    </el-card>
+
+    <el-card shadow="never" class="mt-4">
+      <div class="dialog-footer text-center">
+        <el-button type="primary" :loading="approvalButtonLoading" @click="handleApprove">审批通过</el-button>
+      </div>
+    </el-card>
+
+    <!-- 审批记录组件 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script setup name="QcUnqualifiedApproval" lang="ts">
+import { ref, reactive, onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { getQcUnqualifiedReview, completeTask } from '@/api/qms/qcUnqualifiedReview';
+import { listQcUnqualifiedRecord } from '@/api/qms/qcUnqualifiedRecord';
+import { QcUnqualifiedReviewVO } from '@/api/qms/qcUnqualifiedReview/types';
+import { QcUnqualifiedRecordVO, QcUnqualifiedRecordQuery } from '@/api/qms/qcUnqualifiedRecord/types';
+import { parseTime } from '@/utils/ruoyi';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import { getCurrentInstance, toRefs } from 'vue';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { review_result, qc_methond, detect_type, qc_result } = toRefs<any>(proxy?.useDict('review_result', 'qc_methond', 'detect_type', 'qc_result'));
+
+const router = useRouter();
+const route = useRoute();
+const approvalForm = ref<QcUnqualifiedReviewVO>({} as QcUnqualifiedReviewVO);
+const detailRecordList = ref<QcUnqualifiedRecordVO[]>([]);
+const detailLoading = ref(false);
+const detailTotal = ref(0);
+const approvalButtonLoading = ref(false);
+
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+const detailQueryParams = ref<QcUnqualifiedRecordQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  reviewId: undefined
+});
+
+// 加载数据
+const loadData = async () => {
+  const businessId = route.query.id as string;
+  const taskId = route.query.taskId as string;
+  if (!businessId || !taskId) {
+    proxy?.$modal.msgError('缺少参数');
+    return;
+  }
+
+  try {
+    const res = await getQcUnqualifiedReview(businessId);
+    approvalForm.value = { ...res.data, taskId, comment: '' };
+
+    detailQueryParams.value.reviewId = businessId;
+    await getDetailList();
+  } catch (error) {
+    proxy?.$modal.msgError('加载数据失败');
+  }
+};
+
+const getDetailList = async () => {
+  detailLoading.value = true;
+  try {
+    const res = await listQcUnqualifiedRecord(detailQueryParams.value);
+    detailRecordList.value = res.rows;
+    detailTotal.value = res.total;
+  } catch (error) {
+    proxy?.$modal.msgError('加载子表明细失败');
+  } finally {
+    detailLoading.value = false;
+  }
+};
+
+/** 审批通过 */
+const handleApprove = async () => {
+  // if (!approvalForm.value.comment || approvalForm.value.comment.length < 5) {
+  //   proxy?.$modal.msgError('审批意见至少5个字符');
+  //   return;
+  // }
+
+  approvalButtonLoading.value = true;
+  try {
+    console.log(approvalForm.value);
+    const reviewIdValue = approvalForm.value.reviewId; 
+    await completeTask({
+     reviewId: reviewIdValue
+    });
+    proxy?.$modal.msgSuccess('审批通过');
+    goBack();
+  } catch (error) {
+    proxy?.$modal.msgError('审批失败');
+  } finally {
+    approvalButtonLoading.value = false;
+  }
+};
+
+/** 查看流程记录 */
+const handleApprovalRecord = () => {
+  approvalRecordRef.value?.init(approvalForm.value.reviewId);
+};
+
+const getDispositionTypeName = (value: string | undefined) => {
+  return review_result.value.find(item => item.value === value)?.label || '未知';
+};
+
+const getDispositionTypeTag = (value: string | undefined) => {
+  // 自定义tag样式
+  const tagMap = {
+    '0': 'danger',
+    '1': 'warning',
+    '2': 'info',
+    '3': 'success',
+    '4': 'primary'
+  };
+  return tagMap[value || ''] || '';
+};
+
+const goBack = () => {
+  router.go(-1);
+};
+
+onMounted(() => {
+  loadData();
+});
+</script>

src/views/wms/baseLocation/index.vue

@@ -4,25 +4,25 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="所属仓库" prop="warehouseId">
-              <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库" clearable >
+            <el-form-item label="所属仓库区域" prop="areaId"   label-width="120px" >
+              <el-select v-model="queryParams.areaId" placeholder="请选择所属仓库区域" clearable >
                 <el-option
-                  v-for="item in baseStoreList"
-                  :key="item.warehouseId"
-                  :label="item.warehouseName"
-                  :value="item.warehouseId"
+                  v-for="item in areaList"
+                  :key="item.areaId"
+                  :label="item.areaName"
+                  :value="item.areaId"
                 ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="库位编码" prop="locationCode">
               <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="排" prop="lineNum">
+<!--            <el-form-item label="排" prop="lineNum">
               <el-input v-model="queryParams.lineNum" placeholder="请输入排" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="层" prop="layerNum">
               <el-input v-model="queryParams.layerNum" placeholder="请输入层" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -54,8 +54,8 @@
       <el-table v-loading="loading" :data="baseLocationList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="表主键" align="center" prop="locationId" v-if="columns[0].visible"/>
-        <el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[1].visible"/>
-        <el-table-column label="仓库编码" align="center" prop="warehouseCode" v-if="columns[1].visible"/>
+        <el-table-column label="所属仓库区域" align="center" prop="areaName" v-if="columns[1].visible"/>
+        <el-table-column label="区域编码" align="center" prop="areaCode" v-if="columns[1].visible"/>
         <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[2].visible"/>
         <el-table-column label="排" align="center" prop="lineNum" v-if="columns[3].visible"/>
         <el-table-column label="层" align="center" prop="layerNum" v-if="columns[4].visible"/>
@@ -84,32 +84,33 @@
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
+
     <!-- 添加或修改库位基础信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="baseLocationFormRef" :model="form" :rules="rules" label-width="80px">
 <!--        <el-form-item label="表主键" prop="locationId">-->
 <!--          <el-input v-model="form.locationId" placeholder="请输入表主键" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="所属仓库" prop="warehouseId">
-          <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
+        <el-form-item label="所属仓库区域" prop="areaId" label-width="120px">
+          <el-select v-model="form.areaId" placeholder="请选择所属仓库区域">
             <el-option
-              v-for="item in baseStoreList"
-              :key="item.warehouseId"
-              :label="item.warehouseName"
-              :value="item.warehouseId"
+              v-for="item in areaList"
+              :key="item.areaId"
+              :label="item.areaName"
+              :value="item.areaId"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="库位编码" prop="locationCode">
+        <el-form-item label="库位编码" prop="locationCode"  label-width="120px" >
           <el-input v-model="form.locationCode" placeholder="请输入库位编码" />
         </el-form-item>
-        <el-form-item label="排" prop="lineNum">
+        <el-form-item label="排" prop="lineNum"  label-width="120px" >
           <el-input v-model="form.lineNum" placeholder="请输入排" />
         </el-form-item>
-        <el-form-item label="层" prop="layerNum">
+        <el-form-item label="层" prop="layerNum"  label-width="120px" >
           <el-input v-model="form.layerNum" placeholder="请输入层" />
         </el-form-item>
-        <el-form-item label="位" prop="locationNum">
+        <el-form-item label="位" prop="locationNum"  label-width="120px" >
           <el-input v-model="form.locationNum" placeholder="请输入位" />
         </el-form-item>
       </el-form>
@@ -128,6 +129,7 @@ import { listBaseLocation, getBaseLocation, delBaseLocation, addBaseLocation, up
 import { BaseLocationVO, BaseLocationQuery, BaseLocationForm } from '@/api/wms/baseLocation/types';
 import {getWorkshopList} from "@/api/mes/baseWorkshopInfo";
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
+import { getWmsBaseAreaList } from '@/api/wms/wmsBaseArea';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -147,16 +149,12 @@ const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
-let baseStoreList = ref([]);
-/** 查询车间下拉树结构 */
-const getBaseWarehouseListsss = async () => {
-  let res = await getBaseWarehouseList(null);
-  baseStoreList.value = res.data;
-};
+
+
 // 列显隐信息
 const columns = ref<FieldOption[]>([
   { key: 0, label: `表主键`, visible: false },
-  { key: 1, label: `所属仓库`, visible: true },
+  { key: 1, label: `所属仓库区域`, visible: true },
   { key: 2, label: `库位编码`, visible: true },
   { key: 3, label: `排`, visible: true },
   { key: 4, label: `层`, visible: true },
@@ -171,18 +169,20 @@ const columns = ref<FieldOption[]>([
 
 const initFormData: BaseLocationForm = {
   locationId: undefined,
-  warehouseId: undefined,
+  areaId: undefined,
   locationCode: undefined,
   lineNum: undefined,
   layerNum: undefined,
   locationNum: undefined,
+  areaName: undefined,
+  areaCode: undefined,
 }
 const data = reactive<PageData<BaseLocationForm, BaseLocationQuery>>({
   form: {...initFormData},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    warehouseId: undefined,
+    areaId: undefined,
     locationCode: undefined,
     lineNum: undefined,
     layerNum: undefined,
@@ -285,8 +285,24 @@ const handleExport = () => {
   }, `baseLocation_${new Date().getTime()}.xlsx`)
 }
 
+// let baseStoreList = ref([]);
+// /** 查询车间下拉树结构 */
+// const getBaseWarehouseListsss = async () => {
+//   let res = await getBaseWarehouseList(null);
+//   baseStoreList.value = res.data;
+// };
+
+/** 获取区域下拉列表 */
+let areaList = ref([]);
+const getAreaList = async () => {
+  let res = await getWmsBaseAreaList(null);
+  areaList.value = res.data;
+};
+
+
 onMounted(() => {
-  getBaseWarehouseListsss();
+  // getBaseWarehouseListsss();
+  getAreaList();
   getList();
 });
 </script>

src/views/wms/instockOrderCopy/index.vue

@@ -10,6 +10,11 @@
                 <el-option v-for="dict in wms_instock_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
+            <el-form-item label="入库方式" prop="instockMethond">
+              <el-select v-model="queryForm.instockMethond" placeholder="请选择入库方式" clearable >
+                <el-option v-for="dict in instock_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
             <el-form-item label="审核状态" prop="auditStatus">
               <el-select v-model="queryForm.auditStatus" placeholder="请选择审核状态" clearable >
                 <el-option v-for="dict in approve_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -67,6 +72,11 @@
             <dict-tag :options="wms_instock_type" :value="scope.row.instockType"/>
           </template>
         </el-table-column>
+        <el-table-column label="入库方式" align="center" prop="instockMethond">
+          <template #default="scope">
+            <dict-tag :options="instock_methond" :value="scope.row.instockMethond"/>
+          </template>
+        </el-table-column>
         <el-table-column label="订单编号" align="center" prop="orderNo"/>
         <el-table-column label="审核人" align="center" prop="auditBy"/>
         <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
@@ -116,6 +126,11 @@
         <el-table-column label="物料编码" align="center" prop="materialCode"/>
         <el-table-column label="物料名称" align="center" prop="materialName"/>
         <el-table-column label="入库数量" align="center" prop="instockQty"/>
+        <el-table-column label="质检标识" align="center" prop="isInspection">
+          <template #default="scope">
+            <dict-tag :options="wsm_is_inspection" :value="scope.row.isInspection"/>
+          </template>
+        </el-table-column>
         <el-table-column label="已分包数量" align="center" prop="printedNum" />
         <el-table-column label="物料规格" align="center" prop="materialSpe"/>
         <el-table-column label="计量单位名称" align="center" prop="unitName"/>
@@ -168,9 +183,22 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="订单编号" prop="orderNo">
-          <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
-        </el-form-item> -->
+        <el-form-item label="订单编号" prop="orderNo">
+          <el-input v-model="dialogForm.orderNo" placeholder="请输入订单编号" />
+        </el-form-item>
+        <el-form-item label="采购订单" v-if="state.showPurchaseOrderSelect">
+          <el-select v-model="state.selectedPurchaseOrder" placeholder="请选择采购订单" value-key="poId" style="width: 200px">
+            <el-option v-for="item in state.purchaseOrders" :key="item.poId" :label="item.poNo" :value="item" />
+          </el-select>
+          <el-button type="primary" @click="handleAssociatePurchaseOrder" style="margin-left: 10px" :disabled="!state.selectedPurchaseOrder">
+            关联
+          </el-button>
+        </el-form-item>
+        <el-form-item label="生产订单" v-if="state.showProductionOrderSelect">
+          <el-select v-model="state.selectedProductionOrder" placeholder="请选择生产订单" @change="handleProductionOrderSelect" value-key="productOrderId">
+            <el-option v-for="item in state.productionOrders" :key="item.productOrderId" :label="item.orderCode" :value="item" />
+          </el-select>
+        </el-form-item>
         <!-- <el-form-item label="审核人" prop="auditBy">
           <el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">
             <el-option
@@ -300,7 +328,18 @@
 
           <el-table-column label="入库数量" prop="instockQty">
             <template #default="scope">
-              <el-input v-model="scope.row.instockQty" placeholder="请输入入库数量" />
+              <el-input-number
+                v-if="scope.row._showQtyInput"
+                v-model.number="scope.row.instockQty"
+                :min="0"
+                :max="scope.row.deliveryQty"
+                :precision="0"
+                :controls="false"
+                placeholder="请输入入库数量"
+                @change="(val) => validateQty(scope.row, val)"
+                style="width: 100%"
+              />
+              <span v-else>{{ scope.row.instockQty }}</span>
             </template>
           </el-table-column>
           <el-table-column label="有无条码" prop="codeYesNo">
@@ -532,8 +571,8 @@
 
 <script setup name="Linkage" lang="ts">
 import { listInstockOrder, getInstockOrder, delInstockOrder, addInstockOrder, updateInstockOrder, approveInstockOrder } from '@/api/wms/instockOrder';
-import { InstockOrderVO, InstockOrderQuery, InstockOrderForm } from '@/api/wms/instockOrder/types';
-import {onMounted, reactive} from 'vue'
+import type { InstockOrderForm } from '@/api/wms/instockOrder/types';
+import {onMounted, reactive, watch} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 import {UserVO} from "@/api/system/user/types";
@@ -544,10 +583,14 @@ import {
   getMaterialList, getInstockMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
+import { getWmsPurchaseOrderDetailList } from '@/api/wms/wmsPurchaseOrderDetail';
+import { getProdOrderInfoList, listOrderInfo } from '@/api/wms/orderInfo';
+import { getWmsPurchaseOrderList } from '@/api/wms/wmsPurchaseOrder';
+
 const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 const {audit_behave,
   wms_barcode_if,
@@ -558,8 +601,10 @@ const {audit_behave,
   mes_material_categories,
   wms_allocate_status,
   wms_allocate_create,
-  wms_allocate_way
-} = toRefs<any>(proxy?.useDict('audit_behave', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way'));
+  wms_allocate_way,
+  instock_methond,
+  wsm_is_inspection
+} = toRefs<any>(proxy?.useDict('audit_behave', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way', 'instock_methond', 'wsm_is_inspection'));
 
 
 interface User {
@@ -576,7 +621,7 @@ const childrenTableInfoVisible = ref(false)
 // const childrenTableInfoSubmit = ref(false)
 const updateDialog = ref(false)
 const dialogTitle = ref('添加')
-const dialogForm = ref({})
+const dialogForm = ref<InstockOrderForm>({ instockType: '', orderNo: '', materialCategoryId: '', warehouseId: '' });
 const parentTableInfoForm = ref({})
 const parentTableApproveForm = ref({})
 const childrenTableInfoForm = ref({})
@@ -603,6 +648,16 @@ const childrenTableLoad = ref(false)
 const isView = ref(false)
 const partntTableSelectCell = ref({})
 
+const state = reactive({
+  showPurchaseOrderSelect: false,
+  showProductionOrderSelect: false,
+  purchaseOrders: [],
+  productionOrders: [],
+  selectedPurchaseOrder: null,
+  selectedProductionOrder: null,
+  isPurchaseOrderAssociated: false
+});
+
 // 获取仓库
 getBaseWarehouseList().then(e => {
   baseStoreList.value = e.data
@@ -708,10 +763,10 @@ const viewDetails = (e) => {
 
 // 父表格新增
 const parentTableAdd = () => {
-  dialogVisible.value = true
-  dialogForm.value = {}
-  dialogtable.value = []
-}
+  dialogVisible.value = true;
+  dialogForm.value = { instockType: '', orderNo: '', materialCategoryId: '', warehouseId: '' }; // Add more if needed
+  dialogtable.value = [];
+};
 
 // 父表格审批
 const parentTableApprove = async (e) => {
@@ -775,8 +830,15 @@ const setMaterialList = (materialCategoryId) => {
 }
 
 // 添加子表格行
+// const addDialogTableCell = () => {
+//   dialogtable.value.push({})
+// }
 const addDialogTableCell = () => {
-  dialogtable.value.push({})
+  dialogtable.value.push({
+    _showQtyInput: true,  // 确保新增行可以显示数量输入框
+    instockQty: 0,        // 初始化入库数量为0
+    codeYesNo: '0'        // 默认无条码
+  });
 }
 
 // 新增提交
@@ -928,6 +990,87 @@ const handleMaterialAdd = (type, index) => {
   materialOpen.value = true;
 }
 
+const loadPurchaseOrders = async () => {
+  // const res = await listWmsPurchaseOrder({ auditStatus: '1', pageNum: 1, pageSize: 99999 });
+  const res = await getWmsPurchaseOrderList(null)
+  state.purchaseOrders = res.data;
+};
+
+const loadProductionOrders = async () => {
+  // const res = await listOrderInfo({ orderStatus: '1', pageNum: 1, pageSize: 99999 });
+  const res = await getProdOrderInfoList(null)
+  state.productionOrders = res.data;
+};
+
+watch(() => dialogForm.value.instockType, async (newVal) => {
+  state.showPurchaseOrderSelect = (newVal === '1');
+  state.showProductionOrderSelect = (newVal === '2');
+
+  // Clear previous selections
+  state.selectedPurchaseOrder = null;
+  state.selectedProductionOrder = null;
+  dialogtable.value = [];
+
+  if (newVal === '1') {
+    await loadPurchaseOrders();
+  } else if (newVal === '2') {
+    await loadProductionOrders();
+  }
+});
+
+const handleAssociatePurchaseOrder = async () => {
+  if (!state.selectedPurchaseOrder) return;
+
+  const order = state.selectedPurchaseOrder;
+  dialogForm.value.orderNo = order.poNo;
+
+  const res = await getWmsPurchaseOrderDetailList({ poNo: order.poNo });
+  dialogtable.value = res.data.map(item => ({
+    materialId: item.materialId,
+    materialCode: item.materialCode,
+    materialName: item.materialName,
+    materialSpec: item.materialSpe,
+    materialUnit: item.unitName || '',
+    instockQty: 0, // 初始化为0，让用户手动输入
+    deliveryQty: item.deliveryQty, // 保存交付数量用于验证
+    _showQtyInput: true // 标记显示数字输入框
+  }));
+};
+
+const handlePurchaseOrderSelect = (order) => {
+  state.selectedPurchaseOrder = order;
+  // 清空之前的物料列表
+  dialogtable.value = [];
+};
+
+const handleProductionOrderSelect = (order) => {
+  state.selectedProductionOrder = order;
+  dialogForm.value.orderNo = order.orderCode;
+  // For production, do not auto-populate materials; user adds manually
+};
+
+// 验证入库数量
+const validateQty = (row, val) => {
+  if (val === null || val === undefined || val === '') {
+    row.instockQty = 0;
+    return;
+  }
+
+  // 确保是整数
+  const intVal = parseInt(val);
+  if (isNaN(intVal)) {
+    row.instockQty = 0;
+    return;
+  }
+
+  // 确保不超过交付数量
+  if (row.deliveryQty !== undefined && intVal > row.deliveryQty) {
+    row.instockQty = row.deliveryQty;
+    ElMessage.warning(`入库数量不能大于交付数量 ${row.deliveryQty}`);
+  } else {
+    row.instockQty = Math.max(0, intVal);
+  }
+};
 
 
 </script>

src/views/wms/linkage/index.vue

@@ -444,7 +444,7 @@ import {
   getMaterialList, viewAllocateOrderDetail, delAllocateOrderDetail, allocateOrderUpdate
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import {reactive} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'

src/views/wms/outstockOrderCopy/index.vue

@@ -484,7 +484,7 @@ import {
   getMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 

src/views/wms/wmsBaseArea/index.vue

@@ -0,0 +1,436 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" >
+            <!-- <el-form-item label="区域ID" prop="areaId">
+              <el-input v-model="queryParams.areaId" placeholder="请输入区域ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="仓库ID" prop="warehouseId">
+              <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="区域编码" prop="areaCode">
+              <el-input v-model="queryParams.areaCode" placeholder="请输入区域编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="区域名称" prop="areaName">
+              <el-input v-model="queryParams.areaName" placeholder="请输入区域名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="区域类型" prop="areaType">
+              <el-select v-model="queryParams.areaType" placeholder="请选择区域类型" clearable >
+                <el-option v-for="dict in area_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="区域负责人" prop="areaManager">-->
+<!--              <el-input v-model="queryParams.areaManager" placeholder="请输入区域负责人" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="激活标识" prop="activeFlag">-->
+<!--              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >-->
+<!--                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+
+            <el-form-item label="所属仓库" prop="warehouseId">
+              <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库" clearable >
+                <el-option v-for="item in warehouseList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId"/>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:wmsBaseArea:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:wmsBaseArea:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:wmsBaseArea:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:wmsBaseArea:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="wmsBaseAreaList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="区域ID" align="center" prop="areaId" v-if="columns[0].visible"/> -->
+         <!-- 自动序号 -->
+         <el-table-column type="index" label="序号" width="55" align="center"  v-if="columns[0].visible"/>
+        <el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[1].visible"/>
+        <el-table-column label="区域编码" align="center" prop="areaCode" v-if="columns[2].visible"/>
+        <el-table-column label="区域名称" align="center" prop="areaName" v-if="columns[3].visible"/>
+        <el-table-column label="区域类型" align="center" prop="areaType" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="area_type" :value="scope.row.areaType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="区域负责人" align="center" prop="areaManager" v-if="columns[5].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:wmsBaseArea:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsBaseArea:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改区域基础信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="wmsBaseAreaFormRef" :model="form" :rules="rules" label-width="120px">
+        <!-- <el-form-item label="区域ID" prop="areaId">
+          <el-input v-model="form.areaId" placeholder="请输入区域ID" />
+        </el-form-item> -->
+        <el-form-item label="所属仓库" prop="warehouseId">
+          <el-select 
+            v-model="form.warehouseId" 
+            placeholder="请选择所属仓库"  
+            :disabled="!!form.areaId"
+            @change="handleWarehouseChange"
+          >
+            <el-option
+                v-for="item in warehouseList"
+                :key="item.warehouseId"
+                :label="item.warehouseName"
+                :value="item.warehouseId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区域代号" prop="areaCodeSuffix" v-if="!form.areaId">
+          <el-input 
+            v-model="form.areaCodeSuffix" 
+            placeholder="请输入区域代号（如：A、B等）"
+            @input="generateAreaCode"
+            :disabled="!!form.areaId"
+          />
+        </el-form-item>
+        <el-form-item label="区域编码" prop="areaCode">
+          <el-input v-model="form.areaCode" placeholder="区域编码将自动生成" disabled />
+        </el-form-item>
+        <el-form-item label="区域名称" prop="areaName">
+          <el-input v-model="form.areaName" placeholder="请输入区域名称" />
+        </el-form-item>
+        <el-form-item label="区域类型" prop="areaType">
+          <el-select v-model="form.areaType" placeholder="请选择区域类型">
+            <el-option
+                v-for="dict in area_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区域负责人" prop="areaManager">
+          <el-input v-model="form.areaManager" placeholder="请输入区域负责人" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="WmsBaseArea" lang="ts">
+import { getBaseWarehouseList } from '@/api/wms/baseWarehouse';
+import { listWmsBaseArea, getWmsBaseArea, delWmsBaseArea, addWmsBaseArea, updateWmsBaseArea } from '@/api/wms/wmsBaseArea';
+import { WmsBaseAreaVO, WmsBaseAreaQuery, WmsBaseAreaForm } from '@/api/wms/wmsBaseArea/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag, area_type } = toRefs<any>(proxy?.useDict('active_flag', 'area_type'));
+
+const wmsBaseAreaList = ref<WmsBaseAreaVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const wmsBaseAreaFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `序号`, visible: true },
+        // { key: 1, label: `租户号`, visible: true },
+        { key: 2, label: `仓库ID`, visible: true },
+        { key: 3, label: `仓库`, visible: true },
+        { key: 4, label: `区域编码`, visible: true },
+        { key: 5, label: `区域名称`, visible: true },
+        { key: 6, label: `区域类型`, visible: true },
+        { key: 7, label: `区域负责人`, visible: true },
+        { key: 8, label: `激活标识`, visible: true },
+        { key: 9, label: `备注`, visible: true },
+        // { key: 10, label: `创建人`, visible: true },
+        // { key: 11, label: `创建时间`, visible: true },
+        // { key: 12, label: `更新人`, visible: true },
+        // { key: 13, label: `更新时间`, visible: true },
+        // { key: 14, label: `创建部门`, visible: true },
+        // { key: 15, label: `删除标志`, visible: true },
+]);
+
+const initFormData: WmsBaseAreaForm & { areaCodeSuffix?: string } = {
+  areaId: undefined,
+  warehouseId: undefined,
+  areaCode: undefined,
+  areaCodeSuffix: '',
+  areaName: undefined,
+  areaType: undefined,
+  areaManager: undefined,
+  activeFlag: '1',
+  warehouseName: undefined,
+  warehouseCode: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<WmsBaseAreaForm, WmsBaseAreaQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    areaId: undefined,
+    warehouseId: undefined,
+    areaCode: undefined,
+    areaName: undefined,
+    areaType: undefined,
+    areaManager: undefined,
+    activeFlag: undefined,
+    warehouseName: undefined,
+    warehouseCode: undefined,
+    params: {
+    }
+  },
+  rules: {
+    areaName: [
+      { required: true, message: "区域名称不能为空", trigger: "blur" },
+      { min: 1, max: 50, message: "长度在 1 到 50 个字符", trigger: "blur" }
+    ],
+    areaCodeSuffix: [
+      { required: true, message: "区域代号不能为空", trigger: "blur" },
+      { min: 1, max: 10, message: "长度在 1 到 10 个字符", trigger: "blur" }
+    ],
+    areaType:[
+      { required: true, message: "区域类型不能为空", trigger: "blur" }
+    ],
+    areaManager:[
+      { required: true, message: "区域负责人不能为空", trigger: "blur" }
+    ],
+    activeFlag:[
+      { required: true, message: "激活标识不能为空", trigger: "blur" }
+    ],
+    warehouseId:[
+      { required: true, message: "仓库不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询区域基础信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listWmsBaseArea(queryParams.value);
+  wmsBaseAreaList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  wmsBaseAreaFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: WmsBaseAreaVO[]) => {
+  ids.value = selection.map(item => item.areaId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加区域";
+  form.value.activeFlag = '1';
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: WmsBaseAreaVO) => {
+  reset();
+  const _areaId = row?.areaId || ids.value[0];
+  const res = await getWmsBaseArea(_areaId);
+  const data = res.data;
+  
+  // 设置表单数据
+  form.value.areaId = data.areaId;
+  form.value.warehouseId = data.warehouseId;
+  form.value.warehouseName = data.warehouseName;
+  form.value.warehouseCode = data.warehouseCode;
+  form.value.areaCode = data.areaCode;
+  form.value.areaName = data.areaName;
+  form.value.areaType = data.areaType;
+  form.value.areaManager = data.areaManager;
+  form.value.activeFlag = data.activeFlag || '1';
+  form.value.remark = data.remark;
+  
+  // 从区域编码中提取区域代号（去掉仓库编码部分）
+  if (data.areaCode && data.warehouseCode) {
+    form.value.areaCodeSuffix = data.areaCode.replace(data.warehouseCode, '');
+  }
+  
+  dialog.visible = true;
+  dialog.title = "修改区域信息";
+};
+
+/** 提交按钮 */
+// 生成区域编码
+const generateAreaCode = () => {
+  if (!form.value.warehouseCode || !form.value.areaCodeSuffix) return;
+  // 直接拼接仓库编码和区域代号，保留原始大小写
+  form.value.areaCode = `${form.value.warehouseCode}${form.value.areaCodeSuffix}`;
+};
+
+// 仓库选择变化事件
+const handleWarehouseChange = (warehouseId: string | number) => {
+  const selectedWarehouse = warehouseList.value.find(item => item.warehouseId === warehouseId);
+  if (selectedWarehouse) {
+    form.value.warehouseName = selectedWarehouse.warehouseName;
+    form.value.warehouseCode = selectedWarehouse.warehouseCode;
+    // 重新生成区域编码
+    generateAreaCode();
+  }
+};
+
+const submitForm = () => {
+  wmsBaseAreaFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      // 生成区域编码
+      if (!form.value.areaId) {
+        if (!form.value.warehouseCode || !form.value.areaCodeSuffix) {
+          proxy?.$modal.msgWarning('请选择仓库并输入区域代号');
+          return;
+        }
+        form.value.areaCode = `${form.value.warehouseCode}${form.value.areaCodeSuffix.toUpperCase()}`;
+      }
+      
+      buttonLoading.value = true;
+      try {
+        if (form.value.areaId) {
+          // 修改时只允许修改部分字段
+          const updateData = {
+            areaId: form.value.areaId,
+            areaName: form.value.areaName,
+            areaType: form.value.areaType,
+            areaManager: form.value.areaManager,
+            activeFlag: form.value.activeFlag,
+            remark: form.value.remark
+          };
+          await updateWmsBaseArea(updateData);
+        } else {
+          // 新增时提交所有字段
+          await addWmsBaseArea(form.value);
+        }
+        proxy?.$modal.msgSuccess(form.value.areaId ? '修改成功' : '新增成功');
+        dialog.visible = false;
+        await getList();
+      } catch (error) {
+        console.error('操作失败:', error);
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: WmsBaseAreaVO) => {
+  const _areaIds = row?.areaId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除区域基础信息编号为"' + _areaIds + '"的数据项？').finally(() => loading.value = false);
+  await delWmsBaseArea(_areaIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/wmsBaseArea/export', {
+    ...queryParams.value
+  }, `wmsBaseArea_${new Date().getTime()}.xlsx`)
+}
+
+// 查询仓库
+let warehouseList = ref<Array<{warehouseId: string | number, warehouseName: string, warehouseCode: string}>>([]);
+const getWarehouseList = async () => {
+  const res = await getBaseWarehouseList({activeFlag: '1'}); // 只查询激活的仓库
+  warehouseList.value = res.data;
+}
+
+onMounted(() => {
+  getList();
+  getWarehouseList();
+});
+</script>

src/views/wms/wmsPurchaseOrderCopy/index.vue

@@ -487,6 +487,9 @@
 </template>
 
 <script setup name="Linkage" lang="ts">
+
+import MaterialSelectInWMS from '@/views/mes/baseMaterialInfo/addMaterialInWMS.vue';
+
 import {
   listWmsPurchaseOrder,
   getWmsPurchaseOrder,