Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue

@@ -128,7 +128,7 @@
           <el-col :span="12">
             <div class="span-sty">开户行</div>
             <el-form-item>
-              <el-select class="addinputInfo addinputw" v-model="formobj.bank" filterable placeholder="请选择" clearable>
+              <el-select class="addinputInfo addinputw" v-model="temp.bank" filterable placeholder="请选择" clearable>
                 <el-option v-for="item in bank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -330,7 +330,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">二次上传金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getNumber(formobj.secondaryUploadMoney, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getSpecialNumber(formobj.secondaryUploadMoney, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
@@ -338,11 +338,11 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getNumber(formobj.secondTreatCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getSpecialNumber(formobj.secondTreatCost, 2)" @input="secondCostInput" clearable placeholder=""/></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.secondSuppCost" @keyup.native="formobj.secondSuppCost = getNumber(formobj.secondSuppCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getSpecialNumber(formobj.secondSuppCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中含返利</div>
@@ -674,6 +674,26 @@ export default {
       }
       this.init()
     },
+    getSpecialNumber(val, limit) {
+      val = val.replace(/[^0-9.-]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点
+      val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     getNumber(val, limit) {
       val = val.replace(/[^0-9.]/g, '') // 保留数字
       val = val.replace(/^00/, '0.') // 开头不能有两个0
@@ -727,10 +747,10 @@ export default {
     // 二次调整页面--返利二次上传模块
     secondCostInput() {
       // 二次上传金额 > 0 时，返利二次上传为勾选状态
-      if (parseFloat(this.formobj.secondaryUploadMoney) > 0) {
+      if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
-        this.checked = true
-      } else {
         this.checked = false
+      } else {
+        this.checked = true
       }
       // 其中含返利 = 二次上传金额 - 其中待支付费用 - 其中抵顶费用
       this.formobj.secondRebate = Math.round((parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) - parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0)) * 100) / 100

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue

@@ -126,11 +126,11 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceTreatCost" @keyup.native="formobj.onceTreatCost = getNumber(formobj.onceTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceTreatCost" @keyup.native="formobj.onceTreatCost = getSpecialNumber(formobj.onceTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceSuppCost" @keyup.native="formobj.onceSuppCost = getNumber(formobj.onceSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceSuppCost" @keyup.native="formobj.onceSuppCost = getSpecialNumber(formobj.onceSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">抵顶费用说明</div>
@@ -145,7 +145,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">上传金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getNumber(formobj.secondaryUploadMoney, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getSpecialNumber(formobj.secondaryUploadMoney, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
@@ -153,11 +153,11 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getNumber(formobj.secondTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getSpecialNumber(formobj.secondTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getNumber(formobj.secondSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getSpecialNumber(formobj.secondSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">抵顶费用说明</div>
@@ -248,7 +248,7 @@ export default {
       req.fetchBySid(row.sid).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
-          if (parseFloat(this.formobj.secondaryUploadMoney) === 0) {
+          if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
             this.checked = false
           }
           this.isAdjustmentInput(this.formobj)
@@ -320,10 +320,10 @@ export default {
         val.adjustmentRemarks = ''
         this.adjustOrNot = true
       }
-      if (parseFloat(this.formobj.secondaryUploadMoney) > 0) {
+      if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
-        this.checked = true
-      } else {
         this.checked = false
+      } else {
+        this.checked = true
       }
     },
     changeIsAdjustment(val) {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue

@@ -307,7 +307,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">二次上传金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getNumber(formobj.secondaryUploadMoney, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getSpecialNumber(formobj.secondaryUploadMoney, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
@@ -315,15 +315,15 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondItureCost" @keyup.native="formobj.secondItureCost = getNumber(formobj.secondItureCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondItureCost" @keyup.native="formobj.secondItureCost = getSpecialNumber(formobj.secondItureCost, 2)" @input="secondCostInput" clearable placeholder=""/></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.secondTreatCost" @keyup.native="formobj.secondTreatCost = getNumber(formobj.secondTreatCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getSpecialNumber(formobj.secondTreatCost, 2)" @input="secondCostInput" clearable placeholder=""/></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.secondSuppCost" @keyup.native="formobj.secondSuppCost = getNumber(formobj.secondSuppCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getSpecialNumber(formobj.secondSuppCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -660,6 +660,26 @@ export default {
       }
       this.init()
     },
+    getSpecialNumber(val, limit) {
+      val = val.replace(/[^0-9.-]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点
+      val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     getNumber(val, limit) {
       val = val.replace(/[^0-9.]/g, '') // 保留数字
       val = val.replace(/^00/, '0.') // 开头不能有两个0

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue

@@ -102,15 +102,15 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceItureCost" @keyup.native="formobj.onceItureCost = getNumber(formobj.onceItureCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceItureCost" @keyup.native="formobj.onceItureCost = getSpecialNumber(formobj.onceItureCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceTreatCost" @keyup.native="formobj.onceTreatCost = getNumber(formobj.onceTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceTreatCost" @keyup.native="formobj.onceTreatCost = getSpecialNumber(formobj.onceTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceSuppCost" @keyup.native="formobj.onceSuppCost = getNumber(formobj.onceSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceSuppCost" @keyup.native="formobj.onceSuppCost = getSpecialNumber(formobj.onceSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -127,7 +127,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">上传金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getNumber(formobj.secondaryUploadMoney, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getSpecialNumber(formobj.secondaryUploadMoney, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
@@ -135,15 +135,15 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondItureCost" @keyup.native="formobj.secondItureCost = getNumber(formobj.secondItureCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondItureCost" @keyup.native="formobj.secondItureCost = getSpecialNumber(formobj.secondItureCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getNumber(formobj.secondTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getSpecialNumber(formobj.secondTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getNumber(formobj.secondSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getSpecialNumber(formobj.secondSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -236,7 +236,7 @@ export default {
       req.fetchBySid(row.sid).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
-          if (parseFloat(this.formobj.secondaryUploadMoney) === 0) {
+          if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
             this.checked = false
           }
           this.isAdjustmentInput(this.formobj)
@@ -308,10 +308,10 @@ export default {
         val.adjustmentRemarks = ''
         this.adjustOrNot = true
       }
-      if (parseFloat(this.formobj.secondaryUploadMoney) > 0) {
+      if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
-        this.checked = true
-      } else {
         this.checked = false
+      } else {
+        this.checked = true
       }
     },
     changeIsAdjustment(val) {

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -391,6 +391,8 @@
             <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
             <el-table-column prop="unit" label="单位" width="100" align="center" />
             <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+            <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+            <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
             <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
             <el-table-column prop="count" label="数量" width="100" align="center" />
             <el-table-column prop="price" label="单价" align="center" width="150" />

yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue

@@ -226,6 +226,8 @@
             <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
             <el-table-column prop="unit" label="单位" width="100" align="center" />
             <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+            <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+            <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
             <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
             <el-table-column prop="count" label="数量" width="100" align="center" />
             <el-table-column prop="price" label="单价" align="center" width="150" />

yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue

@@ -125,6 +125,8 @@
                       <el-table-column prop="price" label="销售单价" width="100" align="center" />
                       <el-table-column prop="billObjName" label="供应商" width="200" align="center" />
                       <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
+                      <el-table-column prop="wareZoneName" label="区域" width="150" align="center" />
+                      <el-table-column prop="wareAreaName" label="库区" width="150" align="center" />
                       <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
                       <el-table-column prop="goodsID" label="商品ID" width="150" align="center" />
                       <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
@@ -135,12 +137,14 @@
                 </el-popover>
               </template>
             </el-table-column>
+            <el-table-column prop="goodsID" label="商品ID" width="150" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
             <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
             <el-table-column prop="unit" label="单位" align="center" width="100" />
             <el-table-column prop="billObjName" label="供应商" align="center" width="150" />
             <el-table-column prop="warehouseName" label="仓库" align="center" width="150" />
-            <el-table-column prop="areaName" label="库区" align="center" width="150" />
+            <el-table-column prop="wareZoneName" label="区域" width="150" align="center" />
+            <el-table-column prop="wareAreaName" label="库区" width="150" align="center" />
             <el-table-column prop="warehouseRackCode" label="库位" align="center" width="150" />
             <el-table-column prop="currentCount" label="库存" align="center" width="100" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
@@ -533,8 +537,10 @@ export default {
         unit: '', // 计量单位
         warehouseName: '', // 仓库名称
         warehouseSid: '',
-        areaName: '', // 库区
+        wareZoneSid: '',
-        areaSid: '',
+        wareZoneName: '',
+        wareAreaSid: '',
+        wareAreaName: '',
         warehouseRackCode: '', // 库位编号
         warehouseRackSid: '',
         billObjName: '', // 供应商
@@ -585,8 +591,10 @@ export default {
       row.unit = value.unit
       row.warehouseName = value.warehouseName
       row.warehouseSid = value.warehouseSid
-      row.areaName = value.areaName
+      row.wareZoneSid = value.wareZoneSid
-      row.areaSid = value.areaSid
+      row.wareZoneName = value.wareZoneName
+      row.wareAreaSid = value.wareAreaSid
+      row.wareAreaName = value.wareAreaName
       row.warehouseRackCode = value.warehouseRackCode
       row.warehouseRackSid = value.warehouseRackSid
       row.billObjName = value.billObjName

yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue

@@ -80,13 +80,15 @@
           <div class="title">商品列表</div>
           <el-table :key="commodityKey" :data="formobj.goodsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsID" label="商品ID" width="150" align="center" />
             <el-table-column prop="goodsSpuName" label="商品名称" width="200" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
             <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
             <el-table-column prop="unit" label="单位" width="100" align="center" />
             <el-table-column prop="billObjName" label="供应商" align="center" width="150" />
             <el-table-column prop="warehouseName" label="仓库" align="center" width="150" />
-            <el-table-column prop="areaName" label="库区" align="center" width="150" />
+            <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+            <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
             <el-table-column prop="warehouseRackCode" label="库位" align="center" width="150" />
             <el-table-column prop="currentCount" label="库存" width="100" align="center" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java

@@ -4,7 +4,6 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,6 +35,15 @@ public class GoodsDetailsVo implements Vo {
     private String warehouseName;
     //库位编号
     private String warehouseRackCode;
+
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
 //
 //    @ApiModelProperty("需求数量（维修工单中）")
 //    private String needCount;

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java

@@ -112,4 +112,13 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
     private String billBusTypeKey;
     @ApiModelProperty("业务类型Value")
     private String billBusTypeValue;
+
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java

@@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * @description:
  * @author: dimengzhe
@@ -48,6 +46,15 @@ public class AsBusrepairInventorybillDetailSDto {
     private String warehouseRackSid;
     @ApiModelProperty("库位编号")
     private String warehouseRackCode;
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
+
 
     @ApiModelProperty("需求数量")
     private String needCount;

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java

@@ -43,6 +43,15 @@ public class SalesGoodsVo {
     @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
 
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
+
     //规格型号
     private String goodsSkuOwnSpec;
     //仓库Sid

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml

@@ -115,8 +115,10 @@
         i.supplierSid as billObjSid,
         i.warehouseSid,
         i.warehouseName,
-        wa.sid as areaSid,
+        wa.sid as wareAreaSid,
-        wa.areaName,
+        wa.areaName wareAreaName,
+        wz.sid wareZoneSid,
+        wz.zoneName wareZoneName,
         i.warehouseRackSid,
         i.warehouseRackCode,
         IF( IFNULL(i.taxRate,0) > 0, '0', '1' ) AS isTaxRate,
@@ -128,6 +130,7 @@
         LEFT JOIN yxt_wms.wms_warehouse_rack as ra ON ra.sid = i.warehouseRackSid
         LEFT JOIN yxt_wms.wms_warehouse_area as wa ON ra.locationSid = wa.sid
         LEFT JOIN yxt_wms.wms_warehouse_info as wi ON wi.sid = i.warehouseSid
+        LEFT JOIN yxt_wms.wms_warehouse_zone as wz ON wz.sid = ra.zoneSid
         LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = i.goodsID
         <where>${ew.sqlSegment}</where>
     </select>

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java

@@ -409,6 +409,12 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
                     if (StringUtils.isNotBlank(smsSalesBillDetail.getSupplierName())) {
                         salesGoodsVo.setBillObjName(smsSalesBillDetail.getSupplierName());
                     }
+                    if (StringUtils.isNotBlank(smsSalesBillDetail.getWareAreaSid())) {
+                        salesGoodsVo.setAreaSid(smsSalesBillDetail.getWareAreaSid());
+                    }
+                    if (StringUtils.isNotBlank(smsSalesBillDetail.getWareAreaName())) {
+                        salesGoodsVo.setAreaName(smsSalesBillDetail.getWareAreaName());
+                    }
                     goodsVos.add(salesGoodsVo);
                 }
                 vo.setGoodsVos(goodsVos);
@@ -443,14 +449,6 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
                 }
                 vo.setAitemVos(aitemVos);
             }
-
-//            SettlementVo settlementVo = new SettlementVo();
-//            FmsReceivesettle receivesettle = fmsReceivesettleFeign.fetchBySourceSid(sid).getData();
-//            if (null != receivesettle) {
-//                BeanUtil.copyProperties(receivesettle, settlementVo);
-//                settlementVo.setSettleTime(DateUtil.formatDate(receivesettle.getSettleTime()));
-//                vo.setSettlementVo(settlementVo);
-//            }
         }
         return vo;
     }

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java

@@ -48,6 +48,15 @@ public class SmsWmsInventorySalesVo implements Vo {
      */
     private String areaName;
     private String areaSid;
+
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
     /**
      * 供应商
      */

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java

@@ -88,10 +88,14 @@ public class SmsSalesBillDetail extends BaseEntity {
     private String warehouseSid;
     //仓库
     private String warehouseName;
-    //库区sid
+    @ApiModelProperty("库区sid")
-    private String areaSid;
+    private String wareAreaSid;
-    //库区
+    @ApiModelProperty("库区名称")
-    private String areaName;
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
     //库位sid
     private String warehouseRackSid;
     //库位编码

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryExcelVo.java

@@ -22,6 +22,10 @@ public class WmsOldInventoryExcelVo {
     @ExportEntityMap(CnName = "车牌号", EnName = "vehMark")
     private String vehMark;
 
+    //维修单号
+    @ExportEntityMap(CnName = "维修单号", EnName = "sourceBillNo")
+    private String sourceBillNo;
+
     //商品ID
     @ExportEntityMap(CnName = "商品ID", EnName = "goodsID")
     private String goodsID;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java

@@ -261,6 +261,9 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("a.vinNo", query.getVinNo());
         }
+        if (StringUtils.isNotBlank(query.getSourceBillNo())) {
+            qw.like("a.sourceBillNo", query.getSourceBillNo());
+        }
         IPage<WmsOldInventory> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsOldInventoryPageListVo> pagging = baseMapper.oldPageList(page, qw);
         PagerVo<WmsOldInventoryPageListVo> p = PagerUtil.pageToVo(pagging, null);
@@ -349,6 +352,9 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("a.vinNo", query.getVinNo());
         }
+        if (StringUtils.isNotBlank(query.getSourceBillNo())) {
+            qw.like("a.sourceBillNo", query.getSourceBillNo());
+        }
         List<WmsOldInventoryExcelVo> list = baseMapper.listExcel(qw);
         list.removeAll(Collections.singleton(null));
         return list;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java

@@ -36,7 +36,14 @@ public class WmsOutBillInventoryVo {
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
-
+    @ApiModelProperty("库区sid")
+    private String wareAreaSid;
+    @ApiModelProperty("库区名称")
+    private String wareAreaName;
+    @ApiModelProperty("区域sid")
+    private String wareZoneSid;
+    @ApiModelProperty("区域名称")
+    private String wareZoneName;
     private String price;//销售单价
     private String cost;//入库单价
     private String outboundCount;// 已出库数量

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml

@@ -43,6 +43,10 @@
         wi.warehouseName,
         wi.warehouseRackSid,
         wi.warehouseRackCode,
+        wa.sid wareAreaSid,
+        wa.areaName wareAreaName,
+        wz.sid wareZoneSid,
+        wz.zoneName wareZoneName,
         wi.count,
         wi.sid inventorySid,
         wi.supplierName,
@@ -50,6 +54,9 @@
         s.price as money
         from wms_inventory wi
         LEFT JOIN yxt_wms.wms_warehouse_info as wh ON wh.sid = wi.warehouseSid
+        LEFT JOIN yxt_wms.wms_warehouse_rack as wr ON wr.sid = wi.warehouseRackSid
+        LEFT JOIN yxt_wms.wms_warehouse_area as wa ON wa.sid = wr.locationSid
+        LEFT JOIN yxt_wms.wms_warehouse_zone as wz ON wz.sid = wr.zoneSid
         LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = wi.goodsID
         <where>
             ${ew.sqlSegment}