feat: 历史出库单打印

易文鹏
1 parent 8cdecfec
Showing 5 changed files with 122 additions and 29 deletions
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/domain/ShipmentHeaderHistory.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
@@ -420,10 +420,16 @@ public class ShipmentHeaderController extends BaseController {
             shipmentHeader = shipmentHeaderService.getById(id);
         }
         if (shipmentHeader == null) {
-            AjaxResult.error("没有找到该出库单");
+            return AjaxResult.error("没有找到该出库单");
         }
         if (shipmentHeader.getShipmentType().equals("merge")) {
+            if (shipmentHeader.getRecordCode() == null) {
+                return AjaxResult.error("该出库单没有合并前单号:" + shipmentHeader.getCode());
+            }
             String[] splitData = shipmentHeader.getRecordCode().split(",");
+            if (StringUtils.isEmpty(splitData)) {
+                return AjaxResult.error("该出库单没有合并前单号:" + shipmentHeader.getRecordCode());
+            }
             List<String> recordCodes = new ArrayList<>(Arrays.asList(splitData));
             if (!recordCodes.isEmpty()) {
                 for (String code : recordCodes) {
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.DateUtils;
 import com.huaheng.common.utils.StringUtils;
@@ -19,15 +20,21 @@ import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
 import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
 import com.huaheng.pc.shipment.shipmentDetailHistory.service.ShipmentDetailHistoryService;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
 import com.huaheng.pc.shipment.shipmentHeaderHistory.service.ShipmentHeaderHistoryService;
+import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
  
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
  
@@ -47,6 +54,10 @@ public class ShipmentHeaderHistoryController extends BaseController {
     private ShipmentHeaderHistoryService shipmentHeaderHistoryService;
     @Autowired
     private ShipmentDetailHistoryService shipmentDetailHistoryService;
+    @Autowired
+    private ShipmentHeaderService shipmentHeaderService;
+    @Autowired
+    private TaskDetailService taskDetailService;
  
  
     @RequiresPermissions("shipment:bill:view")
@@ -217,4 +228,51 @@ public class ShipmentHeaderHistoryController extends BaseController {
     }
  
  
+    @GetMapping("/autoreport/{id}")
+    @ResponseBody
+    public AjaxResult autoReport(@PathVariable("id") Integer id) {
+        ShipmentHeaderHistory shipmentHeaderHistory = shipmentHeaderHistoryService.getById(id);
+        if (shipmentHeaderHistory == null) {
+            return AjaxResult.error("没有找到该出库单");
+        }
+        ShipmentHeader newShipmentHeader = new ShipmentHeader();
+        if (shipmentHeaderHistory.getShipmentType().equals("merge")) {
+            if (shipmentHeaderHistory.getRecordCode() == null) {
+                return AjaxResult.error("该出库单没有合并前单号:" + shipmentHeaderHistory.getCode());
+            }
+            String[] splitData = shipmentHeaderHistory.getRecordCode().split(",");
+            if (StringUtils.isEmpty(splitData)) {
+                return AjaxResult.error("该出库单没有合并前单号:" + shipmentHeaderHistory.getCode());
+            }
+            List<String> recordCodes = new ArrayList<>(Arrays.asList(splitData));
+            if (!recordCodes.isEmpty()) {
+                for (String code : recordCodes) {
+                    ShipmentHeaderHistory originalHeaderHistory = shipmentHeaderHistoryService.getOne(new LambdaQueryWrapper<ShipmentHeaderHistory>().eq(ShipmentHeaderHistory::getCode, code));
+
+                    List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getRecordCode, originalHeaderHistory.getCode()));
+                    if (taskDetails.isEmpty()) {
+                        throw new ServiceException("未组盘生成任务，无法打印!");
+                    }
+                    BeanUtils.copyProperties(originalHeaderHistory, newShipmentHeader);
+                    AjaxResult result = shipmentHeaderService.autoReport(newShipmentHeader, taskDetails, shipmentHeaderHistory.getCode());
+                    if (result.hasErr()) {
+                        throw new ServiceException("打印平库出库单失败:" + result.getMsg());
+                    }
+                }
+            }
+        } else {
+            List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getBillCode, shipmentHeaderHistory.getCode()));
+            if (taskDetails.isEmpty()) {
+                throw new ServiceException("未组盘生成任务，无法打印!");
+            }
+            BeanUtils.copyProperties(shipmentHeaderHistory, newShipmentHeader);
+            AjaxResult result = shipmentHeaderService.autoReport(newShipmentHeader, taskDetails, "");
+            if (result.hasErr()) {
+                throw new ServiceException("打印平库出库单失败:" + result.getMsg());
+            }
+        }
+        return AjaxResult.success();
+    }
+
+
 }
