楚江erp：1、订单明细创建人设置为合同创建人；2、订单明细开启权限控制

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.controller.statistics;
 
 
 import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -88,6 +89,7 @@ public class OrderDetailReportController extends DefaultBaseController {
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@Valid CreateOrderDetailReportVo vo) {
     public InvokeResult<Void> create(@Valid CreateOrderDetailReportVo vo) {
 
 
+        vo.setCreateById(SecurityUtil.getCurrentUser().getId());
         orderDetailReportService.create(vo);
         orderDetailReportService.create(vo);
 
 
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();

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

@@ -957,6 +957,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         vo.setStockUpCompanyName(orderDetailReport.getStockUpCompanyName());
         vo.setStockUpCompanyName(orderDetailReport.getStockUpCompanyName());
         vo.setOrderType(orderDetailReport.getOrderType());
         vo.setOrderType(orderDetailReport.getOrderType());
         vo.setShowOrder(1);
         vo.setShowOrder(1);
+        vo.setCreateById(orderDetailReport.getCreateById());
+        vo.setCreateBy(orderDetailReport.getCreateBy());
         orderDetailReportService.create(vo);
         orderDetailReportService.create(vo);
     }
     }
 }
 }

@@ -400,14 +400,16 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         ContractDistributorStandard standard = contractDistributorStandardService.findById(purchaseOrderInfo.getContractId());
         ContractDistributorStandard standard = contractDistributorStandardService.findById(purchaseOrderInfo.getContractId());
         if (CollectionUtils.isNotEmpty(purchaseOrderLineList)) {
         if (CollectionUtils.isNotEmpty(purchaseOrderLineList)) {
             for (PurchaseOrderLine line : purchaseOrderLineList) {
             for (PurchaseOrderLine line : purchaseOrderLineList) {
-                createOrderDetailReport(line, orderDetailReport, purchaseOrderInfo, standard,"offset");
+                createOrderDetailReport(line, orderDetailReport, purchaseOrderInfo, standard,"offset"
+                        , purchaseOrderInfo.getContractCreateById());
             }
             }
         }
         }
         List<PurchaseOrderLine> afterChangeSpecList = record.getAfterChangeSpecList();
         List<PurchaseOrderLine> afterChangeSpecList = record.getAfterChangeSpecList();
         if (CollectionUtils.isNotEmpty(afterChangeSpecList)) {
         if (CollectionUtils.isNotEmpty(afterChangeSpecList)) {
             orderInfo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
             orderInfo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
             for (PurchaseOrderLine line : afterChangeSpecList) {
             for (PurchaseOrderLine line : afterChangeSpecList) {
-                createOrderDetailReport(line, orderDetailReport, orderInfo, standard, null);
+                createOrderDetailReport(line, orderDetailReport, orderInfo, standard, null
+                        , purchaseOrderInfo.getContractCreateById());
             }
             }
         }
         }
         purchaseOrderInfoService.update(orderInfo);
         purchaseOrderInfoService.update(orderInfo);
@@ -506,7 +508,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
     }
     }
 
 
     private void createOrderDetailReport(PurchaseOrderLine line, OrderDetailReport orderDetailReport,
     private void createOrderDetailReport(PurchaseOrderLine line, OrderDetailReport orderDetailReport,
-                                         PurchaseOrderInfo orderInfo, ContractDistributorStandard standard, String type1) {
+                                         PurchaseOrderInfo orderInfo, ContractDistributorStandard standard, String type1,
+                                         String contractCreateById) {
         CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo();
         CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo();
         if ("offset".equals(type1)) {
         if ("offset".equals(type1)) {
             vo.setPurchaseOrderLineId(line.getId());
             vo.setPurchaseOrderLineId(line.getId());
@@ -581,6 +584,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         vo.setStockUpCompanyName(orderInfo.getStockUpCompanyName());
         vo.setStockUpCompanyName(orderInfo.getStockUpCompanyName());
         //vo.setOrderType();
         //vo.setOrderType();
         vo.setShowOrder(2);
         vo.setShowOrder(2);
+        vo.setCreateById(contractCreateById);
         orderDetailReportService.create(vo);
         orderDetailReportService.create(vo);
     }
     }
 }
 }

