Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4.git into

develop Conflicts: huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/IReceiptContainerHeaderService.java

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4.git into
develop Conflicts: huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/IReceiptContainerHeaderService.java
谭毅彬
2 parents d96586ec e52db63a
Showing 10 changed files with 173 additions and 112 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/IReceiptContainerHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java
@@ -69,8 +69,8 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
-                     @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
+<!--                     @handleSuperQuery="handleSuperQuery"></j-super-query>-->
     </div>
     <!-- table区域-begin -->
@@ -118,19 +118,20 @@
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'receiptContainerHeader:edit'" @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical"/>
           <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)">生成任务</a>
           <a v-else-if="record.status == 0" @click="createTask(record)">生成任务</a>
           <a-divider type="vertical"/>
+          <a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
+            <a>取消配盘</a>
+          </a-popconfirm>
+          <a-divider type="vertical"/>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
-              <a-menu-item v-has="'receiptContainerHeader:delete'">
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
+                <a-menu-item>
+                <a v-has="'receiptContainerHeader:edit'" @click="handleEdit(record)">编辑</a>
+                </a-menu-item>
             </a-menu>
           </a-dropdown>
         </span>
@@ -108,8 +108,8 @@
         <!--        <a-button type="primary" icon="import">导入</a-button>-->
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList='superFieldList' ref='superQueryModal'
-                     @handleSuperQuery='handleSuperQuery'></j-super-query>
+<!--      <j-super-query :fieldList='superFieldList' ref='superQueryModal'-->
+<!--                     @handleSuperQuery='handleSuperQuery'></j-super-query>-->
     </div>
     <!-- table区域-begin -->
 package org.jeecg.modules.wms.receipt.receiptContainerHeader.controller;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jeecg.common.system.query.QueryGenerator;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.utils.HuahengJwtUtil;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.ILocationService;
 import org.jeecg.modules.wms.config.port.entity.Port;
@@ -19,34 +28,27 @@ import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContai
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.service.IReceiptContainerDetailService;
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.service.IReceiptContainerHeaderService;
-import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
+import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-import java.util.Arrays;
-import org.jeecg.common.util.oConvertUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 /**
  * @Description: 入库组盘
@@ -133,8 +135,9 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
     @DeleteMapping(value = "/delete")
     @RequiresPermissions("receiptContainerHeader:delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        receiptContainerHeaderService.delMain(id);
-        return Result.OK("删除成功!");
+//        receiptContainerHeaderService.delMain(id);
+        Result result = receiptContainerHeaderService.cancelReceiving(Integer.parseInt(id));
+        return result;
     }
     /**
@@ -147,8 +150,10 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
     @DeleteMapping(value = "/deleteBatch")
     @RequiresPermissions("receiptContainerHeader:deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.receiptContainerHeaderService.delBatchMain(Arrays.asList(ids.split(",")));
-        return Result.OK("批量删除成功!");
+        List<String> idList = Arrays.asList(ids.split(","));
+        List<Integer> idInterList = idList.stream().map(Integer::parseInt).collect(Collectors.toList());
+        Result result = receiptContainerHeaderService.cancelReceiving(idInterList);
+        return result;
     }
     /**
 package org.jeecg.modules.wms.receipt.receiptContainerHeader.service;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.wms.config.container.entity.Container;
-import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
-import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
-import org.springframework.beans.factory.annotation.Autowired;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
 /**
  * @Description: 入库组盘
  * @Author:      jeecg-boot
@@ -50,4 +50,15 @@ public interface IReceiptContainerHeaderService extends IService&lt;ReceiptContaine
      * @return
      */
     boolean cancelReceiptTask(Integer receiptContainerHeaderId);
+
+    /**
+     * 取消组盘
+     */
+    public Result cancelReceiving(Integer id);
+
+    /**
+     * 批量取消组盘
+     */
+    public Result cancelReceiving(List<Integer> ids);
+
 }
 package org.jeecg.modules.wms.receipt.receiptContainerHeader.service.impl;
-import com.aliyun.oss.ServiceException;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.config.container.entity.Container;
 import org.jeecg.modules.wms.config.container.service.IContainerService;
@@ -23,17 +28,14 @@ import org.jeecg.modules.wms.task.taskHeader.service.ITaskDetailService;
 import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collection;
-import java.util.stream.Collectors;
+import com.aliyun.oss.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 入库组盘
@@ -322,4 +324,48 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         return true;
     }
+    @Override
+    @Transactional(rollbackFor = ServiceException.class)
+    public Result cancelReceiving(Integer id) {
+        ReceiptContainerHeader receiptContainerHeader = getById(id);
+        if (receiptContainerHeader == null) {
+            return Result.error("取消组盘失败，没有找到入库组盘头id是" + id);
+        }
+        int status = receiptContainerHeader.getStatus();
+        if (status >= QuantityConstant.RECEIPT_CONTAINER_TASK) {
+            return Result.error("取消组盘失败，已经生成入库任务");
+        }
+        List<ReceiptContainerDetail> receiptContainerDetailList = receiptContainerDetailService.getReceiptContainerDetailListByHeaderId(id);
+        for (ReceiptContainerDetail receiptContainerDetail : receiptContainerDetailList) {
+            ReceiptDetail receiptDetail = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId());
+            if (receiptDetail != null) {
+                receiptDetail.setStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
+                receiptDetail.setTaskQty(receiptDetail.getTaskQty().subtract(receiptContainerDetail.getQty()));
+                if (!receiptDetailService.updateById(receiptDetail)) {
+                    throw new ServiceException("取消组盘失败, 更新入库明细失败id是" + receiptContainerDetail.getReceiptDetailId());
+                }
+            }
+            if (!receiptContainerDetailService.removeById(receiptContainerDetail.getId())) {
+                throw new ServiceException("取消组盘失败， 删除入库组盘明细表失败id是" + receiptContainerDetail.getId());
+            }
+            if (!receiptHeaderService.updateReceiptHeaderStatus(receiptDetail.getReceiptId())) {
+                throw new ServiceException("取消组盘失败, 更新入库单头失败");
+            }
+        }
+        if (!this.removeById(id)) {
+            throw new ServiceException("取消组盘失败, 删除入库组盘头表失败id是" + id);
+        }
+
+        return Result.ok("取消组盘成功");
+    }
+
+    @Override
+    public Result cancelReceiving(List<Integer> ids) {
+        Result result = null;
+        for (Integer id : ids) {
+            result = cancelReceiving(id);
+        }
+        return result;
+    }
+
 }
 package org.jeecg.modules.wms.receipt.receiptHeader.controller;