@@ -426,6 +426,12 @@ public class ShipmentHeaderHistory implements Serializable {
     @TableField(value = "recordID")
     @ApiModelProperty(value = "记录合并订单ID")
     private String recordID;
+    /**
+     * 记录合并之前的单据号
+     */
+    @TableField(value = "recordCode")
+    @ApiModelProperty(value = "记录合并之前的单据号")
+    private String recordCode;
  
     /**
      * 通知单号
@@ -411,9 +411,21 @@ public class ShipmentTaskService {
             task.setLastUpdatedBy(ShiroUtils.getName());
         }
         taskHeaderService.updateById(task);
-        /* 更新库位和容器*/
-        updateShipmentLocationContainer(task.getFromLocation(), task.getToLocation(),
-                task.getContainerCode(), task.getTaskType(), warehouseCode);
+        //平库删除库位和容器
+        if (task.getFlat() != null && task.getFlat() == 1) {
+            if (!locationService.remove(new LambdaQueryWrapper<Location>().eq(Location::getCode, task.getFromLocation()))) {
+                throw new ServiceException("删除库位失败:" + task.getOriginLocation());
+            }
+            if (!containerService.remove(new LambdaQueryWrapper<Container>().eq(Container::getCode, task.getContainerCode()))) {
+                throw new ServiceException("删除容器失败:" + task.getContainerCode());
+            }
+
+        } else {
+            /* 更新库位和容器*/
+            updateShipmentLocationContainer(task.getFromLocation(), task.getToLocation(),
+                    task.getContainerCode(), task.getTaskType(), warehouseCode);
+        }
+
  
         //设置出库货箱表头状态为拣货任务完成
         LambdaUpdateWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
@@ -324,30 +324,31 @@
                 {
                     checkbox: true
                 },
+
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+                        // actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
+                        // if (row.lastStatus < 500) {
+                        //     actions.push('<a class="btn btn-info btn-xs ' + postFlag + '" href="#" onclick="posting(\'' + row.id + '\')"><i class="fa fa-edit"></i>结束</a> ');
+                        // }
+                        // if (row.firstStatus < 100) {
+                        //     // actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        //     actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+                        // }
+                        // if (row.firstStatus == 500 && row.lastStatus == 500) {
+                        //     actions.push('<a class="btn btn-info btn-xs ' + '" href="#" onclick="backERP(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>');
+                        // }
+                        return actions.join('');
+                    }
+                },
                 {
                     field: 'origin',
                     title: '删除来源',
                 },
-                // {
-                //     title: '操作',
-                //     align: 'center',
-                //     formatter: function (value, row, index) {
-                //         var actions = [];
-                //         actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
-                //         // actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
-                //         if (row.lastStatus < 500) {
-                //             actions.push('<a class="btn btn-info btn-xs ' + postFlag + '" href="#" onclick="posting(\'' + row.id + '\')"><i class="fa fa-edit"></i>结束</a> ');
-                //         }
-                //         if (row.firstStatus < 100) {
-                //             // actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                //             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
-                //         }
-                //         // if (row.firstStatus == 500 && row.lastStatus == 500) {
-                //         //     actions.push('<a class="btn btn-info btn-xs ' + '" href="#" onclick="backERP(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>');
-                //         // }
-                //         return actions.join('');
-                //     }
-                // },
                 {
                     field: 'id',
                     title: '出库单id',
@@ -857,11 +858,21 @@
         }
     }
  
-    /* 打印 */
-    function receiptPrint(id) {
-        var url = prefix + "/report/" + id;
-        $.modal.open("出库单打印", url);
-    }
+        /* 打印 */
+        function receiptPrint(id) {
+            var url = prefix + "/autoreport/" + id;
+            $.ajax({
+                url: url,
+                type: "get",
+                success: function (response) {
+                    if (response.code === 200) {
+                        $.modal.alertSuccess('打印成功:' + response.msg);
+                    } else {
+                        $.modal.alertError('打印失败:' + response.msg);
+                    }
+                }
+            })
+        }
  
  
     /* 单个删除 */