出库任务

wangyanxiong
1 parent 80c78307
Showing 5 changed files with 187 additions and 36 deletions
src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/task/taskDetail/taskDetail.html
src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -162,12 +162,6 @@ public class TaskDetail implements Serializable {
     @ApiModelProperty(value="参考单号")
     private String referenceCode;
  
-    /**
-     * 参考内部号
-     */
-    @TableField(value = "referenceId")
-    @ApiModelProperty(value="参考内部号")
-    private Integer referenceId;
  
     /**
      * 参考内部行号
@@ -30,4 +30,6 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
     AjaxResult completeCycleCountOrSeeOutTask(TaskHeader taskHeader);
  
     AjaxResult createReceiptTask(List<Integer> ids);
+
+    void completeShipmentTask(TaskHeader task) ;
 }
@@ -9,8 +9,10 @@ import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.container.domain.Container;
+import com.huaheng.pc.config.container.service.ContainerService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
@@ -29,6 +31,7 @@ import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerD
 import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
+import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
@@ -36,6 +39,8 @@ import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -77,6 +82,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     @Autowired
     private ReceiptContainerDetailService receiptContainerDetailService;
  
+
+    @Autowired
+    private ContainerService containerService;
+
+
     @Resource
     private ReceiptContainerHeaderService receiptContainerHeaderService;
  
@@ -197,6 +207,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
  
     }
  
+    /**
+     *
+     * 执行任务
+     * */
     @Override
     public AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds) {
         TaskHeader task = null;
@@ -221,8 +235,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
             lambdaUpdateWrapper.eq(TaskDetail::getTaskId, task.getId());
             taskDetailService.update(record, lambdaUpdateWrapper);
-
-
 //            if (task.getInternalTaskType().equals("100"))
 //            {
 //                List<Map<String, Object>> maps = taskDetailService.selectListMapByEqual("billId, billDetailId", condition);
@@ -290,7 +302,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             completeReceiptTask(task);
         }
         if (task.getInternalTaskType() == 300 || task.getInternalTaskType() == 400) {
-//            //出库任务
+            //出库任务
 //            completeShipmentTask(task);
         }
         //...其他任务类型暂时不处理    // 700 盘点   800 移库  900 出库查看
@@ -312,6 +324,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     @Override
+    @Transactional
     public AjaxResult completeReceiptTask(TaskHeader task) throws Exception {
         List<Map<String, Object>> taskReceiptContainerDetail =taskHeaderMapper.getReceiptTask(task.getId());
         if (taskReceiptContainerDetail.size()<1){
@@ -333,13 +346,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     header.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
                     header.setCompanyCode(task.getCompanyCode());//货主
                     header.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
+                    header.setLocationCode(task.getToLocation());
                     header.setTotalQty(DataUtils.getInteger(map.get("totalQty")));//总数量
                     header.setLocking(1);
                     header.setEnable(1);
                     header.setCreatedBy(ShiroUtils.getLoginName());
                     header.setCreated(new Date());
                     header.setLastUpdated(new Date());
-                    inventoryHeaderService.save(header);
+                    if (!inventoryHeaderService.save(header))
+                        throw new ServiceException("添加库存单失败");
+
                     //库存明细添加
                     detail = new InventoryDetail();
                     detail.setInventoryHeaderId(header.getId());//库存头ID
@@ -355,13 +371,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     detail.setBatch(DataUtils.getString(map.get("batch")));//批次
                     detail.setLot(DataUtils.getString(map.get("lot")));//批号
                     detail.setInventorySts(DataUtils.getString(map.get("inventorySts")));//库存状态
-                    detail.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));//生产日期
-                    detail.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));//失效日期
+                    detail.setManufactureDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("manufactureDate").toString()));//生产日期
+                    detail.setExpirationDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("expirationDate").toString()));//失效日期
                     detail.setQty(DataUtils.getBigDecimal(map.get("qty")));//数量
                     detail.setTaskQty(DataUtils.getBigDecimal(map.get("qty")));
                     detail.setCreatedBy(ShiroUtils.getLoginName());//创建人
                     detail.setLastUpdatedBy(ShiroUtils.getLoginName());//创建时间