-import com.aliyun.oss.ServiceException;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jeecg.common.system.query.QueryGenerator;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.wms.api.erp.service.IErpService;
 import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
 import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean;
 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
-import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
-import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
-import org.jeecg.utils.HuahengJwtUtil;
-import org.jeecg.modules.wms.api.erp.service.IErpService;
-import org.jeecg.modules.wms.config.material.entity.Material;
 import org.jeecg.modules.wms.config.material.service.IMaterialService;
+import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
-import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
+import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.jeecg.common.util.oConvertUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.system.vo.LoginUser;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.aliyun.oss.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 /**
  * @Description: 入库表主表
@@ -143,7 +140,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @RequiresPermissions("receiptHeader:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        receiptHeaderService.delMain(id,QuantityConstant.WMS_DELETE_RECEIPT);
+        receiptHeaderService.delMain(id, QuantityConstant.WMS_DELETE_RECEIPT);
+
         return Result.OK("删除成功!");
     }
@@ -198,18 +196,17 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @ApiOperation(value = "入库单详情-通过多个明细id查询", notes = "入库单详情-通过多个明细id查询")
     @PostMapping(value = "/listReceiptDetailByIds")
-    public Result<List<ReceiptDetail>> listReceiptDetailByIds(@RequestBody List<Integer> ids ) {
+    public Result<List<ReceiptDetail>> listReceiptDetailByIds(@RequestBody List<Integer> ids) {
         return Result.ok(receiptDetailService.listByIds(ids));
     }
     @ApiOperation(value = "入库单详情-查询未收完的明细", notes = "入库单详情-查询未收完的明细")
     @GetMapping(value = "/listReceiptDetailByCode")
-    public Result<IPage<ReceiptDetail>> listReceiptDetailByCode(String code,  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    public Result<IPage<ReceiptDetail>> listReceiptDetailByCode(String code, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         LambdaQueryWrapper<ReceiptDetail> query = Wrappers.lambdaQuery();
-        query.eq(StringUtils.isNotEmpty(code), ReceiptDetail::getReceiptCode, code)
-                .lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED)
-                .last(" and qty-task_qty>0");
+        query.eq(StringUtils.isNotEmpty(code), ReceiptDetail::getReceiptCode, code).lt(ReceiptDetail::getStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED)
+            .last(" and qty-task_qty>0");
         Page<ReceiptDetail> page = new Page<ReceiptDetail>(pageNo, pageSize);
         IPage<ReceiptDetail> pageList = receiptDetailService.page(page, query);
         return Result.ok(pageList);
 package org.jeecg.modules.wms.receipt.receiptHeader.service;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
-import org.springframework.beans.factory.annotation.Autowired;
 import java.io.Serializable;
 import java.util.Collection;
-import java.util.List;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 入库表主表
@@ -19,7 +19,7 @@ public interface IReceiptHeaderService extends IService&lt;ReceiptHeader&gt; {
     /**
      * 删除一对多 reason进入历史单据的原因
      */
-    public boolean delMain(String id,String reason);
+    public boolean delMain(String id, String reason);
     /**
      * 批量删除一对多
@@ -40,4 +40,5 @@ public interface IReceiptHeaderService extends IService&lt;ReceiptHeader&gt; {
     public ReceiptHeader getReceiptHeaderByCode(String code, String warehouseCode);
     public ReceiptHeader getReceiptHeaderByReferCode(String referCode, String warehouseCode);
+
 }
@@ -20,6 +20,8 @@ import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.monitor4all.logRecord.annotation.OperationLog;
 import cn.monitor4all.logRecord.context.LogRecordContext;
@@ -122,6 +124,7 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
     @Override
     @Transactional
     public String createCode(String receiptType) {
+        int i = 0;
         String code = null;
         Date now = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
@@ -85,7 +85,7 @@ public class ReceiveController {
     }
     /**
-     * 收货
+     * 生成任务
      * @return
      */
     @AutoLog("入库单-生成任务")
@@ -96,4 +96,5 @@ public class ReceiveController {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         return receiveService.receivingAndCreateTask(receiveList, warehouseCode);
     }
+
 }
@@ -107,11 +107,7 @@ public class ShipmentDetail implements Serializable {
     /** 上游行号 */
     @Excel(name = "上游行号", width = 15)
     @ApiModelProperty(value = "上游行号")
-    private String referLineNum;
-    @Excel(name = "唯一号", width = 15)
-    @ApiModelProperty(value = "唯一号")
-    private String uniqueCode;
-    /** 备用字段1 */
+    private String referLineNum;    /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
     @ApiModelProperty(value = "备用字段1")
     private String userdef1;