fix: 修复关联显示异常，查询异常

src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java

@@ -120,6 +120,7 @@ public class OmsSaleOrderController {
         PageUtil.startPage();
         LambdaQueryWrapper<OmsSaleOrder> orderWrapper = new LambdaQueryWrapper<>(param);
         orderWrapper.orderByDesc(OmsSaleOrder::getId);
+
         if(param.getCheckStartTime()!=null){
             orderWrapper.ge(OmsSaleOrder::getCheckTime,param.getCheckStartTime().atStartOfDay());
         }

src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java

@@ -264,5 +264,6 @@ public class OmsSaleOrder implements Serializable {
      */
     @TableField(exist = false)
     private Object discountRateInfo;
+
 }
 

src/main/java/com/qs/serve/modules/oms/entity/dto/SeeYonOrderItemDTO.java

@@ -30,6 +30,7 @@ public class SeeYonOrderItemDTO {
     private String skuTitle;
     private String skuAddCode;
     private String skuCode;
+    private String skuUnit;
     private String batchCode;
     private String skuCategories;
     private String specVal;

src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderOptionsServiceImpl.java

@@ -244,6 +244,7 @@ public class OmsSaleOrderOptionsServiceImpl implements OmsSaleOrderOptionsServic
             dto.setRemark(item.getRemark());
             dto.setWeight(item.getWeight());
             dto.setVolume(item.getVolume());
+            dto.setSkuUnit(goodsSku.getUnitName());
             dto.setQty(item.getQuantity());
             dto.setSalesPrice(item.getSalesPrice());
             dto.setTotalPrice(item.getSalesPrice().multiply(new BigDecimal(item.getQuantity())));

src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java

@@ -81,13 +81,13 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service {
         order.setOrderType(orgOrder.getOrderType());
         String orderPrefix = null;
         if (order.getOrderType().equals(0)) {
-            orderPrefix = "SSN";
+            orderPrefix = "SN";
         } else if (order.getOrderType().equals(1)) {
-            orderPrefix = "SZP";
+            orderPrefix = "ZP";
         } else if (order.getOrderType().equals(2)) {
-            orderPrefix = "SSC";
+            orderPrefix = "SC";
         } else if (order.getOrderType().equals(3)) {
-            orderPrefix = "SSP";
+            orderPrefix = "SP";
         } else {
             Assert.throwEx("订单类型错误");
         }

src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java

@@ -565,11 +565,11 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
         OmsSaleOrder order = new OmsSaleOrder();
         String orderPrefix = null;
         if (order.getOrderType() == null || order.getOrderType().equals(0)) {
-            orderPrefix = "SSN";
+            orderPrefix = "SN";
         } else if (order.getOrderType().equals(1)) {
-            orderPrefix = "SZP";
+            orderPrefix = "ZP";
         } else if (order.getOrderType().equals(2)) {
-            orderPrefix = "SSC";
+            orderPrefix = "SC";
         }
         order.setOrderSn(orderPrefix + CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder));
 
@@ -1081,99 +1081,13 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
                                String brands,
                                BmsSupplierAddress supplierAddress,
                                BmsRegion bmsRegion) {
-        SysUser sysUser = sysUserService.getById(omsOrder.getCreateBy());
+        omsOrder.setStatus(2);
-        //保存到临时表-主表
-//        LocalDateTime nowTime = LocalDateTime.now();
-//        OmsXltOrder xltOrder = new OmsXltOrder();
-//        xltOrder.setId(IdUtil.getSnowFlakeId() + "");
-//        xltOrder.setOrderType(omsOrder.getOrderType());
-//        xltOrder.setDingDanHao(omsOrder.getOrderSn());
-//        xltOrder.setShenQingRiQi(nowTime);
-//        xltOrder.setKeHuBianHao(omsOrder.getSupplierCode());
-//        xltOrder.setShouHuoDiZhi(supplierAddress.getDetail());
-//        xltOrder.setRenYuanBianHao(omsOrder.getUserCode());
-//        xltOrder.setCdOrderRemark(omsOrder.getCdOrderRemark());
-//        xltOrder.setDiscountRate(omsOrder.getDiscountRate());
-//        String remark = sysUser.getName() + "(" + sysUser.getMobile() + ")" + omsOrder.getRemark() + supplierAddress.getDetail();
-//        if (remark.length() > 120) {
-//            remark = remark.substring(0, 120);
-//        }
-//        xltOrder.setZhuYiShiXian(remark);
-//        xltOrder.setXieRuShiJian(nowTime);
-//        xltOrder.setChuLiShiJian(null);
-//        xltOrder.setRowCreateDate(nowTime);
-//        xltOrder.setRenYuanXingMing(omsOrder.getUserName());
-//        xltOrder.setRenYuanDianHua(omsOrder.getUserPhone());
-//        xltOrder.setXianZhiWeiDu("品牌");
-//        xltOrder.setXianZhiWeiDuMingChen(brands);
-//        xltOrder.setZhuangTai(0);
-//        //状态:0未使用；1报价单；2销售订单
-//        xltOrder.setStatus(0);
-//
-//        xltOrder.setTmsSysId(supplierAddress.getId() + "");
-//        xltOrder.setEmpName(omsOrder.getUserName());
-//        xltOrder.setCusCode(omsOrder.getSupplierCode());
-//        xltOrder.setCusName(omsOrder.getSupplierName());
-//
-//        try {
-//            String[] regions = bmsRegion.getPathNames().split("_");
-//            if (regions.length > 1) {
-//                xltOrder.setDealerProvince(regions[1]);
-//            }
-//            if (regions.length > 0) {
-//                xltOrder.setDealerCity(regions[0]);
-//            }
-//        } catch (Exception e) {
-//            log.warn("区域档案异常：{}",bmsRegion.getName());
-//        }
-//        xltOrder.setDealerArea(bmsRegion.getPathNames());
-//
-//        //保存到临时表-明细表
-//        List<OmsXltOrderItem> xltOrderItemList = new ArrayList<>();
-//        for (int i = 0; i < orderItemList.size(); i++) {
-//            OmsSaleOrderItem orderItem = orderItemList.get(i);
-//            OmsXltOrderItem xltOrderItem = new OmsXltOrderItem();
-//            xltOrderItem.setId(xltOrder.getId() + "_" + (i + 1));
-//            xltOrderItem.setDingDanID(xltOrder.getId());
-//            xltOrderItem.setSpuCode(orderItem.getSpuCode());
-//            boolean eq = orderItem.getSkuCode().equals(orderItem.getSpuCode());
-//            if (!StringUtils.hasText(orderItem.getSkuCode()) || eq) {
-//                GoodsSku sku = goodsSkuService.getById(orderItem.getSkuId());
-//                GoodsSpu spu = goodsSpuService.getById(orderItem.getSpuId());
-//                if (!sku.getSkuCode().equals(spu.getSpuCode())) {
-//                    Assert.throwEx("SKU【" + orderItem.getSpuCode() + "】存货缺失，请联系档案负责人");
-//                }
-//            }
-//            xltOrderItem.setChanPinBianHao(orderItem.getSkuCode());
-//            xltOrderItem.setChanPinDanWei(orderItem.getSkuUnit());
-//            xltOrderItem.setDingHuoShuLiang(orderItem.getQuantity());
-//            xltOrderItem.setDaZengShuLiang(BigDecimal.ZERO);
-//            xltOrderItem.setChanPinYuanJia(orderItem.getMarketPrice());
-//            xltOrderItem.setChanPinXianJia(orderItem.getSalesPrice());
-//            xltOrderItem.setXieRuShiJian(nowTime);
-//            xltOrderItem.setChuLiShiJian(null);
-//            xltOrderItem.setRowCreateDate(nowTime);
-//            if (omsOrder.getOrderType().equals(3)) {
-//                String itemRm = orderItem.getRemark() == null ? "" : orderItem.getRemark();
-//                xltOrderItem.setBeiZhu("批号[" + orderItem.getSkuBatchCode() + "]" + itemRm);
-//            } else {
-//                xltOrderItem.setBeiZhu(orderItem.getRemark());
-//            }
-//            xltOrderItem.setZhuangTai(0);
-//            xltOrderItemList.add(xltOrderItem);
-//        }
-//        XltOrderDTO xltOrderDTO = new XltOrderDTO(xltOrder, xltOrderItemList);
-//        //请求到中间服务保存
-//        seeYonRequestBaseService.postBase(ERP_ORDER_CREATE, xltOrderDTO, "创建订单：" + xltOrder.getDingDanHao());
-        omsOrder.setStatus(1);
         omsOrder.setCheckTime(LocalDateTime.now());
         omsOrder.setCheckUserId(omsOrder.getCreateBy());
         if(!omsOrder.getOrderType().equals(3)){
             omsOrder.setCheckUserId(AuthContextUtils.getSysUserId());
         }
         this.updateById(omsOrder);
-        //更新订单
-        applicationEventPublisher.publishEvent(new OrderCreateCacheEvent(this,omsOrder.getId().toString()));
     }
 
     @Override

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -218,6 +218,9 @@ public class PortalOfCostApplication {
         if(CollectionUtil.isEmpty(createBo.getGoodsList()) || createBo.getGoodsList().size()==0){
             Assert.throwEx("商品数据不能为空");
         }
+        if(policyItem.getReleaseFlag().equals(1)){
+            Assert.throwEx("政策已释放，不能再创建");
+        }
         BmsSupplier supplier = supplierService.getById(policyItem.getSupplierId());
         BmsSubject subject = subjectService.getById(policyItem.getSubjectId());
         //发票号

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java

@@ -77,7 +77,7 @@ public class TzcPolicyTestController {
     private TzcPolicyApplicationService tzcPolicyApplicationService;
 
 
-    @GetMapping("/testSyncPolicy")
+    //@GetMapping("/testSyncPolicy")
     public R<?>  syncPolicy(Long policyId){
         tzcPolicyApplicationService.syncPolicyItem(policyId);
         return R.ok();

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.vtb.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qs.serve.common.config.properties.ProjectApisProperties;
@@ -129,6 +130,7 @@ public class VtbVerificationController {
         List<Long> actIds = pageResult.getRecords().stream().map(VtbVerification::getActivityId).distinct().collect(Collectors.toList());
         List<TbsActivity> activityList = tbsActivityService.listByIds(actIds);
         List<Long> costIds = activityList.stream().map(TbsActivity::getCostApplyId).distinct().collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(costIds)){
             List<TbsCostApply> costList = tbsCostApplyService.listByIds(costIds);
             for (VtbVerification verification : pageResult.getRecords()) {
                 for (TbsActivity activity : activityList) {
@@ -142,6 +144,7 @@ public class VtbVerificationController {
                     }
                 }
             }
+        }
         return R.byMbpList(pageResult);
     }