From 470589409db5a285b4f398094b7d0afc73540ffa Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 28 Jun 2024 15:34:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenanceitem/maintenanceitemAdd.vue    | 55 ++++++++++++++-----
 .../maintenanceitem/maintenanceitemInfo.vue   | 30 ++++++----
 2 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index fe9dabb5ab..5f9d7c4edf 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -29,6 +29,14 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>科目</div>
+              <el-form-item prop="subject">
+                <el-select class="addinputInfo" v-model="formobj.subject" placeholder="请选择" @change="subjectChange" clearable filterable>
+                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subject" :value="item.subject"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">车型</div>
               <el-form-item>
@@ -45,16 +53,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">备注</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>排序</div>
-              <el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
-            </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时单价</div>
               <el-form-item prop="hourPrice"><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
@@ -63,6 +63,10 @@
               <div class="span-sty"><span class="icon">*</span>工时数</div>
               <el-form-item prop="hours"><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hours = getNumber(formobj.hours, 2)" v-model="formobj.hours" clearable placeholder="" /></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>外协成本</div>
+              <el-form-item prop="cost"><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
@@ -74,8 +78,8 @@
               <el-form-item prop="examineHourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>成本</div>
-              <el-form-item prop="cost"><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -98,6 +102,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>排序</div>
+              <el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -108,7 +114,7 @@
 
 <script>
 import req from '@/api/basicinformation/maintenanceitem'
-import { getServiceType, getOrgSidByPath } from '@/api/Common/dictcommons'
+import {getServiceType, getOrgSidByPath, selSubjectInfo} from '@/api/Common/dictcommons'
 
 export default {
   name: 'MaintenanceItemAdd',
@@ -122,6 +128,7 @@ export default {
       serviceType_list: [],
       goodsModel_list: [],
       manufacturer_list: [],
+      subject_list: [],
       formobj: {
         sid: '',
         createBySid: '',
@@ -143,7 +150,9 @@ export default {
         sortNo: '',
         remarks: '',
         useOrgSid: '',
-        createOrgSid: ''
+        createOrgSid: '',
+        subject: '',
+        subjectSid: ''
       },
       rules: {
         sitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
@@ -153,8 +162,9 @@ export default {
         hours: [{ required: true, message: '工时数不能为空', trigger: 'blur' }],
         price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }],
         examineHourPrice: [{ required: true, message: '考核工时不能为空', trigger: 'blur' }],
-        cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }],
-        isReserve: [{ required: true, message: '预约项目不能为空', trigger: 'change' }]
+        cost: [{ required: true, message: '外协成本不能为空', trigger: 'blur' }],
+        isReserve: [{ required: true, message: '预约项目不能为空', trigger: 'change' }],
+        subject: [{ required: true, message: '科目不能为空', trigger: 'change' }]
       }
     }
   },
@@ -180,6 +190,11 @@ export default {
           this.manufacturer_list = res.data
         }
       })
+      selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
+        if (resp.success) {
+          this.subject_list = resp.data
+        }
+      })
     },
     showAdd() {
       this.viewTitle = '【新增】维修项目'
@@ -222,6 +237,14 @@ export default {
       }
       return val
     },
+    subjectChange(value) {
+      const choose = this.subject_list.filter((item) => item.subject === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.subjectSid = choose[0].subjectSid
+      } else {
+        this.formobj.subjectSid = ''
+      }
+    },
     serviceTypeChange(value) {
       const choose = this.serviceType_list.filter((item) => item.serviceType === value)
       if (choose !== null && choose.length > 0) {
@@ -294,7 +317,9 @@ export default {
         sortNo: '',
         remarks: '',
         useOrgSid: '',
-        createOrgSid: ''
+        createOrgSid: '',
+        subject: '',
+        subjectSid: ''
       }
       this.submitdisabled = false
       this.$emit('doback')
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
index 71f2f8fd53..0a06e5fa41 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
@@ -24,6 +24,10 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty">科目</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
+            </el-col>
             <el-col :span="8" class="tlineheightb">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.goodsModel }}</span></el-form-item>
