Merge remote-tracking branch 'origin/master'

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/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
-            }
-          }, 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
+              return Math.round((parseFloat(prev)) * 100) / 100
             }
           }, 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
-            }
-          }, 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
+              return Math.round((parseFloat(prev)) * 100) / 100
             }
           }, 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
-            }
-          }, 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
+              return Math.round((parseFloat(prev)) * 100) / 100
             }
           }, 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
-            }
-          }, 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
+              return Math.round((parseFloat(prev)) * 100) / 100
             }
           }, 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
-            }
-          }, 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
+              return Math.round((parseFloat(prev)) * 100) / 100
             }
           }, 0)
           sums[index] += ''

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -244,7 +244,7 @@
     </select>
 
     <select id="getToDoNum" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM
+        SELECT COUNT(a.sid) FROM
             (SELECT
                  b.sid
              FROM

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -479,12 +479,13 @@
         i.supplierName provider,
         i.taxRate rate,
         i.unit,
-        CONCAT(i.warehouseName, '-',a.areaName, '-',i.warehouseRackCode ) title
+        CONCAT(i.warehouseName, '-',z.zoneName,'-',a.areaName, ' ',i.warehouseRackCode ) title
         FROM
         wms_inventory AS i
         LEFT JOIN wms_warehouse_rack as r ON i.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area as a ON r.locationSid = a.sid
         LEFT JOIN wms_warehouse_info as wi ON wi.sid = i.warehouseSid
+        LEFT JOIN wms_warehouse_zone as z ON z.sid = r.zoneSid
         LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
@@ -529,7 +530,7 @@
         DATEDIFF( NOW(), i.firstInDate ) inventoryAge,
         i.cost price,
         i.unit,
-        CONCAT( i.warehouseName, '-', a.areaName, '-', i.warehouseRackCode ) title,
+        CONCAT( i.warehouseName,'-', z.zoneName, '-', a.areaName, ' ', i.warehouseRackCode ) title,
         i.sid,
         s.orgSidPath,
         i.createBySid
@@ -538,7 +539,9 @@
         LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
         LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid
+        LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid
         LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
+        where w.warehouseTypeValue = '旧件库'
         ) e) a
         <where>
             ${ew.sqlSegment}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -984,6 +984,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                     .or().like("i.manufacturerName", query.getName())
                     .or().like("i.supplierName", query.getName())
                     .or().like("i.goodsSkuCode", query.getName())
+                    .or().like("z.zoneName", query.getName())
             );
         }
         qw.notLike("i.goodsID","-O");
@@ -1109,7 +1110,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("a.title", query.getName())
                     .or().like("a.goodsSpuName", query.getName())
-                    .or().like("a.manufacturerName", query.getName())
+                    .or().like("a.factory", query.getName())
                     .or().like("a.goodsSkuCode", query.getName())
                     .or().like("a.repairId", query.getName())
             );

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -650,7 +650,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                     WmsHouseInfoVo houseInfoVo = wmsHouseInfoVoResultBean.getData();
                     if (null != houseInfoVo) {
                         vo.setHouseCode(houseCode);
-                        vo.setHouseName(houseInfoVo.getWarehouseName() + "-" + houseInfoVo.getWareAreaName());
+                        vo.setHouseName(houseInfoVo.getWarehouseName() + "-" + houseInfoVo.getWarehouseZoneName() + "-" + houseInfoVo.getWareAreaName());
                         vo.setHouseAddress(houseInfoVo.getWarehouseRackCode());
                         vo.setType(1);
                     }