md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java

@@ -70,15 +70,20 @@ public class EmisCommonToolsController extends EmisBaseController
 //            List<Map> empStatList=emisBaseService.selectWaybillStatByEmpCode(getLoginUser().getUser().getEmpCode());
 
             EmisWaybill emisWaybill = new EmisWaybill();
+            setPrivParams(emisWaybill);
 
             Map orderMap=emisBaseService.getWaybillStatMap(emisWaybill);
 
             Map orderStatMap = new HashMap();
-            int waitTakeNum=(int)(Math.random()*100+20);
+            int waitTakeNum=(int)orderMap.getOrDefault("waitDoNum",0);
+            int takeNum=(int)orderMap.getOrDefault("hasDoNum",0);
+
+            int dispNum=(int)orderMap.getOrDefault("dispNum",0);
+            int signedNum=(int)orderMap.getOrDefault("signedNum",0);
             orderStatMap.put("waitTakeNum",waitTakeNum);
-            orderStatMap.put("takeNum",waitTakeNum+8);
-            orderStatMap.put("dispNum",waitTakeNum-10);
-            orderStatMap.put("signedNum",waitTakeNum-15);
+            orderStatMap.put("takeNum",takeNum);
+            orderStatMap.put("dispNum",dispNum);
+            orderStatMap.put("signedNum",signedNum);
             statMap.put("orderStat",orderStatMap);
 
             // 获取员工佣金信息

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -434,6 +434,8 @@ public class EmisBaseService {
                  return destinationList.get(0);
              }
          }
+
+         return null;
      }
 
 

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -1224,13 +1224,23 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                         double fee = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
 
                         fee=WaybillHelper.calcSettledFee(fee,quoteItem.getPriceType());
+                        // 如果低于最低报价，则使用最低报价来计算
+                        if( fee < quoteItem.getLeastPrice().doubleValue() ){
+                            fee = quoteItem.getLeastPrice().doubleValue();
+                            feeItem.setRemark("must > "+quoteItem.getLeastPrice().doubleValue());
+                        }else{
+                            feeItem.setRemark(feeItem.getCalcExp());
+                        }
 
                         feeItem.setFee(BigDecimal.valueOf(fee));
                         feeItem.setRealFee(BigDecimal.valueOf(fee));
 
                         log.info("计算后费用:"+feeItem.getFee());
+
+
+
                         totalFee=totalFee+fee;
-                        feeItem.setRemark(feeItem.getCalcExp());
+
                         feeItem.setBlAutoGen("1");
 
                         feeList.add(feeItem);

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -778,9 +778,6 @@
                         UNION
                         SELECT #{params.privSiteCode} FROM dual
                     )
-
-                    or a.salesmen=#{params.privEmpName}
-                    or a.payee=#{params.privEmpName}
                     or a.operate_employee_code=#{params.privEmpCode}
                     or a.take_piece_employee_code=#{params.privEmpCode}
                 )
@@ -790,6 +787,9 @@
         group by a.waybill_status
     </select>
 
+
+<!--    or a.salesmen=#{params.privEmpName}-->
+<!--    or a.payee=#{params.privEmpName}-->
     <!--  通用权限判断 参数 isPrivQuery  -->
 
     <select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">