@@ -32,16 +36,8 @@
               <div class="span-sty">厂家</div>
               <el-form-item><span class="addinputInfo">{{ formobj.manufacturer }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">排序</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.sortNo }}</span></el-form-item>
-            </el-col>
             <el-col :span="8">
               <div class="span-sty">工时单价</div>
               <el-form-item><span class="addinputInfo">{{ formobj.hourPrice }}</span></el-form-item>
@@ -50,6 +46,10 @@
               <div class="span-sty">工时数</div>
               <el-form-item><span class="addinputInfo">{{ formobj.hours }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">外协成本</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.cost }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
@@ -61,8 +61,8 @@
               <el-form-item><span class="addinputInfo">{{ formobj.examineHourPrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">成本</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.cost }}</span></el-form-item>
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -75,6 +75,8 @@
               <el-form-item><span class="addinputInfo">{{ formobj.isClean == '1' ? '是' : '否' }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sortNo }}</span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -113,7 +115,9 @@ export default {
         sortNo: '',
         remarks: '',
         useOrgSid: '',
-        createOrgSid: ''
+        createOrgSid: '',
+        subject: '',
+        subjectSid: ''
       },
       rules: {}
     }
@@ -152,7 +156,9 @@ export default {
         sortNo: '',
         remarks: '',
         useOrgSid: '',
-        createOrgSid: ''
+        createOrgSid: '',
+        subject: '',
+        subjectSid: ''
       }
       this.$emit('doback')
     }

From d3dad68d742750edec541d65ce579ed7309e7056 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 28 Jun 2024 15:48:25 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenanceitem/maintenanceitemAdd.vue    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index 5f9d7c4edf..a2d1ab8189 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -57,11 +57,11 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时单价</div>
-              <el-form-item prop="hourPrice"><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="hourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时数</div>
-              <el-form-item prop="hours"><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hours = getNumber(formobj.hours, 2)" v-model="formobj.hours" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="hours"><el-input class="addinputInfo addinputw" @keyup.native="formobj.hours = getNumber(formobj.hours, 2)" v-model="formobj.hours" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>外协成本</div>
@@ -71,7 +71,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>销售价</div>
-              <el-form-item prop="price"><el-input class="addinputInfo addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" @input="computeGSS" v-model="formobj.price" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="price"><span class="addinputInfo">{{ calculatePrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>考核工时</div>
@@ -114,7 +114,7 @@
 
 <script>
 import req from '@/api/basicinformation/maintenanceitem'
-import {getServiceType, getOrgSidByPath, selSubjectInfo} from '@/api/Common/dictcommons'
+import { getServiceType, getOrgSidByPath, selSubjectInfo } from '@/api/Common/dictcommons'
 
 export default {
   name: 'MaintenanceItemAdd',
@@ -168,6 +168,14 @@ export default {
       }
     }
   },
+  computed: {
+    // 计算销售价 = 工时单价 * 工时数 + 外协成本
+    calculatePrice() {
+      let price = '0'
+      price = Math.round((parseFloat(price) + (parseFloat(this.formobj.hourPrice !== '' ? this.formobj.hourPrice : '0') * parseFloat(this.formobj.hours !== '' ? this.formobj.hours : '0')) + parseFloat(this.formobj.cost !== '' ? this.formobj.cost : '0')) * 100) / 100
+      return price
+    }
+  },
   methods: {
     init() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
@@ -269,15 +277,8 @@ export default {
         this.formobj.manufacturerSid = ''
       }
     },
-    // 计算销售价=工时数*工时单价
-    computeXSJ() {
-      this.formobj.price = Math.round((parseFloat(this.formobj.hourPrice === '' ? '0' : this.formobj.hourPrice) * parseFloat(this.formobj.hours === '' ? '0' : this.formobj.hours)) * 100) / 100
-    },
-    // 计算工时数=销售价除以工时单价
-    computeGSS() {
-      this.formobj.hours = Math.round((parseFloat(this.formobj.price === '' ? '0' : this.formobj.price) / parseFloat(this.formobj.hourPrice === '' ? '0' : this.formobj.hourPrice)) * 100) / 100
-    },
     saveOrUpdate() {
+      this.formobj.price = this.calculatePrice
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true

From 2c2b44e0e43b65763fbaa067ab898e83b8547abc Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 28 Jun 2024 17:08:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenanceitem/maintenanceitemAdd.vue         | 14 +++++++-------
 .../maintenanceitem/maintenanceitemInfo.vue        |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index a2d1ab8189..c2b539e805 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -31,9 +31,9 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>科目</div>
-              <el-form-item prop="subject">
-                <el-select class="addinputInfo" v-model="formobj.subject" placeholder="请选择" @change="subjectChange" clearable filterable>
-                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subject" :value="item.subject"></el-option>
+              <el-form-item prop="subjectName">
+                <el-select class="addinputInfo" v-model="formobj.subjectName" placeholder="请选择" @change="subjectChange" clearable filterable>
+                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subjectName" :value="item.subjectName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -151,7 +151,7 @@ export default {
         remarks: '',
         useOrgSid: '',
         createOrgSid: '',
-        subject: '',
+        subjectName: '',
         subjectSid: ''
       },
       rules: {
@@ -164,7 +164,7 @@ export default {
         examineHourPrice: [{ required: true, message: '考核工时不能为空', trigger: 'blur' }],
         cost: [{ required: true, message: '外协成本不能为空', trigger: 'blur' }],
         isReserve: [{ required: true, message: '预约项目不能为空', trigger: 'change' }],
-        subject: [{ required: true, message: '科目不能为空', trigger: 'change' }]
+        subjectName: [{ required: true, message: '科目不能为空', trigger: 'change' }]
       }
     }
   },
@@ -246,7 +246,7 @@ export default {
       return val
     },
     subjectChange(value) {
-      const choose = this.subject_list.filter((item) => item.subject === value)
+      const choose = this.subject_list.filter((item) => item.subjectName === value)
       if (choose.length > 0 && choose !== null) {
         this.formobj.subjectSid = choose[0].subjectSid
       } else {
@@ -319,7 +319,7 @@ export default {
         remarks: '',
         useOrgSid: '',
         createOrgSid: '',
-        subject: '',
+        subjectName: '',
         subjectSid: ''
       }
       this.submitdisabled = false
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
index 0a06e5fa41..faebb37cf9 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
@@ -26,7 +26,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">科目</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.subjectName }}</span></el-form-item>
             </el-col>
             <el-col :span="8" class="tlineheightb">
               <div class="span-sty">车型</div>
@@ -116,7 +116,7 @@ export default {
         remarks: '',
         useOrgSid: '',
         createOrgSid: '',
-        subject: '',
+        subjectName: '',
         subjectSid: ''
       },
       rules: {}
@@ -157,7 +157,7 @@ export default {
         remarks: '',
         useOrgSid: '',
         createOrgSid: '',
-        subject: '',
+        subjectName: '',
         subjectSid: ''
       }
       this.$emit('doback')

From 6f3c994d62214bf8d7e55bd51d54eaac19943398 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 28 Jun 2024 17:26:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java   | 10 ++++++++++
 .../pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java  | 10 ++++++++++
 .../biz/pms/pmspurchasebill/PmsPurchaseBillDto.java    | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
index 1befdf5239..ee534c3998 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
@@ -62,6 +62,16 @@ public class PmsPurchaseBill extends BaseEntity {
     private String sourceBillNo;
 	@ApiModelProperty("单据编号")
     private String billNo;
+
+    @ApiModelProperty("经营品牌Key")
+    private String operateBrandKey;
+    @ApiModelProperty("经营品牌Value")
+    private String operateBrandValue;
+    @ApiModelProperty("仓库类型Key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型Value")
+    private String warehouseTypeValue;
+
 	@ApiModelProperty("采购类型Key")
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
index cf8a310d90..9efe924f4d 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
@@ -82,6 +82,16 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String sourceBillNo;
 	@ApiModelProperty("单据编号")
     private String billNo;
+
+    @ApiModelProperty("经营品牌Key")
+    private String operateBrandKey;
+    @ApiModelProperty("经营品牌Value")
+    private String operateBrandValue;
+    @ApiModelProperty("仓库类型Key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型Value")
+    private String warehouseTypeValue;
+
 	@ApiModelProperty("采购类型Key")
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
index ad82d28c82..758bd012f8 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
@@ -72,6 +72,16 @@ public class PmsPurchaseBillDto implements Dto {
     private String sourceBillNo;
 	@ApiModelProperty("单据编号")
     private String billNo;
+
+    @ApiModelProperty("经营品牌Key")
+    private String operateBrandKey;
+    @ApiModelProperty("经营品牌Value")
+    private String operateBrandValue;
+    @ApiModelProperty("仓库类型Key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型Value")
+    private String warehouseTypeValue;
+
 	@ApiModelProperty("采购类型Key")
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")