@@ -387,6 +387,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 //                vo.setOrderType();
 //                vo.setOrderType();
                 vo.setShowOrder(0);
                 vo.setShowOrder(0);
                 vo.setType(purchaseOrderInfo.getType());
                 vo.setType(purchaseOrderInfo.getType());
+                vo.setCreateById(purchaseOrderInfo.getContractCreateById());
                 orderDetailReportService.create(vo);
                 orderDetailReportService.create(vo);
             }
             }
         }
         }

@@ -15,7 +15,9 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.mappers.OrderDetailReportMapper;
 import com.lframework.xingyun.sc.mappers.OrderDetailReportMapper;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
@@ -55,6 +57,8 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
     private ContractStdProcessingLineService contractStdProcessingLineService;
     private ContractStdProcessingLineService contractStdProcessingLineService;
     @Resource
     @Resource
     private OrderDetailReportService orderDetailReportService;
     private OrderDetailReportService orderDetailReportService;
+    @Resource
+    private SysUserService sysUserService;
 
 
     @Override
     @Override
     public PageResult<OrderDetailReport> query(Integer pageIndex, Integer pageSize, QueryOrderDetailReportVo vo) {
     public PageResult<OrderDetailReport> query(Integer pageIndex, Integer pageSize, QueryOrderDetailReportVo vo) {
@@ -87,6 +91,13 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
 
 
         OrderDetailReport data = new OrderDetailReport();
         OrderDetailReport data = new OrderDetailReport();
         data.setId(IdUtil.getId());
         data.setId(IdUtil.getId());
+        data.setCreateById(vo.getCreateById());
+        if (StringUtils.isBlank(vo.getCreateBy()) && StringUtils.isNotBlank(vo.getCreateById())) {
+            SysUser user = sysUserService.getById(vo.getCreateById());
+            if (user != null) {
+                data.setCreateBy(user.getName());
+            }
+        }
         if (!StringUtil.isBlank(vo.getPurchaseOrderLineId())) {
         if (!StringUtil.isBlank(vo.getPurchaseOrderLineId())) {
             data.setPurchaseOrderLineId(vo.getPurchaseOrderLineId());
             data.setPurchaseOrderLineId(vo.getPurchaseOrderLineId());
         }
         }
@@ -366,6 +377,7 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
                         //vo.setOrderType();
                         //vo.setOrderType();
                         vo.setShowOrder(0);
                         vo.setShowOrder(0);
                         vo.setType(purchaseOrderInfo.getType());
                         vo.setType(purchaseOrderInfo.getType());
+                        vo.setCreateById(purchaseOrderInfo.getContractCreateById());
                         orderDetailReportService.create(vo);
                         orderDetailReportService.create(vo);
                     }
                     }
                 }
                 }

 package com.lframework.xingyun.sc.mappers;
 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.core.mapper.BaseMapper;
+import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.xingyun.sc.entity.OrderDetailReport;
 import com.lframework.xingyun.sc.entity.OrderDetailReport;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
@@ -21,6 +24,9 @@ public interface OrderDetailReportMapper extends BaseMapper<OrderDetailReport> {
      * @param vo
      * @param vo
      * @return
      * @return
      */
      */
+    @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
+            @DataPermission(template = "order", alias = "tb")
+    })
     List<OrderDetailReport> query(@Param("vo") QueryOrderDetailReportVo vo);
     List<OrderDetailReport> query(@Param("vo") QueryOrderDetailReportVo vo);
 
 
     /**
     /**

@@ -318,4 +318,15 @@ public class CreateOrderDetailReportVo implements BaseVo, Serializable {
     @ApiModelProperty("订货单类型")
     @ApiModelProperty("订货单类型")
     private String type;
     private String type;
 
 
+    /**
+     * 创建人ID
+     */
+    @ApiModelProperty("创建人ID")
+    private String createById;
+
+    /**
+     * 创建人姓名
+     */
+    @ApiModelProperty("创建人姓名")
+    private String createBy;
 }
 }