diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
index 33f3fdf1..3dc2e049 100644
--- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
+++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
@@ -15,6 +15,8 @@ import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
 import com.qs.serve.modules.bir.entity.vo.*;
 import com.qs.serve.modules.bir.service.*;
+import com.qs.serve.modules.sys.entity.SysDictData;
+import com.qs.serve.modules.sys.service.SysDictDataService;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
 import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
 import com.qs.serve.modules.tbs.service.TbsBudgetService;
@@ -44,6 +46,7 @@ public class BirRoiRateController {
     private BirReportAccountBookService birReportAccountBookService;
     private TbsBudgetService tbsBudgetService;
     private BirCenterRateService birCenterRateService;
+    private SysDictDataService sysDictDataService;
 
 
 //    /**
@@ -152,6 +155,20 @@ public class BirRoiRateController {
         return R.ok(birCenterRateService.findCostCenterDataByCostApplyId(costApplyId,policyId));
     }
 
+    /**
+     * 发货单时间
+     * @return
+     */
+    @GetMapping("/dispatchTime")
+    public R<?> getDispatchTime(){
+        LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysDictData::getGroupKey,"dispatch_sync_time");
+        SysDictData sysDictData = sysDictDataService.getOne(lqw);
+        if(sysDictData==null){
+            return R.ok("2023-10-1 12:00:00","demo默认数据");
+        }
+        return R.ok(sysDictData.getKeyVal(),"ok");
+    }
 
 }
 
diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java
index b31e190a..c7339876 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java
@@ -232,6 +232,10 @@ public class BmsSubjectController {
             subject.setPathNames(parent.getPathNames()+"_"+subject.getSubjectName());
         }
         if(subject.getId()==null){
+            BmsSubject subject1 = bmsSubjectService.getByCode(subject.getSubjectCode());
+            if (subject1!=null){
+                Assert.throwEx("科目编号不可重复");
+            }
             bmsSubjectService.save(subject);
         }else {
             //异常历史的适用区域
diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java
index 63c0c12d..781420a7 100644
--- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java
+++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSubjectMapper.java
@@ -21,5 +21,15 @@ public interface BmsSubjectMapper extends BaseMapper<BmsSubject> {
     @Update("update bms_subject set form_id_for_cost_apply = null where id = #{id}")
     int removeFormIdForCost(@Param("id") Long id);
 
+    /**
+     * 解决code重复方案
+     * @param newCode
+     * @param id
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "1")
+    @Update("update bms_subject set del_flag = 1,subject_code = #{newCode} where id = #{id}")
+    int updateToDelete(@Param("newCode")String newCode,@Param("id")Long id);
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectServiceImpl.java
index ec260fab..dd77f3d6 100644
--- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.util.IdUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.tbs.entity.bo.TbsBudgetBatchBo;
 import lombok.AllArgsConstructor;
@@ -130,6 +131,7 @@ public class BmsSubjectServiceImpl extends ServiceImpl<BmsSubjectMapper,BmsSubje
 
     @Override
     public boolean removeSelfAndChildById(Long id) {
+        BmsSubject bmsSubject = this.getById(id);
         List<BmsSubject> list = listChild(id);
         for(BmsSubject subject:list){
             boolean result =  removeSelfAndChildById(subject.getId());
@@ -137,7 +139,9 @@ public class BmsSubjectServiceImpl extends ServiceImpl<BmsSubjectMapper,BmsSubje
                 return false;
             }
         }
-        return this.removeById(id);
+        String newCode = bmsSubject.getSubjectCode()+"_del_"+ IdUtil.getSnowflakeNextIdStr();
+        baseMapper.updateToDelete(newCode,id);
+        return true;
     }
 }
 
diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java
index 5de65ac6..196f4979 100644
--- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java
+++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java
@@ -37,6 +37,8 @@ public class GoodsSku implements Serializable {
     @Length(max = 32,message = "sku编码长度不能超过32字")
     private String skuCode;
 
+    private String skuName;
+
     /** 商品Id */
     @NotNull(message = "商品Id不能为空")
     private Long spuId;
diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
index 121ec32b..987af999 100644
--- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
@@ -136,6 +136,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         //构建Sku
         List<Long> spuIds = confirmOrder.getSpuParamList().stream()
                 .map(OmsOrderSkuBo.SpuParam::getSpuId).collect(Collectors.toList());
+        //防止空指针
+        spuIds.add(0L);
         List<GoodsSpu> spuList = goodsSpuService.listByIds(spuIds);
 
         //通过当前函数获取当前账套对于的skuID,默认全部转化为开平(001)的sku
@@ -234,6 +236,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
 
         //通过当前函数获取当前账套对于的skuID,默认全部转化为开平(001)的sku
         List<Long> spuIds = param.getOrderItems().stream().map(OmsOrderModifyParam.OmsOrderItemModifyBo::getSpuId).collect(Collectors.toList());
+        spuIds.add(0L);//兼容空订单，防止空指针
         List<GoodsSpu> spuList = goodsSpuService.listByIds(spuIds);
         Map<Long,GoodsSpu> goodsSpuMap = new HashMap<>(spuList.size());
         for (GoodsSpu goodsSpu : spuList) {
@@ -507,6 +510,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         iteLqw.eq(OmsOrderItem::getOrderId,id);
         List<OmsOrderItem> orderItemList = omsOrderItemService.list(iteLqw);
 
+        if(orderItemList.size()<1){
+            Assert.throwEx("空项目不支持下单");
+        }
 
         //List<Long> spuIds = orderItemList.stream().map(OmsOrderItem::getSpuId).collect(Collectors.toList());
 
diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java
index decd28f2..96992ab6 100644
--- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java
+++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java
@@ -69,6 +69,14 @@ public class TbsActivityTemplate implements Serializable {
     @Length(max = 255,message = "预设备注长度不能超过255字")
     private String preRemark;
 
+    /** 创建人ID */
+    private String userId;
+
+    /** 创建人编码 */
+    private String userCode;
+
+    /** 创建人名称 */
+    private String userName;
 
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java
index a4916f3c..70f3d22b 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java
@@ -3,12 +3,15 @@ package com.qs.serve.modules.tbs.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.bms.service.BmsRegionService;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.mapper.SysUserMapper;
 import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog;
 import com.qs.serve.modules.tbs.entity.TbsActivityTemplateRegion;
 import com.qs.serve.modules.tbs.entity.bo.TbsActivityTemplateBo;
@@ -40,6 +43,7 @@ public class TbsActivityTemplateServiceImpl extends ServiceImpl<TbsActivityTempl
     private final BmsRegionService saleRegionService;
     private final BmsRegion2Service bizRegionService;
     private final TbsActivityTemplateLogService activityTemplateLogService;
+    private final SysUserMapper sysUserMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -50,6 +54,11 @@ public class TbsActivityTemplateServiceImpl extends ServiceImpl<TbsActivityTempl
             }
         }
         TbsActivityTemplate template = CopierUtil.copy(templateBo,new TbsActivityTemplate());
+        String userId = AuthContextUtils.getSysUserId();
+        SysUser sysUser = sysUserMapper.selectById(userId);
+        template.setUserId(userId);
+        template.setUserCode(sysUser.getCode());
+        template.setUserName(sysUser.getName());
         this.saveOrUpdate(template);
         if(templateBo.getId()!=null){
             TbsActivityTemplate templateDb = this.getById(template.getId());