Merge branch 'master_chujiang_0805' into master_quotation

@@ -177,13 +177,13 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
     /**
      * 创建人ID
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.DEFAULT)
     private String createById;
 
     /**
      * 创建人
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.DEFAULT)
     private String createBy;
 
     /**

@@ -179,13 +179,13 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     /**
      * 创建人ID
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.DEFAULT)
     private String createById;
 
     /**
      * 创建人
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.DEFAULT)
     private String createBy;
 
     /**

@@ -214,6 +214,12 @@ public class ShipmentDetailStatisticsModel implements ExcelModel {
     private String remark;
 
     /**
+     * 备注一
+     */
+    @ExcelProperty("备注一")
+    private String remark1;
+
+    /**
      * 结算方式
      */
     @ExcelProperty("结算方式")
@@ -286,6 +292,12 @@ public class ShipmentDetailStatisticsModel implements ExcelModel {
     private String variety;
 
     /**
+     * 备注二
+     */
+    @ExcelProperty("备注二")
+    private String remark2;
+
+    /**
      * 客户简称
      */
     @ExcelProperty("客户简称")

@@ -21,7 +21,10 @@ import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.mappers.DraftRequestCarTicketMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
@@ -46,6 +49,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private SysUserService sysUserService;
 
     @Override
     public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
@@ -162,6 +167,18 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         if (!StringUtil.isBlank(vo.getSource())) {
             data.setSource(vo.getSource());
         }
+        //草稿要车单创建人默认为业务员（合同创建人）
+        PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
+        if (orderInfo != null) {
+            String contractCreateById = orderInfo.getContractCreateById();
+            data.setCreateById(contractCreateById);
+            if (StringUtils.isNotBlank(contractCreateById)) {
+                SysUser user = sysUserService.getById(contractCreateById);
+                if (user != null) {
+                    data.setCreateBy(user.getName());
+                }
+            }
+        }
 
         getBaseMapper().insert(data);
 

@@ -18,8 +18,12 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysUserService;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.RequestCarTicket;
 import com.lframework.xingyun.sc.mappers.RequestCarTicketMapper;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
@@ -34,6 +38,10 @@ import java.util.List;
 
 @Service
 public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTicketMapper, RequestCarTicket> implements RequestCarTicketService {
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private SysUserService sysUserService;
 
     @Override
     public PageResult<RequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryRequestCarTicketVo vo) {
@@ -132,6 +140,18 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         if (!StringUtil.isBlank(vo.getStatus())) {
             data.setStatus(vo.getStatus());
         }
+        //要车单创建人默认为业务员（合同创建人）
+        PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
+        if (orderInfo != null) {
+            String contractCreateById = orderInfo.getContractCreateById();
+            data.setCreateById(contractCreateById);
+            if (StringUtils.isNotBlank(contractCreateById)) {
+                SysUser user = sysUserService.getById(contractCreateById);
+                if (user != null) {
+                    data.setCreateBy(user.getName());
+                }
+            }
+        }
 
         getBaseMapper().insert(data);
 

 package com.lframework.xingyun.sc.mappers;
 
+import com.lframework.starter.web.core.annotations.permission.DataPermission;
+import com.lframework.starter.web.core.annotations.permission.DataPermissions;
 import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryDraftRequestCarTicketVo;
 import org.apache.ibatis.annotations.Param;
@@ -20,6 +23,9 @@ public interface DraftRequestCarTicketMapper extends BaseMapper<DraftRequestCarT
      * @param vo
      * @return
      */
+    @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
+            @DataPermission(template = "order", alias = "tb")
+    })
     List<DraftRequestCarTicket> query(@Param("vo") QueryDraftRequestCarTicketVo vo);
 
 

 package com.lframework.xingyun.sc.mappers;
 
+import com.lframework.starter.web.core.annotations.permission.DataPermission;
+import com.lframework.starter.web.core.annotations.permission.DataPermissions;
 import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.xingyun.sc.entity.RequestCarTicket;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import org.apache.ibatis.annotations.Param;
@@ -20,6 +23,9 @@ public interface RequestCarTicketMapper extends BaseMapper<RequestCarTicket> {
      * @param vo
      * @return
      */
+    @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
+            @DataPermission(template = "order", alias = "tb")
+    })
     List<RequestCarTicket> query(@Param("vo") QueryRequestCarTicketVo vo);
 
 

 package com.lframework.xingyun.sc.mappers;
 
+import com.lframework.starter.web.core.annotations.permission.DataPermission;
+import com.lframework.starter.web.core.annotations.permission.DataPermissions;
+import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.sc.vo.shipments.order.QueryShipmentsOrderInfoVo;