1.贸易订单增加单位处理

2.修改单证核验时，数据bug fix

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -19,6 +19,7 @@ import com.sckw.report.service.param.*;
 import com.sckw.report.service.vo.OrderListRes;
 import com.sckw.report.service.vo.TradeOrderAppStatisticVO;
 import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.SysDictResDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -104,6 +105,7 @@ public class KwOrderService {
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(
                 DictTypeEnum.TORDER_STATUS.getType(), DictTypeEnum.TRADE_TYPE.getType(), DictTypeEnum.DELIVERY_TYPE.getType(),
                 DictTypeEnum.PICKUP_TYPE.getType(), DictTypeEnum.TORDER_SOURCE.getType()));
+        Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
         Map<String, String> statusMap, tradeMap, deliveryMap, pickupMap, sourceMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             statusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_STATUS.getType())) ?
@@ -144,6 +146,8 @@ public class KwOrderService {
                     .setUnloadDetailAddressInfo(unloadCityName + unloadDetailAddress)
                     .setUnitPrice(setScale(e.getUnitPrice()))
                     .setPrice(setScale(e.getPrice()))
+                    .setUnit(e.getUnit())
+                    .setUnitLabel(unitType == null ? e.getUnit() : (unitType.get(e.getUnit()) == null ? e.getUnit() : unitType.get(e.getUnit()).getLabel()))
                     .setAmount(setScale(e.getAmount()))
                     .setEntrustAmount(setScale(e.getEntrustAmount()))
                     .setActualAmount(setScale(e.getActualAmount()))

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/OrderListRes.java

@@ -199,6 +199,17 @@ public class OrderListRes {
      * 备注
      */
     private String remark;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 单位
+     */
+    private String unitLabel;
+
     /**
      * 创建人e
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderTicketService.java

@@ -4,8 +4,8 @@ import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.DateUtils;
 import com.sckw.core.utils.FileUtils;
+import com.sckw.core.utils.IdWorker;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
@@ -18,6 +18,7 @@ import com.sckw.transport.model.vo.WaybillOrderLoadingVO;
 import com.sckw.transport.model.vo.WaybillTicketVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -45,15 +46,15 @@ public class KwtWaybillOrderTicketService {
 
     /**
      * @param loading 装载信息
-     * @param unit 运单分配单位
-     * @param amount 运单装载量
+     * @param unit    运单分配单位
+     * @param amount  运单装载量
      * @desc 计算装载量
      * @author zk
      * @date 2023/12/6
      */
     public BigDecimal countAmount(List<WaybillOrderTicketLoadingDto> loading, String unit, BigDecimal amount) {
         if (CollectionUtils.isNotEmpty(loading)) {
-            for (WaybillOrderTicketLoadingDto ticket:loading) {
+            for (WaybillOrderTicketLoadingDto ticket : loading) {
                 if (unit.equals(ticket.getUnit())) {
                     return ticket.getAmount();
                 }
@@ -63,12 +64,11 @@ public class KwtWaybillOrderTicketService {
     }
 
     /**
-     *
-     * @param loading 装载信息
-     * @param wOrderId 运单ID
-     * @param urls 榜单地址
+     * @param loading     装载信息
+     * @param wOrderId    运单ID
+     * @param urls        榜单地址
      * @param operateTime 操作时间
-     * @param type 装卸货类型
+     * @param type        装卸货类型
      * @desc 更新办单
      * @author zk
      * @date 2023/12/6
@@ -89,12 +89,11 @@ public class KwtWaybillOrderTicketService {
     }
 
     /**
-     *
-     * @param loading 装载信息
-     * @param wOrderId 运单ID
-     * @param urls 榜单地址
+     * @param loading     装载信息
+     * @param wOrderId    运单ID
+     * @param urls        榜单地址
      * @param operateTime 操作时间
-     * @param type 装卸货类型
+     * @param type        装卸货类型
      * @desc 更新办单
      * @author zk
      * @date 2023/12/6
@@ -102,27 +101,29 @@ public class KwtWaybillOrderTicketService {
     public void editTicket(List<WaybillOrderTicketLoadingDto> loading, Long wOrderId, String urls, Date operateTime, int type) {
         urls = FileUtils.replaceAllBatch(urls);
         if (CollectionUtils.isNotEmpty(loading)) {
-            for (WaybillOrderTicketLoadingDto ticket:loading) {
+            for (WaybillOrderTicketLoadingDto ticket : loading) {
                 KwtWaybillOrderTicket oldTicket = waybillOrderTicketMapper.findWaybillOrderTicketV1(wOrderId, type, ticket.getUnit());
                 Boolean bool1 = oldTicket.getAmount().doubleValue() == ticket.getAmount().doubleValue();
                 Boolean bool2 = oldTicket.getUrls().equals(urls);
 
                 //对比是否存在更新
-                if (oldTicket != null && bool1 && bool2)  {
-                    continue;
-                }
+//                if (oldTicket != null && bool1 && bool2)  {
+//                    continue;
+//                }
 
                 //删除
                 oldTicket.setDelFlag(Global.YES);
                 waybillOrderTicketMapper.updateById(oldTicket);
-
                 //新增
                 KwtWaybillOrderTicket waybillOrderTicket = new KwtWaybillOrderTicket();
+                BeanUtils.copyProperties(oldTicket, waybillOrderTicket);
                 waybillOrderTicket.setWOrderId(wOrderId);
                 waybillOrderTicket.setType(type);
                 waybillOrderTicket.setUnit(ticket.getUnit());
                 waybillOrderTicket.setAmount(ticket.getAmount());
                 waybillOrderTicket.setUrls(urls);
+                waybillOrderTicket.setDelFlag(0);
+                waybillOrderTicket.setId(new IdWorker(NumberConstant.ONE).nextId());
                 //waybillOrderTicket.setOperateTime(operateTime);
                 waybillOrderTicketMapper.insert(waybillOrderTicket);
             }
@@ -131,9 +132,10 @@ public class KwtWaybillOrderTicketService {
 
     /**
      * 运单详情单证信息
-     * @param wOrderId 运单ID
-     * @param unit 运单委派单位
-     * @param deficitAmount 亏吨
+     *
+     * @param wOrderId          运单ID
+     * @param unit              运单委派单位
+     * @param deficitAmount     亏吨
      * @param deficitRealAmount 扣亏量
      * @return 单证信息
      */
@@ -176,8 +178,9 @@ public class KwtWaybillOrderTicketService {
 
     /**
      * 单证信息
+     *
      * @param waybillOrder 运单
-     * @param type 单证类型
+     * @param type         单证类型
      * @return 运载信息
      */
     public List<WaybillOrderLoadingVO> agreement(KwtWaybillOrder waybillOrder, int type) {