任务创建者使用出库配盘的创建者；

周鸿
1 parent c5717c2e
Showing 5 changed files with 101 additions and 71 deletions
src/main/java/com/huaheng/framework/config/MyMetaObjectHandler.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
@@ -2,6 +2,7 @@ package com.huaheng.framework.config;
  
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Slf4j
 @Component
-public class MyMetaObjectHandler implements MetaObjectHandler{
+public class MyMetaObjectHandler implements MetaObjectHandler {
     /**
      * 插入元对象字段填充（用于插入时对公共字段的填充）
      *
@@ -23,11 +24,16 @@ public class MyMetaObjectHandler implements MetaObjectHandler{
     public void insertFill(MetaObject metaObject) {
         log.info("start insert fill ....");
         this.setFieldValByName("created", new Date(), metaObject);
-        if(ShiroUtils.getUserName() != null) {
-            this.setFieldValByName("createdBy", ShiroUtils.getUserName(), metaObject);
+        if (ShiroUtils.getUserName() != null) {
+            System.out.println(metaObject.getOriginalObject() instanceof TaskHeader);
+            if (metaObject.getOriginalObject() instanceof TaskHeader) {
+                
+            } else {
+                this.setFieldValByName("createdBy", ShiroUtils.getUserName(), metaObject);
+            }
             this.setFieldValByName("lastUpdatedBy", ShiroUtils.getUserName(), metaObject);
-        }else{
-            if(ShiroUtils.getUserName() != null){
+        } else {
+            if (ShiroUtils.getUserName() != null) {
                 this.setFieldValByName("createdBy", ShiroUtils.getLoginName(), metaObject);
                 this.setFieldValByName("lastUpdatedBy", ShiroUtils.getLoginName(), metaObject);
             }
@@ -43,10 +49,10 @@ public class MyMetaObjectHandler implements MetaObjectHandler{
     @Override
     public void updateFill(MetaObject metaObject) {
         this.setFieldValByName("lastUpdated", new Date(), metaObject);
-        if(ShiroUtils.getUserName() != null) {
+        if (ShiroUtils.getUserName() != null) {
             this.setFieldValByName("lastUpdatedBy", ShiroUtils.getUserName(), metaObject);
-        }else{
-            if(ShiroUtils.getUserName() != null){
+        } else {
+            if (ShiroUtils.getUserName() != null) {
                 this.setFieldValByName("lastUpdatedBy", ShiroUtils.getLoginName(), metaObject);
             }
         }
@@ -733,7 +733,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
     /* 生成任务 */
     @Override
     @Transactional
-    public AjaxResult createTask(List<Integer> idList) {
+    public synchronized AjaxResult createTask(List<Integer> idList) {
         ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel();
         for (Integer id : idList) {
             shipmentTask.setShipmentContainerHeaderIds(id);
@@ -225,9 +225,11 @@ public class ShippingCombinationController extends BaseController {
                 shipmentContainerHeader.eq(ShipmentContainerHeader::getStatus, QuantityConstant.SHIPMENT_CONTAINER_BUILD);
                 List<ShipmentContainerHeader> shipmentContainerHeaders = shipmentContainerHeaderService.list(shipmentContainerHeader);
                 for (ShipmentContainerHeader item : shipmentContainerHeaders) {
-                    ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel();
-                    shipmentTask.setShipmentContainerHeaderIds(item.getId());
-                    AjaxResult ajaxResults = shipmentTaskService.createTaskFromShipmentContainers(shipmentTask);
+//                    ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel();
+//                    shipmentTask.setShipmentContainerHeaderIds(item.getId());
+//                    AjaxResult ajaxResults = shipmentTaskService.createTaskFromShipmentContainers(shipmentTask);
+                    List<Integer> idList = Arrays.asList(Convert.toIntArray(item.getId().toString()));
+                    AjaxResult ajaxResults = shipmentContainerHeaderService.createTask(idList);
                     if (ajaxResults.hasErr()) {
                         throw new ServiceException("任务生成失败：" + ajaxResults.getMsg());
                     }
 package com.huaheng.pc.task.taskHeader.domain;
  
 import com.baomidou.mybatisplus.annotation.*;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
  
-@ApiModel(value="com.huaheng.pc.task.taskHeader.TaskHeader")
+@ApiModel(value = "com.huaheng.pc.task.taskHeader.TaskHeader")
 @Data
 @TableName(value = "task_header")
 public class TaskHeader implements Serializable {
@@ -15,7 +18,7 @@ public class TaskHeader implements Serializable {
      * ID
      */
     @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="ID")
+    @ApiModelProperty(value = "ID")
     private Integer id;
  
     @TableField(exist = false)
@@ -25,42 +28,42 @@ public class TaskHeader implements Serializable {
      * 仓库
      */
     @TableField(value = "warehouseCode")
-    @ApiModelProperty(value="仓库")
+    @ApiModelProperty(value = "仓库")
     private String warehouseCode;
  
     /**
      * 货主
      */
     @TableField(value = "companyCode")
-    @ApiModelProperty(value="货主")
+    @ApiModelProperty(value = "货主")
     private String companyCode;
  
     /**
      * 库区
      */
     @TableField(value = "zoneCode")
-    @ApiModelProperty(value="库区")
+    @ApiModelProperty(value = "库区")
     private String zoneCode;
  
     /**
      * 库区
      */
     @TableField(value = "area")
-    @ApiModelProperty(value="区域")
+    @ApiModelProperty(value = "区域")
     private String area;
  
     /**
      * 库区
      */
     @TableField(value = "materialCode")
-    @ApiModelProperty(value="物料编码")
+    @ApiModelProperty(value = "物料编码")
     private String materialCode;
  
     /**
      * 任务类型
      */
     @TableField(value = "taskType")
-    @ApiModelProperty(value="任务类型")
+    @ApiModelProperty(value = "任务类型")
     private Integer taskType;
  
     @TableField(exist = false)
@@ -69,35 +72,35 @@ public class TaskHeader implements Serializable {
      * 入库或出库组盘头ID
      */
     @TableField(value = "allocationHeadId")
-    @ApiModelProperty(value="入库或出库组盘头ID")
+    @ApiModelProperty(value = "入库或出库组盘头ID")
     private Integer allocationHeadId;
  
     /**
      * 内部类型
      */
     @TableField(value = "internalTaskType")
-    @ApiModelProperty(value="内部类型")
+    @ApiModelProperty(value = "内部类型")
     private Integer internalTaskType;
  
     /**
      * 容器号
      */
     @TableField(value = "containerCode")
-    @ApiModelProperty(value="容器号")
+    @ApiModelProperty(value = "容器号")
     private String containerCode;
  
     /**
      * 从货位，源库位
      */
     @TableField(value = "fromLocation")
-    @ApiModelProperty(value="从货位，源库位")
+    @ApiModelProperty(value = "从货位，源库位")
     private String fromLocation;
  
     /**
      * 到货位，目的库位
      */
     @TableField(value = "toLocation")
-    @ApiModelProperty(value="到货位，目的库位")
+    @ApiModelProperty(value = "到货位，目的库位")
     private String toLocation;
  
     /**
@@ -122,35 +125,35 @@ public class TaskHeader implements Serializable {
      * 参考单内部号
      */
     @TableField(value = "referenceId")
-    @ApiModelProperty(value="参考单内部号")
+    @ApiModelProperty(value = "参考单内部号")
     private Integer referenceId;
  
     /**
      * 参考单号
      */
     @TableField(value = "referenceCode")
-    @ApiModelProperty(value="参考单号")
+    @ApiModelProperty(value = "参考单号")
     private String referenceCode;
  
     /**
      * 分配用户
      */
     @TableField(value = "assignedUser")
-    @ApiModelProperty(value="分配用户")
+    @ApiModelProperty(value = "分配用户")
     private String assignedUser;
  
     /**
      * 确认用户
      */
     @TableField(value = "confirmedBy")
-    @ApiModelProperty(value="确认用户")
+    @ApiModelProperty(value = "确认用户")
     private String confirmedBy;
  
     /**
      * 状态
      */
     @TableField(value = "status")
-    @ApiModelProperty(value="状态")
+    @ApiModelProperty(value = "状态")
     private Integer status;
  
     @TableField(exist = false)
@@ -160,14 +163,14 @@ public class TaskHeader implements Serializable {
      * 前置任务号
      */
     @TableField(value = "preTaskNo")
-    @ApiModelProperty(value="前置任务号")
+    @ApiModelProperty(value = "前置任务号")
     private Integer preTaskNo;
  
     /**
      * 出库口
      */
     @TableField(value = "port")
-    @ApiModelProperty(value="出库口")
+    @ApiModelProperty(value = "出库口")
     private String port;
  
  
@@ -175,201 +178,210 @@ public class TaskHeader implements Serializable {
      * 波次号
      */
     @TableField(value = "waveId")
-    @ApiModelProperty(value="波次号")
+    @ApiModelProperty(value = "波次号")
     private Integer waveId;
  
     /**
      * 车号
      */
     @TableField(value = "pickingCartCode")
-    @ApiModelProperty(value="车号")
+    @ApiModelProperty(value = "车号")
     private String pickingCartCode;
  
     /**
      * 位置号
      */
     @TableField(value = "pickingCartPos")
-    @ApiModelProperty(value="位置号")
+    @ApiModelProperty(value = "位置号")
     private String pickingCartPos;
  
     /**
      * 开始拣货时间
      */
     @TableField(value = "startPickDateTime")
-    @ApiModelProperty(value="开始拣货时间")
+    @ApiModelProperty(value = "开始拣货时间")
     private Date startPickDateTime;
  
     /**
      * 截至拣货时间
      */
     @TableField(value = "endPickDateTime")
-    @ApiModelProperty(value="截至拣货时间")
+    @ApiModelProperty(value = "截至拣货时间")
     private Date endPickDateTime;
  
     /**
      * 合流货位
      */
     @TableField(value = "rebatchLoc")
-    @ApiModelProperty(value="合流货位")
+    @ApiModelProperty(value = "合流货位")
     private String rebatchLoc;
  
     /**
      * 是否完成合流
      */
     @TableField(value = "finishRebatch")
-    @ApiModelProperty(value="是否完成合流")
+    @ApiModelProperty(value = "是否完成合流")
     private Integer finishRebatch;
  
     /**
      * 合流组唯一号
      */
     @TableField(value = "rebatchGroupCode")
-    @ApiModelProperty(value="合流组唯一号")
+    @ApiModelProperty(value = "合流组唯一号")
     private String rebatchGroupCode;
  
     /**
      * 是否允许合流
      */
     @TableField(value = "allowRebatch")
-    @ApiModelProperty(value="是否允许合流")
+    @ApiModelProperty(value = "是否允许合流")
     private Integer allowRebatch;
  
     /**
      * 任务处理类型
      */
     @TableField(value = "taskProcessType")
-    @ApiModelProperty(value="任务处理类型")
+    @ApiModelProperty(value = "任务处理类型")
     private String taskProcessType;
  
     /**
      * 二次分拣工作台
      */
     @TableField(value = "rebinBench")
-    @ApiModelProperty(value="二次分拣工作台")
+    @ApiModelProperty(value = "二次分拣工作台")
     private String rebinBench;
  
     /**
      * 二次分拣完成
      */
     @TableField(value = "rebined")
-    @ApiModelProperty(value="二次分拣完成")
+    @ApiModelProperty(value = "二次分拣完成")
     private Integer rebined;
  
     /**
      * 二次分拣开始时间
      */
     @TableField(value = "startRebinDateTime")
-    @ApiModelProperty(value="二次分拣开始时间")
+    @ApiModelProperty(value = "二次分拣开始时间")
     private Date startRebinDateTime;
  
     /**
      * 二次分拣结束时间
      */
     @TableField(value = "endRebinDateTime")
-    @ApiModelProperty(value="二次分拣结束时间")
+    @ApiModelProperty(value = "二次分拣结束时间")
     private Date endRebinDateTime;
  
     /**
      * 二次分拣人
      */
     @TableField(value = "rebinedBy")
-    @ApiModelProperty(value="二次分拣人")
+    @ApiModelProperty(value = "二次分拣人")
     private String rebinedBy;
  
     /**
      * 异常原因
      */
     @TableField(value = "exceptionCode")
-    @ApiModelProperty(value="异常原因")
+    @ApiModelProperty(value = "异常原因")
     private String exceptionCode;
  
     /**
      * 异常处理人
      */
     @TableField(value = "exceptionHandledBy")
-    @ApiModelProperty(value="异常处理人")
+    @ApiModelProperty(value = "异常处理人")
     private String exceptionHandledBy;
  
     /**
      * 创建时间
      */
-    @TableField(value = "created", fill = FieldFill.INSERT)
-    @ApiModelProperty(value="创建时间")
+    @TableField(value = "created")
+    @ApiModelProperty(value = "创建时间")
     private Date created;
  
     /**
      * 创建用户
      */
-    @TableField(value = "createdBy", fill = FieldFill.INSERT)
-    @ApiModelProperty(value="创建用户")
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value = "创建用户")
     private String createdBy;
  
+    public void setCreatedBy(String createdBy) {
+        if (StringUtils.isEmpty(createdBy)) {
+            this.createdBy = ShiroUtils.getUserName();
+        } else {
+            this.createdBy = createdBy;
+        }
+
+    }
+
     /**
      * 创建时间
      */
-    @TableField(value = "lastUpdated",fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value="创建时间")
+    @TableField(value = "lastUpdated", fill = FieldFill.INSERT_UPDATE)
+    @ApiModelProperty(value = "创建时间")
     private Date lastUpdated;
  
     /**
      * 更新用户
      */
-    @TableField(value = "lastUpdatedBy",fill = FieldFill.INSERT_UPDATE)
-    @ApiModelProperty(value="更新用户")
+    @TableField(value = "lastUpdatedBy", fill = FieldFill.INSERT_UPDATE)
+    @ApiModelProperty(value = "更新用户")
     private String lastUpdatedBy;
  
     /**
      * 数据版本
      */
     @TableField(value = "version")
-    @ApiModelProperty(value="数据版本")
+    @ApiModelProperty(value = "数据版本")
     private Integer version;
  
     /**
      * AGV区域任务标志 =‘AGV’
      */
     @TableField(value = "userDef1")
-    @ApiModelProperty(value="AGV区域任务标志 =‘AGV’")
+    @ApiModelProperty(value = "AGV区域任务标志 =‘AGV’")
     private String userDef1;
  
     /**
      * 自定义字段2
      */
     @TableField(value = "userDef2")
-    @ApiModelProperty(value="自定义字段2")
+    @ApiModelProperty(value = "自定义字段2")
     private String userDef2;
  
     /**
      * 同步标志  0：需要同步 10：同步成功   20：同步失败
      */
     @TableField(value = "userDef3")
-    @ApiModelProperty(value="同步标志  0：需要同步 10：同步成功   20：同步失败")
+    @ApiModelProperty(value = "同步标志  0：需要同步 10：同步成功   20：同步失败")
     private String userDef3;
  
     /**
      * 处理标记
      */
     @TableField(value = "processStamp")
-    @ApiModelProperty(value="处理标记")
+    @ApiModelProperty(value = "处理标记")
     private String processStamp;
  
     /**
      * 站台
      */
     @TableField(value = "recvDock")
-    @ApiModelProperty(value="站台")
+    @ApiModelProperty(value = "站台")
     private String recvDock;
  
     /**
      * 需要容器数量
      */
     @TableField(value = "containQty")
-    @ApiModelProperty(value="需要容器数量")
+    @ApiModelProperty(value = "需要容器数量")
     private Integer containQty;
  
  
     @TableField(value = "priority")
-    @ApiModelProperty(value="优先级")
+    @ApiModelProperty(value = "优先级")
     private Integer priority;
  
  
@@ -416,25 +428,32 @@ public class TaskHeader implements Serializable {
     @TableField(value = "roadway")
     private String roadway;
  
-    /** 货主id */
+    /**
+     * 货主id
+     */
     @TableField(value = "companyId")
     private Integer companyId;
  
-    /** 仓库id */
+    /**
+     * 仓库id
+     */
     @TableField(value = "warehouseId")
     private Integer warehouseId;
  
-    /** 货架 */
+    /**
+     * 货架
+     */
     @TableField(value = "goodsShelfNo")
     private String goodsShelfNo;
  
     @TableField(value = "clickNum")
     private Integer clickNum;
  
-    public Integer getFirstStatus(){
+    public Integer getFirstStatus() {
         return status;
     }
-    public Integer getType(){
+
+    public Integer getType() {
         return taskType;
     }
 }
@@ -223,6 +223,7 @@ public class ShipmentTaskService {
         task.setWarehouseCode(shipmentContainerHeader.getWarehouseCode());
         task.setAssignedUser(ShiroUtils.getLoginName());
         task.setConfirmedBy(ShiroUtils.getLoginName());
+        task.setCreatedBy(ShiroUtils.getUserName());
         //东厂默认分配站台 KS0001 LK
         if (location.getWarehouseCode().equals("KS0001") && location.getZoneCode().equals(QuantityConstant.ZONE_CODE_TYPE_LK)) {
             Station station = stationService.getOne(
@@ -298,6 +299,8 @@ public class ShipmentTaskService {
             taskDetail.setStatus(QuantityConstant.TASK_STATUS_BUILD);
             taskDetail.setWaveId(shipmentContainerDetail.getWaveId());
             taskDetail.setInventorySts(shipmentContainerDetail.getInventorySts());
+
+            taskDetail.setCreatedBy(shipmentContainerDetail.getCreatedBy());
             if (!taskDetailService.save(taskDetail)) {
                 throw new ServiceException("新建任务明细失败，sql报错");
             }