md

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

@@ -27,6 +27,14 @@ public interface IEmisCommissionProfitService
      */
     public EmisCommissionProfit selectEmisCommissionProfitById(Long id);
 
+
+   /**
+    * 重新计算提成根据billCode
+    * @param billCode
+    * @return
+    */
+   public int reCalcCommissionProfitByBillCode(String billCode);
+
     /**
      * 查询员工提成表列表
      * 

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

@@ -54,6 +54,9 @@ public class EmisCommissionExpressionServiceImpl implements IEmisCommissionExpre
         return emisCommissionExpressionMapper.selectEmisCommissionExpressionList(emisCommissionExpression);
     }
 
+
+
+
     /**
      * 检查是否重复
      * 
@@ -114,4 +117,8 @@ public class EmisCommissionExpressionServiceImpl implements IEmisCommissionExpre
         return emisCommissionExpressionMapper.deleteEmisCommissionExpressionById(id);
     }
 
+
+
+
+
 }

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

@@ -11,24 +11,53 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.List;
+
+import com.xdadan.erp.emis.domain.EmisWaybill;
+import com.xdadan.erp.emis.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisCommissionProfit;
 import com.xdadan.erp.emis.mapper.EmisCommissionProfitMapper;
 import com.xdadan.erp.emis.service.IEmisCommissionProfitService;
+import org.springframework.transaction.annotation.Transactional;
 
-/**
+ /**
  * 员工提成表Service业务层处理
  * 
  * @author linfso
  * @date 2024-10-24 01:46:36
  */
 @Service
-public class EmisCommissionProfitServiceImpl implements IEmisCommissionProfitService 
+public class EmisCommissionProfitServiceImpl extends EmisBaseService implements IEmisCommissionProfitService
 {
     @Autowired
     private EmisCommissionProfitMapper emisCommissionProfitMapper;
 
+
+
+
+    /**
+     * 根据单号重新计算提成
+     */
+    @Override
+    @Transactional
+    public int reCalcCommissionProfitByBillCode(String billCode)
+    {
+
+        // 获取运单信息
+        EmisWaybill waybill = getWaybillByBillCode(billCode);
+
+        // 取件方式
+        String pickUpMethod=waybill.getPickupMethod();
+        String takePieceEmployeeCode=waybill.getTakePieceEmployeeCode();
+        String operateEmployeeCode=waybill.getOperateEmployeeCode();
+
+
+        return  1;
+
+    }
+
+
     /**
      * 查询员工提成表
      * 

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

@@ -3391,10 +3391,22 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             String fileName = URLEncoder.encode(emisWaybillOld.getIntoWarehouseBillCode(), "UTF-8");
 
 
-            // 货物清单
+            // 货物清单 使用货物总览
             EmisWaybillCargo queryCargo = new EmisWaybillCargo();
-            queryCargo.setWaybillId(emisWaybillOld.getId());
-            List<EmisWaybillCargo> cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
+//            queryCargo.setWaybillId(emisWaybillOld.getId());
+//            List<EmisWaybillCargo> cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
+            List<EmisWaybillCargo> cargoList = new ArrayList<EmisWaybillCargo>();
+
+            EmisWaybillCargo cargoGoods = new EmisWaybillCargo();
+//            [cargoQty]	[weight]	[volume]	[length]*[width]*[height]	[goodsName]
+            cargoGoods.setGoodsName(emisWaybillOld.getGoodsInfo());
+            cargoGoods.setWeight(emisWaybillOld.getBillWeight());
+            cargoGoods.setVolume(emisWaybillOld.getTotalVolume());
+            cargoGoods.setLength(BigDecimal.ZERO);
+            cargoGoods.setWidth(BigDecimal.ZERO);
+            cargoGoods.setHeight(BigDecimal.ZERO);
+            cargoGoods.setCargoQty(emisWaybillOld.getParcelQty());
+            cargoList.add(cargoGoods);
 
             // 生成条码
             int width = 400;
@@ -3450,7 +3462,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
             fillMap.put("barcode", Pictures.ofBufferedImage(barcodeImageBuffer, PictureType.JPEG).size(width, height).create());
 
-            fillMap.put("cargoList", emisWaybillOld.getCargoList());
+            fillMap.put("cargoList", cargoList);
+//            fillMap.put("cargoList", emisWaybillOld.getCargoList());
 
             // 生成模版
             XWPFTemplate template = XWPFTemplate.compile(fis, config).render(fillMap);