add:添加工单页面

2026-06-16 15:58:59 +08:00
parent bd52bb055a
commit 78fccd3332
14 changed files with 382 additions and 16 deletions
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesApiServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesApiServiceImpl.java
@@ -47,7 +47,6 @@ public class MesApiServiceImpl implements MesApiService {
            throw new BadRequestException("请传MES失败,未配置MES_URL地址");
        }
        String url = param.getValue();
-        // TODO: add demand order API path to EXTConstant once endpoint is confirmed
        try {
            JSONObject requestParam = new JSONObject();
            requestParam.put("OrderCode",workOrder);
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToZDWmdServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToZDWmdServiceImpl.java
@@ -28,7 +28,6 @@ public class WmsToZDWmdServiceImpl implements WmsToZDWmdService {
    public ResponseEntity syncDemandOrder(List<PmDemandDto> demands) {
        log.info("syncDemandOrder生产领料需求单下发输入参数：-------------------" + demands.size());
        String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.ZD_URL).getValue();
-        // TODO: add demand order API path to EXTConstant once endpoint is confirmed
        try {
            String resultMsg = HttpRequest.post(url)
                    .body(JSONArray.parseArray(JSON.toJSONString(demands)).toJSONString())
@@ -45,7 +44,6 @@ public class WmsToZDWmdServiceImpl implements WmsToZDWmdService {
    public ResponseEntity syncPurchaseReceiving(JSONObject whereJson) {
        log.info("syncPurchaseReceiving采购入库单下发输入参数：-------------------" + whereJson.toString());
        String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.ZD_URL).getValue();
-        // TODO: add purchase receiving API path to EXTConstant once endpoint is confirmed
        try {
            String resultMsg = HttpRequest.post(url)
                    .body(whereJson.toString())
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
@@ -305,7 +305,6 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
                    .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
            );
        }
-        //TODO：生成手工领料单
        final PmStockReturn stockReturn = new PmStockReturn();
        stockReturn.setCreate_time(DateUtil.now());
        stockReturn.setRequest_type(IOSEnum.BILL_TYPE.code("生产出库"));
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java
@@ -1133,7 +1133,6 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
    }
    @Override
    @Transactional
-    //TODO：调拨还是直接出库
    public void disFinish(List<IOStorInvDis> disList) {
        // 完成当前任务对应的所有分配明细
        List<OutFinishParam> outFinsParams = new ArrayList<>();
@@ -1191,7 +1190,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                }
            }
            iStInventoryService.changeInventory(InventoryChangeType.ADD_INV, addInvParams);
-            //生成调拨入库单据
+            //TODO：生成调拨入库单据
        }
        // 如果分配明细全部完成则更新明细表状态
        if (countDis == 0){
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inventory/impl/StInventoryServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inventory/impl/StInventoryServiceImpl.java
@@ -68,7 +68,6 @@ public class StInventoryServiceImpl implements IStInventoryService {
                                .material_code(invParam.getMaterialCode())
                                .storagevehicle_code(invParam.getStoragevehicleCode())
                                .pcsn(invParam.getPcsn())
-                                //TODO:先给默认个
                                .qty_unit_id(invParam.getUnitId())
                                .qty_unit_name(invParam.getUnitName())
                                .qty(invParam.getQty())
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java
@@ -7,6 +7,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.welding_manage.service.work_order.IWorkOrderService;
 import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;
+import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -29,9 +30,13 @@ public class WorkOrderController {

    @GetMapping
    @Log("分页查询工单列表和详情")
-    public ResponseEntity<Object> query(@RequestParam Map params, PageQuery page)
-    {
-        return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.queryList(page, params)), HttpStatus.OK);
+    public ResponseEntity<Object> query(WorkOrderQuery query, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.page(page.build(),query.build())), HttpStatus.OK);
+    }
+    @GetMapping("/getOrderItem")
+    @SaIgnore
+    public ResponseEntity<Object> getOrderItem(String orderCode) {
+        return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.getOrderBomItem(orderCode)), HttpStatus.OK);
    }

    @PostMapping
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java
@@ -3,10 +3,12 @@ package org.nl.wms.welding_manage.service.work_order;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao;
 import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao;
 import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;

 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;

 public interface IWorkOrderService extends IService<WorkOrderDao> {
@@ -34,4 +36,6 @@ public interface IWorkOrderService extends IService<WorkOrderDao> {
     * 修改工单已使用bom数量
     */
    void updateBomUseQty(String id, BigDecimal qty);
+
+    List<WorkOrderBomDao> getOrderBomItem(String orderCode);
 }
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.lettuce.core.dynamic.annotation.Param;
+import org.apache.ibatis.annotations.Select;
+import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao;
 import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao;
 import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;

@@ -13,6 +15,9 @@ import java.util.Map;

 public interface WorkOrderMapper extends BaseMapper<WorkOrderDao> {

+    @Select("SELECT * FROM md_work_order_bom WHERE work_order_code = #{orderCode} ORDER BY item_no ASC")
+    List<WorkOrderBomDao> getOrderBomItem(String orderCode);
+
    /**
     * 分页查询工单
     * @param page
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderQuery.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderQuery.java
@@ -0,0 +1,7 @@
+package org.nl.wms.welding_manage.service.work_order.dto;
+
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao;
+
+public class WorkOrderQuery extends BaseQuery<WorkOrderDao> {
+}
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java
@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.common.exception.BadRequestException;
+import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao;
 import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao;
 import org.nl.wms.welding_manage.service.work_order.dao.mapper.WorkOrderMapper;
 import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;
@@ -12,7 +15,6 @@ import org.nl.wms.welding_manage.service.work_order.IWorkOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -56,8 +58,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                }

                String snListString = record.getWorkOrderSnListString();
-                if (StringUtils.hasText(snListString)) {
-                    // 按逗号分割字符串，并去除空白字符，转换为List
+                if (!StringUtils.isEmpty(snListString)){
                    List<String> snList = Arrays.stream(snListString.split(","))
                            .map(String::trim)
                            .filter(s -> !s.isEmpty())
@@ -109,4 +110,12 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
    public void updateBomUseQty(String id, BigDecimal qty) {
        workOrderMapper.updateBomUseQty(id, qty);
    }
-}
+
+    @Override
+    public List<WorkOrderBomDao> getOrderBomItem(String orderCode) {
+        if (StringUtils.isEmpty(orderCode)){
+            throw new BadRequestException("查询工单明细失败,工单编号为空");
+        }
+         return workOrderMapper.getOrderBomItem(orderCode);
+    }
+}
--- a/nladmin-ui/src/views/wms/pm_manage/work_order/index.vue
+++ b/nladmin-ui/src/views/wms/pm_manage/work_order/index.vue
@@ -0,0 +1,305 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <!-- 查询区域 -->
+      <div>
+        <el-form :inline="true" label-position="right" label-width="100px" label-suffix=":" class="demo-form-inline">
+          <el-form-item label="工单编号">
+            <el-input v-model="query.order_code" clearable size="mini" placeholder="请输入工单编号" @keyup.enter.native="crud.toQuery" />
+          </el-form-item>
+          <el-form-item label="产品名称">
+            <el-input v-model="query.product_name" clearable size="mini" placeholder="请输入产品名称" @keyup.enter.native="crud.toQuery" />
+          </el-form-item>
+          <el-form-item label="BOM编码">
+            <el-input v-model="query.bom_code" clearable size="mini" placeholder="请输入BOM编码" @keyup.enter.native="crud.toQuery" />
+          </el-form-item>
+          <el-form-item label="工作区域">
+            <el-input v-model="query.work_area" clearable size="mini" placeholder="请输入工作区域" @keyup.enter.native="crud.toQuery" />
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-select v-model="query.status" clearable size="mini" placeholder="请选择状态" class="filter-item" @change="crud.toQuery">
+              <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <rrOperation :crud="crud" />
+        </el-form>
+      </div>
+
+      <!-- 操作按钮区域 -->
+      <div style="margin-bottom: 10px; display: flex; align-items: center; gap: 8px; flex-wrap: wrap;">
+        <crudOperation :permission="permission" />
+      </div>
+
+      <!-- 新增/编辑对话框 -->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="960px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":" style="border: 1px solid #cfe0df; margin-top: 10px; padding: 10px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="工单编号" prop="order_code">
+                <el-input v-model.trim="form.order_code" style="width: 280px;" placeholder="请输入工单编号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品编码" prop="product_code">
+                <el-input v-model.trim="form.product_code" style="width: 280px;" placeholder="请输入产品编码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="product_name">
+                <el-input v-model.trim="form.product_name" style="width: 280px;" placeholder="请输入产品名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品规格" prop="product_spec">
+                <el-input v-model.trim="form.product_spec" style="width: 280px;" placeholder="请输入产品规格" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="计划数量" prop="order_qty">
+                <el-input-number v-model="form.order_qty" :min="0" :step="1" style="width: 280px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="单位" prop="unit">
+                <el-input v-model.trim="form.unit" style="width: 280px;" placeholder="请输入单位" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="BOM编码" prop="bom_code">
+                <el-input v-model.trim="form.bom_code" style="width: 280px;" placeholder="请输入BOM编码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="工作区域" prop="work_area">
+                <el-input v-model.trim="form.work_area" style="width: 280px;" placeholder="请输入工作区域" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="计划开始时间" prop="plan_started_on">
+                <el-date-picker v-model="form.plan_started_on" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择计划开始时间" style="width: 280px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="计划完成时间" prop="plan_finished_on">
+                <el-date-picker v-model="form.plan_finished_on" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择计划完成时间" style="width: 280px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-select v-model="form.status" style="width: 280px;" placeholder="请选择状态">
+                  <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model.trim="form.remark" style="width: 280px;" placeholder="请输入备注" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 工单明细对话框 -->
+      <el-dialog
+        :visible.sync="detailVisible"
+        title="工单明细（BOM清单）"
+        width="1100px"
+        :close-on-click-modal="false"
+        @close="closeDetailDialog"
+      >
+        <div style="margin-bottom: 10px; color: #606266; font-size: 13px;">
+          工单编号：<strong>{{ currentWorkOrder.order_code }}</strong> &nbsp;|&nbsp;
+          产品：<strong>{{ currentWorkOrder.product_code }} {{ currentWorkOrder.product_name }}</strong> &nbsp;|&nbsp;
+          计划数量：<strong style="color: #E6A23C;">{{ currentWorkOrder.order_qty }} {{ currentWorkOrder.unit }}</strong>
+        </div>
+        <el-table v-loading="detailLoading" :data="bomList" size="small" border max-height="480">
+          <el-table-column type="index" label="序号" width="55" align="center" />
+          <el-table-column prop="item_no" label="行号" width="60" align="center" />
+          <el-table-column prop="material_code" label="物料编码" min-width="130" show-overflow-tooltip />
+          <el-table-column prop="material_name" label="物料名称" min-width="160" show-overflow-tooltip />
+          <el-table-column prop="spec" label="规格" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="unit" label="单位" width="70" align="center" />
+          <el-table-column prop="bom_qty" label="BOM用量" width="100" align="right" />
+          <el-table-column prop="use_bom_qty" label="已用数量" width="100" align="right" />
+          <el-table-column prop="wms_qty" label="WMS数量" width="100" align="right" />
+          <el-table-column prop="warehouse_name" label="仓库" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="load_port" label="上料口" width="90" align="center" show-overflow-tooltip />
+          <el-table-column prop="work_center" label="工作中心" min-width="110" show-overflow-tooltip />
+          <el-table-column prop="track_no" label="跟踪号" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="status" label="状态" width="80" align="center">
+            <template slot-scope="scope">
+              <el-tag :type="bomStatusTagType(scope.row.status)" size="mini">{{ bomStatusLabel(scope.row.status) }}</el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="closeDetailDialog">关闭</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 主列表 -->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="small"
+        border
+        row-key="id"
+        @selection-change="handleSelectionChange"
+        @expand-change="handleExpandChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="id" label="ID" width="220" show-overflow-tooltip />
+        <el-table-column prop="order_code" label="工单编号" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="product_code" label="产品编码" min-width="130" show-overflow-tooltip />
+        <el-table-column prop="product_name" label="产品名称" min-width="160" show-overflow-tooltip />
+        <el-table-column prop="product_spec" label="产品规格" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="order_qty" label="计划数量" width="90" align="right" />
+        <el-table-column prop="use_order_qty" label="已用数量" width="90" align="right" />
+        <el-table-column prop="finished_qty" label="完成数量" width="90" align="right" />
+        <el-table-column prop="unit" label="单位" width="70" align="center" />
+        <el-table-column prop="bom_code" label="BOM编码" min-width="130" show-overflow-tooltip />
+        <el-table-column prop="work_area" label="工作区域" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="plan_started_on" label="计划开始" min-width="155" show-overflow-tooltip />
+        <el-table-column prop="plan_finished_on" label="计划完成" min-width="155" show-overflow-tooltip />
+        <el-table-column prop="status" label="状态" width="90" align="center">
+          <template slot-scope="scope">
+            <el-tag :type="statusTagType(scope.row.status)" size="mini">{{ statusLabel(scope.row.status) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="创建时间" min-width="155" show-overflow-tooltip />
+        <el-table-column label="操作" width="210" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation style="display: inline" :data="scope.row" :permission="permission" />
+            <el-button size="mini" type="primary" plain style="margin-left: 4px;" @click="openDetailDialog(scope.row.order_code)">明细</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudWorkOrder from './workOrder'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation.vue'
+import udOperation from '@crud/UD.operation.vue'
+import rrOperation from '@crud/RR.operation.vue'
+import pagination from '@crud/Pagination.vue'
+
+const createDefaultForm = () => ({
+  id: null,
+  order_code: '',
+  product_code: '',
+  product_name: '',
+  product_spec: '',
+  order_qty: undefined,
+  unit: '',
+  bom_code: '',
+  work_area: '',
+  plan_started_on: '',
+  plan_finished_on: '',
+  status: undefined,
+  remark: ''
+})
+
+export default {
+  name: 'WorkOrder',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(createDefaultForm()), crud()],
+  cruds() {
+    return CRUD({
+      title: '工单管理',
+      url: 'api/workOrder',
+      idField: 'id',
+      sort: 'plan_started_on,desc',
+      crudMethod: { ...crudWorkOrder },
+      optShow: { add: true, reset: true }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      statusOptions: [
+        { value: 1, label: '待执行' },
+        { value: 2, label: '执行中' },
+        { value: 3, label: '完成' },
+        { value: 4, label: '暂停' },
+        { value: 5, label: '撤销' }
+      ],
+      bomStatusOptions: [
+        { value: 0, label: '待备料' },
+        { value: 1, label: '备料中' },
+        { value: 2, label: '已备料' }
+      ],
+      detailVisible: false,
+      detailLoading: false,
+      currentWorkOrder: {},
+      bomList: [],
+      multipleSelection: [],
+      rules: {
+        order_code: [{ required: true, message: '请输入工单编号', trigger: 'blur' }],
+        product_code: [{ required: true, message: '请输入产品编码', trigger: 'blur' }],
+        product_name: [{ required: true, message: '请输入产品名称', trigger: 'blur' }],
+        order_qty: [{ required: true, message: '请输入计划数量', trigger: 'change' }],
+        unit: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+        bom_code: [{ required: true, message: '请输入BOM编码', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    statusLabel(status) {
+      const target = this.statusOptions.find(item => Number(item.value) === Number(status))
+      return target ? target.label : status
+    },
+    statusTagType(status) {
+      const map = { 1: 'info', 2: 'primary', 3: 'success', 4: 'warning', 5: 'danger' }
+      return map[Number(status)] || ''
+    },
+    bomStatusLabel(status) {
+      const target = this.bomStatusOptions.find(item => Number(item.value) === Number(status))
+      return target ? target.label : (status !== undefined && status !== null ? status : '-')
+    },
+    bomStatusTagType(status) {
+      const map = { 0: 'info', 1: 'warning', 2: 'success' }
+      return map[Number(status)] || ''
+    },
+    handleSelectionChange(selection) {
+      this.multipleSelection = selection
+    },
+    handleExpandChange(row) {
+      // BOM data is already loaded with the row from the backend
+    },
+    openDetailDialog(order) {
+      crudWorkOrder.getItem(order).then(result => {
+        this.bomList = result.content || []
+        this.detailVisible = true
+      }).catch(error => {
+        this.bomList = []
+      }).finally(() => {
+        this.detailLoading = false
+      })
+    },
+    closeDetailDialog() {
+      this.detailVisible = false
+      this.currentWorkOrder = {}
+      this.bomList = []
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
--- a/nladmin-ui/src/views/wms/pm_manage/work_order/workOrder.js
+++ b/nladmin-ui/src/views/wms/pm_manage/work_order/workOrder.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/workOrder',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/workOrder',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/workOrder',
+    method: 'put',
+    data
+  })
+}
+export function getItem(data) {
+  return request({
+    url: 'api/workOrder/getOrderItem',
+    method: 'get',
+    params: {
+      orderCode: data
+    }
+  })
+}
+export default { add, edit, del, getItem }
--- a/nladmin-ui/src/views/wms/st/purchase/index.vue
+++ b/nladmin-ui/src/views/wms/st/purchase/index.vue
@@ -27,7 +27,8 @@
        </el-form>
      </div>
      <crudOperation :permission="permission">
-        <el-button slot="right" class="filter-item" type="warning" icon="el-icon-s-promotion" size="mini" :disabled="audit_flag" @click="issueReturnBill">下发回传单</el-button>
+        <el-button slot="right" class="filter-item" type="warning" icon="el-icon-s-promotion" size="mini" :disabled="audit_flag" @click="issueReturnBill">强制回传</el-button>
+        <el-button slot="right" class="filter-item" type="success"  size="mini"  @click="issueReturnBill">条码打印</el-button>
      </crudOperation>
      <el-table ref="table" v-loading="crud.loading" size="mini" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange" @select="handleSelectionChange">
        <el-table-column type="selection" width="55" />
--- a/pda/pda/src/i18n/index.js
+++ b/pda/pda/src/i18n/index.js
@@ -26,7 +26,8 @@ const zh = {
            '平库库存查询',
            '库位绑定/解绑',
            '平库调拨出库',
-            '线边领料出库'
+            '线边领料出库',
+            '配盘入库'
            // '空托上架/下架/注册/呼叫',
            // 'AGV配送',
            // '人工盘点',