|
|
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
@@ -2033,7 +2034,9 @@ public class KwoTradeOrderService {
|
|
|
unitList.forEach(e -> {
|
|
|
KwoTradeOrderUnit unit = BeanUtil.copyProperties(e, KwoTradeOrderUnit.class);
|
|
|
unit.setId(new IdWorker(1).nextId());
|
|
|
- unit.setTOrderId(order.getId()).setUnitType(e.getUnitType()).setTOrderNo(order.getTOrderNo()).setTopEntId(e.getEntId());
|
|
|
+ unit.setTOrderId(order.getId())
|
|
|
+ .setTOrderNo(order.getTOrderNo()).setTopEntId(e.getEntId());
|
|
|
+ unit.setUnitType(StrUtil.equals(e.getUnitType(), "1") ? "2" : "1");//贸易合同和订单的单位类型相反
|
|
|
list.add(unit);
|
|
|
});
|
|
|
kwoTradeOrderUnitService.insertBatch(list);
|