Merge branch 'master_after0423' into master_after0506

@@ -341,7 +341,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     /**
      * 创建人
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.DEFAULT)
     private String createBy;
 
     /**

@@ -455,13 +455,19 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getTitle, vo.getTitle())
                 .set(ContractDistributorStandard::getStandardFileId, vo.getStandardFileId())
                 .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName())
+                .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
+                .set(ContractDistributorStandard::getFormalFileId, vo.getFormalFileId())
+                .set(ContractDistributorStandard::getFormalFileName, vo.getFormalFileName())
+                .set(ContractDistributorStandard::getFormalStandardized, vo.getFormalStandardized())
                 .eq(ContractDistributorStandard::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
 
         if ("PROCESS_STD_AGMT".equals(data.getType())) {
+            log.info("===加工合同===" + vo.getContractStdProcessingLineList());
             dealWithStdProcessingLine(data, vo);
         } else {
+            log.info("===其他合同===" + vo.getContractDistributorLineList());
             dealWithDistributorLine(data, vo);
         }
 
@@ -568,6 +574,10 @@ public class ContractDistributorStandardServiceImpl extends
                 if (!StringUtil.isBlank(updateContractStdProcessingLineVo.getItemId())) {
                     createContractStdProcessingLineVo.setItemId(updateContractStdProcessingLineVo.getItemId());
                 }
+                if (!StringUtil.isBlank(updateContractStdProcessingLineVo.getMaterialCode())) {
+                    createContractStdProcessingLineVo.setMaterialCode(updateContractStdProcessingLineVo.getMaterialCode());
+                }
+                createContractStdProcessingLineVo.setSampleOrder(updateContractStdProcessingLineVo.getSampleOrder());
 
                 contractStdProcessingLineService.create(createContractStdProcessingLineVo);
             }
@@ -621,6 +631,8 @@ public class ContractDistributorStandardServiceImpl extends
                 createContractDistributorLineVo.setLengthTolPos(updateContractDistributorLineVo.getLengthTolPos());
                 createContractDistributorLineVo.setLengthTolNeg(updateContractDistributorLineVo.getLengthTolNeg());
                 createContractDistributorLineVo.setItemId(updateContractDistributorLineVo.getItemId());
+                createContractDistributorLineVo.setMaterialCode(updateContractDistributorLineVo.getMaterialCode());
+                createContractDistributorLineVo.setSampleOrder(updateContractDistributorLineVo.getSampleOrder());
 
                 contractDistributorLineService.create(createContractDistributorLineVo);
             }

@@ -23,7 +23,9 @@ 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.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.SysUserService;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.*;
@@ -70,6 +72,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     @Resource
     private SysDataDicItemService sysDataDicItemService;
     @Resource
+    private SysUserService sysUserService;
+    @Resource
     private ContractStdProcessingLineService contractStdProcessingLineService;
     @Resource
     private OrderDetailReportService orderDetailReportService;
@@ -244,13 +248,15 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (vo.getPackagingFee() != null) {
             data.setPackagingFee(vo.getPackagingFee());
         }
+        String createById = SecurityUtil.getCurrentUser().getId();
         if (!StringUtil.isBlank(vo.getContractCreateById())) {
             data.setContractCreateById(vo.getContractCreateById());
-            data.setCreateById(vo.getContractCreateById());
+            createById = vo.getContractCreateById();
         }
-
-        if (StringUtil.isBlank(data.getContractCreateById())) {
-            data.setCreateById(SecurityUtil.getCurrentUser().getId());
+        data.setCreateById(createById);
+        SysUser createUser = sysUserService.findById(createById);
+        if (createUser != null) {
+            data.setCreateBy(createUser.getName());
         }
 
         data.setSampleOrder(vo.isSampleOrder());
@@ -278,6 +284,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             }
         }
         if (!vo.isNoFlowInstance()) {
+            buildFlowStartUser(data);
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         }
         //生成订单明细报表
@@ -286,6 +293,24 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         return data.getId();
     }
 
+    private void buildFlowStartUser(PurchaseOrderInfo data) {
+        if (data == null) {
+            return;
+        }
+
+        String flowUserId = StringUtils.isNotBlank(data.getCreateById())
+                ? data.getCreateById()
+                : SecurityUtil.getCurrentUser().getId();
+        data.setUserId(flowUserId);
+
+        if (StringUtils.isBlank(data.getCreateBy())) {
+            SysUser createUser = sysUserService.findById(flowUserId);
+            if (createUser != null) {
+                data.setCreateBy(createUser.getName());
+            }
+        }
+    }
+
     private void createOrderDetailReport(String businessId) {
         PurchaseOrderInfo purchaseOrderInfo = this.findById(businessId);
         ContractDistributorStandard standard = contractDistributorStandardService.findById(purchaseOrderInfo.getContractId());