Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml

@@ -16,7 +16,7 @@
                SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
                       ssc.uploadMoney + ssc.secondaryUploadMoney))                    uploadMoney,
                SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))             stayDetermineMoney,
-               SUM(ssc.adjustmentMoney)                                               adjustmentMoney,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                       adjustmentMoney,
                SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
                SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
                       ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
@@ -41,7 +41,7 @@
                SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
                       ssc.uploadMoney + ssc.secondaryUploadMoney))                    uploadMoney,
                SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))             stayDetermineMoney,
-               SUM(ssc.adjustmentMoney)                                               adjustmentMoney,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                       adjustmentMoney,
                SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
                SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
                       ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
@@ -84,7 +84,7 @@
                       ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
                       ssc.secondTreatCost + ssc.secondSuppCost))                   AS moneyTotal,
                SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))             stayDetermineMoneyTotal,
-               SUM(ssc.adjustmentMoney)                                               adjustmentMoneyTotal,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                       adjustmentMoneyTotal,
                SUM(IF(ssc.isAdjustment = '是',
                       ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
                       ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
@@ -108,7 +108,7 @@
                       ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
                       ssc.secondTreatCost + ssc.secondSuppCost))                   AS   money,
                SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))               stayDetermineMoney,
-               SUM(ssc.adjustmentMoney)                                                 adjustmentMoney,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                         adjustmentMoney,
                SUM(IF(ssc.isAdjustment = '是',
                       ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
                       ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
@@ -134,7 +134,7 @@
                       ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
                       ssc.secondTreatCost + ssc.secondSuppCost))                   AS     money,
                SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))                 stayDetermineMoney,
-               SUM(ssc.adjustmentMoney)                                                   adjustmentMoney,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                           adjustmentMoney,
                SUM(IF(ssc.isAdjustment = '是',
                       ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
                       ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml

@@ -6,14 +6,14 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo">
         SELECT
         ssrwa.*,
-        SUM(ssr.`estimateRebate`) withRebateTotal,
+        SUM(ssr.estimateRebate) withRebateTotal,
         SUM(ssr.expectItureCost + ssr.expectTreatCost + ssr.expectSuppCost) as withholdCost
         FROM
         scm_special_rebate_with_apply ssrwa
         LEFT JOIN scm_special_rebate_with ssrw
-        ON ssrwa.`sid` = ssrw.`mainSid`
+        ON ssrwa.sid = ssrw.mainSid
         LEFT JOIN scm_special_rebate ssr
-        ON ssr.`sid` = ssrw.`specialRebateSid`
+        ON ssr.sid = ssrw.specialRebateSid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml

@@ -6,18 +6,18 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo">
         SELECT
         svc.*,
-        SUM(svr.`estimateRebate`) estimateRebate,
+        SUM(svr.estimateRebate) estimateRebate,
-        SUM(svr.`uploadMoney`) uploadMoney,
+        SUM(svr.uploadMoney) uploadMoney,
-        SUM(svr.`stayDetermineMoney`) stayDetermineMoney,
+        SUM(svr.stayDetermineMoney) stayDetermineMoney,
-        SUM(svr.`adjustmentMoney`) adjustmentMoney,
+        SUM(svr.adjustmentMoney) adjustmentMoney,
         SUM(svr.onceTreatCost + svr.onceSuppCost + svr.secondTreatCost + svr.secondSuppCost) money,
         SUM(svr.expectTreatCost + svr.expectSuppCost) withholdCost
         FROM
         scm_vehrebate_checkapply svc
         LEFT JOIN scm_vehrebate_checkapplydetail svcd
-        ON svc.`sid` = svcd.`mainSid`
+        ON svc.sid = svcd.mainSid
         LEFT JOIN scm_veh_rebate svr
-        ON svr.`sid` = svcd.`vehRebateSid`
+        ON svr.sid = svcd.vehRebateSid
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -41,7 +41,9 @@
                 <el-date-picker v-model="listQuery.params.uploadEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
               <el-form-item label="返利类型">
-                <el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
+                <el-select v-model="listQuery.params.rebateTypeValue" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
               </el-form-item>
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
@@ -417,7 +419,7 @@ import ButtonBar from '@/components/ButtonBar'
 import bicyclerebatecheck from './bicyclerebatecheck'
 import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
 import bicyclerebatetobecheckedByUpdate from './bicyclerebatetobecheckedByUpdate'
-import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BicycleRebateToBeChecked',
@@ -457,6 +459,7 @@ export default {
       listAll: [],
       sids: [],
       FormLoading: false,
+      rebateType_list: [],
       state_list: [
         {
           dictKey: '0',
@@ -562,6 +565,11 @@ export default {
   },
   methods: {
     init() {
+      getTypeValueList({ type: 'rebateType', groupNum: 'DC' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue

@@ -313,9 +313,9 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
             } else {
-              return prev
+              return Math.round((parseFloat(prev)) * 100) / 100
             }
           }, 0)
           sums[index] += ''

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

@@ -400,7 +400,7 @@ import ButtonBar from '@/components/ButtonBar'
 import specialrebatecheck from './specialrebatecheck'
 import specialrebatecheckAdd from './specialrebatecheckAdd'
 import specialrebatetobecheckedByUpdate from './specialrebatetobecheckedByUpdate'
-import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'SpecialRebateToBeChecked',
@@ -552,7 +552,7 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
+      getTypeValueList({ type: 'rebateType', groupNum: 'ZX' }).then((res) => {
         if (res.success) {
           this.rebateType_list = res.data
         }

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue

@@ -354,40 +354,20 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
             } else {
-              return prev
+              return Math.round((parseFloat(prev)) * 100) / 100
             }
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else if (column.property === 'expectItureCost') {
+        } else if (column.property === 'expectItureCost' || column.property === 'expectTreatCost' || column.property === 'expectSuppCost') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
             } else {
-              return prev
+              return Math.round((parseFloat(prev)) * 100) / 100
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectTreatCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectSuppCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
             }
           }, 0)
           sums[index] += ''

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue

@@ -147,43 +147,13 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'withRebate') {
+        if (column.property === 'withRebate' || column.property === 'expectItureCost' || column.property === 'expectTreatCost' || column.property === 'expectSuppCost') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
             } else {
-              return prev
+              return Math.round((parseFloat(prev)) * 100) / 100
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectItureCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectTreatCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectSuppCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
             }
           }, 0)
           sums[index] += ''

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue

@@ -251,43 +251,13 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'withRebate') {
+        if (column.property === 'withRebate' || column.property === 'expectItureCost' || column.property === 'expectTreatCost' || column.property === 'expectSuppCost') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
             } else {
-              return prev
+              return Math.round((parseFloat(prev)) * 100) / 100
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectItureCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectTreatCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectSuppCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
             }
           }, 0)
           sums[index] += ''

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue

@@ -333,47 +333,27 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
             } else {
-              return prev
+              return Math.round((parseFloat(prev)) * 100) / 100
             }
           }, 0)
           sums[index] += ''
           this.formobj.withRebateTotal = sums[index] += ''
-        } else if (column.property === 'expectItureCost') {
+        } else if (column.property === 'expectItureCost' || column.property === 'expectTreatCost' || column.property === 'expectSuppCost') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
             } else {
-              return prev
+              return Math.round((parseFloat(prev)) * 100) / 100
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectTreatCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectSuppCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
             }
           }, 0)
           sums[index] += ''
         }
       })
       return sums
-    }
+    },
   }
 }
 </script>

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue

@@ -182,43 +182,13 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'withRebate') {
+        if (column.property === 'withRebate' || column.property === 'expectItureCost' || column.property === 'expectTreatCost' || column.property === 'expectSuppCost') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
             } else {
-              return prev
+              return Math.round((parseFloat(prev)) * 100) / 100
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectItureCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectTreatCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
-            }
-          }, 0)
-          sums[index] += ''
-        } else if (column.property === 'expectSuppCost') {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!isNaN(value)) {
-              return prev + curr
-            } else {
-              return prev
             }
           }, 0)
           sums[index] += ''

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java

@@ -39,7 +39,7 @@ import javax.validation.Valid;
 
 @Api(tags = "商务宴请事前申请")
 @RestController
-@RequestMapping("v1/adfeteapply")
+@RequestMapping("v1/businessBanquetapply")
 public class AdFeteApplyRest {
 
 	@Autowired

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSenpircarpulApplyRest.java

@@ -39,7 +39,7 @@ import javax.validation.Valid;
 
 @Api(tags = "总经理级固定私车公用申请")
 @RestController
-@RequestMapping("v1/adsenpircarpulapply")
+@RequestMapping("v1/fixedPrivateCarPublicUseapply")
 public class AdSenpircarpulApplyRest {
 
 	@Autowired

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java

@@ -55,6 +55,12 @@ public class AdSenpircarpulDetailService extends MybatisBaseService<AdSenpircarp
 				AdSenpircarpulDetail adSenpircarpulDetail = new AdSenpircarpulDetail();
 				BeanUtil.copyProperties(details, adSenpircarpulDetail);
 				adSenpircarpulDetail.setMainSid(sid);
+				adSenpircarpulDetail.setUserSid(details.getUserKey());
+				adSenpircarpulDetail.setUserName(details.getUserValue());
+				adSenpircarpulDetail.setDeptSid(details.getDeptKey());
+				adSenpircarpulDetail.setDeptName(details.getDeptValue());
+				adSenpircarpulDetail.setPostSid(details.getJobKey());
+				adSenpircarpulDetail.setPostName(details.getJobValue());
 				baseMapper.insert(adSenpircarpulDetail);
 				List<String> detailFiles = details.getDetailFiles();
 				saveFiles(adSenpircarpulDetail.getSid(), detailFiles, OaFileEnum.ADSENPIRCARPULAPPLY.getAttachType(), "");

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml

@@ -222,9 +222,11 @@
 		CONCAT(
 		d.warehouseName,
 		'-',
-		d.warehouseArea,
+		z.zoneName,
 		'-',
-		d.warehouseRackName
+		d.warehouseArea,
+		'\n',
+		r.rackCode
 		) AS title,
 		SUM(bookCount) - SUM(realCount) AS surplusNumber,
 		SUM(bookCount) AS totalNumber,
@@ -234,6 +236,8 @@
 		SUM(realCount) AS actualNumber
 		FROM
 		wms_inventory_checkbill_detail d
+		LEFT JOIN wms_warehouse_rack r ON d.warehouseRackSid = r.sid
+		LEFT JOIN wms_warehouse_zone z on z.sid = r.zoneSid
 		LEFT JOIN wms_inventory_checkbill c
 		ON d.billSid = c.sid
 		<where> ${ew.sqlSegment} </where>