-                    inventoryDetailService.save(detail);
+                    if (!inventoryDetailService.save(detail))
+                        throw new ServiceException("添加库存明细失败");
                 }
                 else
                 {
@@ -369,7 +386,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     detail.setLastUpdatedBy(ShiroUtils.getLoginName());
                     LambdaUpdateWrapper<InventoryDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
                     lambdaUpdateWrapper.eq(InventoryDetail::getId,DataUtils.getInteger(map.get("receiptDetailId")));
-                    inventoryDetailService.update(detail, lambdaUpdateWrapper);
+                    if (!inventoryDetailService.update(detail, lambdaUpdateWrapper)){
+                        throw new ServiceException("更新入库单明细失败");
+                    }
                 }
                 //记录库存交易记录
                 InventoryTransaction inventoryTransaction = new InventoryTransaction();
@@ -390,22 +409,23 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 inventoryTransaction.setTaskQty(DataUtils.getInteger(map.get("qty")));
                 inventoryTransaction.setCreated(new Date());
                 inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
-                inventoryTransactionService.save(inventoryTransaction);
-                //修改任务明细的状态为完成
-                TaskDetail taskDetail = new TaskDetail();
-                taskDetail.setStatus(100);
-                taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
-                taskDetail.setAgingDate(new Date());   //入库时间
-                LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
-                lambdaUpdateWrapper.eq(TaskDetail::getTaskId, DataUtils.getInteger(map.get("taskDetailId")));
-                taskDetailService.update(taskDetail, lambdaUpdateWrapper);
-                //修改入库单的状态
-                ReceiptHeader receiptHeader =new ReceiptHeader();
-                receiptHeader.setFirstStatus(100);
-                receiptHeader.setLastStatus(100);
-                LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-                receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
-                receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper);
+                if (!inventoryTransactionService.save(inventoryTransaction))
+                    throw new ServiceException("新增库存记录失败");
+//                //修改任务明细的状态为完成
+//                TaskDetail taskDetail = new TaskDetail();
+//                taskDetail.setStatus(100);
+//                taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
+//                taskDetail.setAgingDate(new Date());   //入库时间
+//                LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
+//                lambdaUpdateWrapper.eq(TaskDetail::getTaskId, DataUtils.getInteger(map.get("taskDetailId")));
+//                taskDetailService.update(taskDetail, lambdaUpdateWrapper);
+//                //修改入库单的状态
+//                ReceiptHeader receiptHeader =new ReceiptHeader();
+//                receiptHeader.setFirstStatus(100);
+//                receiptHeader.setLastStatus(100);
+//                LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+//                receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId")));
+//                receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper);
  
         //修改任务主表状态，因为立库任务表单头只对应一个货箱，表单详情的任务会同时完成
                 task.setStatus(100);
@@ -413,24 +433,39 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 task.setLastUpdated(new Date());
                 LambdaUpdateWrapper<TaskHeader> taskHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 taskHeaderLambdaUpdateWrapper.eq(TaskHeader::getId, task.getId());
-                taskHeaderService.update(task, taskHeaderLambdaUpdateWrapper);
+                if (!taskHeaderService.update(task, taskHeaderLambdaUpdateWrapper))
+                    throw new ServiceException("更新任务主表失败");
         //修改库位状态和对应的容器
                 Location location =new Location();
                 location.setContainerCode(task.getContainerCode());
                 location.setStatus("empty");
                 LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 locationLambdaUpdateWrapper.eq(Location::getCode, task.getToLocation());
-                locationService.update(location, locationLambdaUpdateWrapper);
+                if (!locationService.update(location, locationLambdaUpdateWrapper))
+                    throw new ServiceException("更新库位失败");
         //修改容器状态和对应的库位
                 Container container =new Container();
                 container.setLocationCode(task.getToLocation());
                 container.setStatus("some");
+                LambdaUpdateWrapper<Container> containerLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                containerLambdaUpdateWrapper.eq(Container::getCode,task.getContainerCode());
+                if (!containerService.update(container, containerLambdaUpdateWrapper))
+                    throw new ServiceException("更新容器失败");
+
         //修改组盘表状态为20
                 ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
                 receiptContainerDetail.setStatus(20);
                 LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId,DataUtils.getInteger(map.get("receiptId")));
                 receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper);
