From 0b956eb7b1df61d9ab547b2c58988d2d9ff97e5f Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Sat, 4 Jan 2025 15:03:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A420250104?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/produceorder/vo/ProduceOrderPageReqVO.java |  3 +++
 .../dal/mysql/produceorder/ProduceOrderMapper.java   |  1 +
 .../src/views/oms/produceorder/index.vue             | 12 ++++++++++++
 .../src/views/oms/saleorder/detail/index.vue         | 10 ++++++++++
 4 files changed, 26 insertions(+)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderPageReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderPageReqVO.java
index bbd8c82..2b2f72c 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderPageReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderPageReqVO.java
@@ -49,4 +49,7 @@ public class ProduceOrderPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] deliverydate;
 
+    @Schema(description = "产品编码")
+    private String productCode;
+
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/produceorder/ProduceOrderMapper.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/produceorder/ProduceOrderMapper.java
index 81ba170..417b636 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/produceorder/ProduceOrderMapper.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/produceorder/ProduceOrderMapper.java
@@ -29,6 +29,7 @@ public interface ProduceOrderMapper extends BaseMapperX<ProduceOrderDO> {
                 .eqIfPresent(ProduceOrderDO::getDeliveryMethod, reqVO.getDeliveryMethod())
                 .betweenIfPresent(ProduceOrderDO::getInspectionDate, reqVO.getInspectionDate())
                 .betweenIfPresent(ProduceOrderDO::getDeliverydate, reqVO.getDeliverydate())
+                .eqIfPresent(ProduceOrderDO::getProductCode, reqVO.getProductCode())
                 .orderByDesc(ProduceOrderDO::getId));
     }
 
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/index.vue
index 993ff09..b04173a 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/index.vue
@@ -106,6 +106,17 @@
           class="!w-240px"
         />
       </el-form-item>
+
+      <el-form-item label="产品编码" prop="productCode">
+        <el-input
+          v-model="queryParams.productCode"
+          placeholder="请输入产品编码"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -286,6 +297,7 @@ const queryParams = reactive({
   produceDate: [],
   produceLine: undefined,
   deliveryMethod: undefined,
+  productCode: undefined,
   inspectionDate: [],
   deliverydate: [],
 })
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue
index 9ef332b..7482a43 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue
@@ -23,6 +23,9 @@
     <el-descriptions title="订单信息">
       <el-descriptions-item label="订单号: " width="1000px">{{ formData.billno }}</el-descriptions-item>
       <el-descriptions-item label="合约类型: " width="1000px" v-if="formData.billStatus == 'B'">
+          <template v-slot:label>
+            <span>合约类型<span style="color: red;">*</span>：</span>
+          </template>
           <el-select
             v-model="formData.contractType"
             placeholder="请选择合约类型"
@@ -48,6 +51,9 @@
       <el-descriptions-item label="客户名称: ">{{ formData?.customer?.name }}</el-descriptions-item>
       <el-descriptions-item label="客户公司: ">{{ formData?.customer?.company }}</el-descriptions-item>
       <el-descriptions-item label="结算币种: " v-if="formData.billStatus == 'B'">
+        <template v-slot:label>
+          <span>结算币种<span style="color: red;">*</span>：</span>
+        </template>
         <el-select
           v-model="formData.currencyType"
           placeholder="请选择结算币种"
@@ -132,6 +138,10 @@
               <el-table-column label="产品规格" prop="materialSpec" width="150" />
               <el-table-column label="数量" prop="qty" width="150" />
               <el-table-column label="单价" width="250" v-if="formData.billStatus == 'B'">
+                <template #header>
+                  <span>单价</span>
+                  <span style="color:red; margin-right:4px">*</span>
+                </template>
                 <template #default="{ row, $index }">
                   <el-form-item  :prop="`${$index}.price`" :rules="itemFormEntrysRules.price" class="mb-0px!"
                       v-if="row.billStatus!='C'"