1.单证核验-订单主副单位bugfix

2.承运订单导入去除商品信息维护管理查询
3.贸易dubbo接口  用户信息修改为传递

sckw-modules/sckw-order/src/main/java/com/sckw/order/dubbo/TradeOrderInfoServiceImpl.java

@@ -248,7 +248,7 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult completeLogisticsOrderV1(Long updateBy, String updateByName,Long tOrderId,List<GoodsLoadingV1Param> loading) {
+    public HttpResult completeLogisticsOrderV1(Long updateBy, String updateByName, Long tOrderId, List<GoodsLoadingV1Param> loading) {
         /*1、数据校验*/
         if (Objects.isNull(updateBy) || StringUtils.isBlank(updateByName)) {
             return HttpResult.error("操作人信息不能为空!");

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/Import/KwtAcceptCarriageOrderImportService.java

@@ -29,7 +29,6 @@ import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.payment.api.dubbo.PaymentDubboService;
 import com.sckw.product.api.dubbo.GoodsInfoService;
-import com.sckw.product.api.model.KwpGoods;
 import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.stream.enums.MessageEnum;
 import com.sckw.system.api.RemoteSystemService;
@@ -463,13 +462,13 @@ public class KwtAcceptCarriageOrderImportService {
      */
     private void saveLogisticsOrderGoods(LogisticsOrderExcelImportDTO excelImport, Long lOrderId, String lOrderNo) {
         String goodsName = excelImport.getGoodsName().trim();
-        KwpGoods kwpGoods = goodsInfoService.getGoodsByGoodsName(goodsName);
+//        KwpGoods kwpGoods = goodsInfoService.getGoodsByGoodsName(goodsName);
         KwtLogisticsOrderGoods goods = new KwtLogisticsOrderGoods();
         goods.setId(new IdWorker(NumberConstant.ONE).nextId());
         goods.setLOrderId(lOrderId);
         goods.setLOrderNo(lOrderNo);
-        goods.setGoodsName(kwpGoods.getName());
-        goods.setGoodsType(kwpGoods.getGoodsType());
+        goods.setGoodsName(goodsName);
+//        goods.setGoodsType(kwpGoods.getGoodsType());
         goods.setStatus(NumberConstant.ZERO);
         goods.setCreateBy(LoginUserHolder.getUserId());
         goods.setCreateTime(new Date());
@@ -787,10 +786,13 @@ public class KwtAcceptCarriageOrderImportService {
             }
 
             String goodsName = excelImport.getGoodsName().trim();
-            KwpGoods goods = goodsInfoService.getGoodsByGoodsName(goodsName);
-            if (goods == null || goods.getId() == null) {
-                throw new RuntimeException("第" + number + "行货物信息不存在");
+            if (StringUtils.isBlank(goodsName)){
+                throw new RuntimeException("第" + number + "行货物信息必填写");
             }
+//            KwpGoods goods = goodsInfoService.getGoodsByGoodsName(goodsName);
+//            if (goods == null || goods.getId() == null) {
+//                throw new RuntimeException("第" + number + "行货物信息不存在");
+//            }
             String goodsModelType = excelImport.getGoodsModel().trim();
             if (!goodsModel.contains(goodsModelType)) {
                 throw new RuntimeException("第" + number + "行商品分类信息不存在");

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -210,7 +210,7 @@
         left join kwt_waybill_order_ticket wot2 on wot2.w_order_id = wo.id and wot2.type = 2 and wot2.del_flag = 0
         left join kwt_logistics_order lo on lo.id = wo.l_order_id
         where wo.del_flag = 0 and lo.del_flag = 0
-        and wot1.unit = 0 and wot2.unit = 0
+<!--        and wot1.unit = 0 and wot2.unit = 0-->
         <if test="driverId != null and driverId != ''">
             and wo.driver_id = #{driverId, jdbcType=BIGINT}
         </if>