+                if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
+                    throw new ServiceException("更新组盘状态失败");
+        //修改入库明细
+                ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId()));
+                if (!receiptDetailService.updateById(receiptDetail)){
+                    throw new ServiceException("更新状态失败");
+                }
+                receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
            }
         }
         return AjaxResult.success("完成入库任务");
@@ -606,5 +641,125 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         return  AjaxResult.success("生成任务成功！");
     }
  
+    /**
+     *
+     * 完成出库任务
+     * */
+    @Override
+    public void completeShipmentTask(TaskHeader task) {
+        //获取所有子任务
+        TaskDetail condition = new TaskDetail();
+        condition.setTaskId(task.getId());
+        LambdaQueryWrapper<TaskDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(condition);
+        List<TaskDetail> taskDetails = taskDetailService.list(lambdaQueryWrapper);
+        List<Integer> shipmentHeadIds = new ArrayList<>();
+//        for(TaskDetail taskDetail : taskDetails){
+//            if(taskDetail.getStatus()<20){
+//                //获取出库子货箱
+//                ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.selectEntityById(taskDetail.getAllocationId());
+//                //取出子单据
+//                ShipmentDetail shipmentDetail = shipmentDetailService.selectEntityById(taskDetail.getBillDetailId());
+////                //取出主单据
+////                ShipmentHeader shipmentHeader = shipmentHeaderService.selectEntityById(shipmentContainerDetail.getShipmentHeaderId());
+//                //暂存id，为更新单据状态准备
+//                shipmentHeadIds.add(taskDetail.getBillId());
+//                //获取对应库存记录
+//                Inventory inventory = inventoryService.selectEntityById(taskDetail.getInventoryId());
+//                if (inventory == null)  {
+//                    throw new ServiceException("任务明细对应的库存ID【" + taskDetail.getInventoryId().toString() + "】不存在！");
+//                }
+//                BigDecimal orignalQty = inventory.getQty();
+//                //扣减库存
+//                inventory.setTaskQty(inventory.getTaskQty().subtract(taskDetail.getQty()));
+//                inventory.setQty(inventory.getQty().subtract(taskDetail.getQty()));
+//                if(inventory.getQty().compareTo(new BigDecimal("0"))==0 && inventory.getTaskQty().compareTo(new BigDecimal("0"))==0){
+//                    //如果库存没有了，就删除这个库存
+//                    inventoryService.deleteById(inventory.getId());
+//                }else {
+//                    //否则更新这个库存
+//                    inventoryService.updateByModel(inventory);
+//                }
+//                //设置子任务状态为已执行
+//                taskDetail.setStatus((short)100);
+//                taskDetail.setEndTime(new Date());   //完成时间
+//                taskDetailService.updateByModel(taskDetail);
+//                //记录库存交易记录
+//                InventoryTransaction inventoryTransaction = new InventoryTransaction();
+//                inventoryTransaction.setWarehouseId(task.getWarehouseId());
+//                inventoryTransaction.setWarehouseCode(task.getWarehouseCode());
+//                inventoryTransaction.setCompanyId(shipmentDetail.getCompanyId());
+//                inventoryTransaction.setCompanyCode(shipmentDetail.getCompanyCode());
+//                inventoryTransaction.setLocationId(inventory.getLocationId());
+//                inventoryTransaction.setLocationCode(inventory.getLocationCode());
+//                inventoryTransaction.setContainerCode(inventory.getContainerCode());
+//                inventoryTransaction.setSourceCode(shipmentDetail.getSourceCode());
+//                inventoryTransaction.setSourceLine(shipmentDetail.getSourceLine());
+//                inventoryTransaction.setType("shipment");
+//                inventoryTransaction.setCompanyId(task.getCompanyId());
+//                inventoryTransaction.setMaterialId(shipmentDetail.getMaterialId());
+//                inventoryTransaction.setMaterialCode(shipmentDetail.getMaterialCode());
+//                //inventory.setMaterialName(DataUtils.getString(taskDetail.getMaterialName()));//物料名称
+//                inventoryTransaction.setBillId(taskDetail.getBillId());
+//                inventoryTransaction.setBillCode(taskDetail.getBillCode());
+//                inventoryTransaction.setBillDetailId(shipmentDetail.getId());
+//                inventoryTransaction.setBatch(shipmentDetail.getBatch());
+//                inventoryTransaction.setLot(shipmentDetail.getLot());
+//                inventoryTransaction.setProject(shipmentDetail.getProject());
+//                inventoryTransaction.setManufactureDate(shipmentDetail.getManufactureDate());
+//                inventoryTransaction.setExpirationDate(shipmentDetail.getExpirationDate());
+//                inventoryTransaction.setStatus(inventory.getStatus());
+//                //这里取反，更符合出库的语义，同时方便对记录进行统计
+//                inventoryTransaction.setQty(orignalQty);
+//                inventoryTransaction.setTaskQty(taskDetail.getQty().negate());
+////                inventoryTransaction.setCostPrice(shipmentDetail.);
+//                inventoryTransaction.setCreated(null);
+//                inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
+//                inventoryTransaction.setLastUpdated(null);
+//                inventoryTransaction.setLastUpdatedBy(ShiroUtils.getLoginName());
+//                inventoryTransactionService.insert(inventoryTransaction);
+////                //更新单据状态
+////                shipmentHeaderService.updateShipmentStatus(shipmentHeader.getId());
+//            }
+//        }
+//        //设置主任务为已执行
+//        task.setFirstStatus((short)100);
+//        task.setLastStatus((short)100);
+//        task.setLastUpdatedBy(ShiroUtils.getLoginName());
+//        task.setEndTime(new Date());
+//        taskService.updateByModel(task);
+//        //将库位状态改为空闲，如果是整出的对应的容器也清空
+//        Location locationRecord = new Location();
+//        locationRecord.setStatus("empty");
+//        if(task.getType()==300) {
+//            locationRecord.setContainerCode("");
+//            locationRecord.setContainerId(null);
+//        }
+//        Location locationCondition = new Location();
+//        locationCondition.setCode(task.getSourceLocation());
+//        locationCondition.setWarehouseId(ShiroUtils.getWarehouseId());
+//        locationService.updateByCondition(locationRecord, locationCondition);
+//        //如果是整出，删掉这个库位上的这个托盘，否则更改托盘状态
+//        Container containerRecord = new Container();
+//        if(task.getType()==300) {
+//            containerService.updateLocationCodeAndStatus(task.getContainerCode(),"","empty");
+//        }
+//        else    {
+//            //查询是否存在关联的库存，入如果没有就修改容器状态为empty
+//            Inventory inventoryCondition = new Inventory();
+//            inventoryCondition.setLocationCode(task.getSourceLocation());
+//            inventoryCondition.setWarehouseId(ShiroUtils.getWarehouseId());
+//            Map<String, Object> map = inventoryService.selectFirstMap("id", inventoryCondition);
+//            if (map == null) {
+//                //如果没有库存就设置为empty
+//                containerService.updateStatus(task.getContainerCode(), "empty");
+//            }
+//        }
+//        //设置出库货箱状态为拣货任务完成
+//        shipmentContainerHeaderService.resetStatusShipmentContainer(task.getAllocationHeadId(),(short)20);
+//        //最后更新单据状态
+//        shipmentHeadIds.stream().distinct().forEach(t->shipmentHeaderService.updateShipmentStatus(t));
+
+    }
+
  
 }
@@ -72,12 +72,12 @@
                     sortable:true
 				},
 				{
-					field : 'sourceLocation', 
+					field : 'fromLocation',
 					title : '源库位',
                     sortable:true
 				},
 				{
-					field : 'destinationLocation', 
+					field : 'toLocation',
 					title : '目的库位',
                     sortable:true
 				},
@@ -32,7 +32,7 @@
 									</li>
  
 									<li>
-										库位编号：<input type="text" name="locationCode"/>
+										库位编号：<input type="text" name="toLocation"/>
 									</li>
 									<li class="time" style="height: 30px">
 										<label>创建时间： </label>
@@ -171,7 +171,7 @@
  
 				},
                  {
-                        field : 'locationCode',
+                        field : 'toLocation',
                         title : '库位号',
                         visible:true
                    },