feat:重写根据出库口获取出库明细看板接口

易文鹏
1 parent 5899f235
Showing 3 changed files with 48 additions and 7 deletions
src/main/java/com/huaheng/api/tv/controller/TvController.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
@@ -23,8 +23,12 @@ import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
 import com.huaheng.pc.report.excelReport.mapper.ExcelReportMapper;
+import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetailTv;
 import com.huaheng.pc.shipment.shipmentDetail.mapper.ShipmentDetailMapper;
+import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
@@ -63,6 +67,8 @@ public class TvController extends BaseController {
     @Resource
     private ShipmentDetailMapper shipmentDetailMapper;
     @Resource
+    private ShipmentHeaderService shipmentHeaderService;
+    @Resource
     ExcelReportMapper mapper;
  
     //入库看板
@@ -87,8 +93,8 @@ public class TvController extends BaseController {
     //}
     @GetMapping("/queryAllPicture")
     public List<String> queryAllPicture() {
-        //String directoryPath = "D:/Huaheng/uploadPath/file/";
-        String directoryPath = "/Users/yiwenpeng/Desktop/素材";
+        String directoryPath = "D:/Huaheng/uploadPath/file/";
+        //String directoryPath = "/Users/yiwenpeng/Desktop/素材";
         return listImageFiles(directoryPath);
     }
  
@@ -235,13 +241,47 @@ public class TvController extends BaseController {
         //allBean.setUpList(upList);
  
         RoadwayLocationStatus roadwayLocationStatus = getRoadwayLocationStatus(roadway);
-        List<ShipmentDetailTv> portList = shipmentDetailMapper.getTvOutList(par);//当前站台出库明细
+        //List<ShipmentDetailTv> portList = shipmentDetailMapper.getTvOutList(par);//当前站台出库明细
+        List<ShipmentDetailTv> portList = getShipmentDetailTaskByPort(par);//当前站台出库明细
         allBean.setPortList(portList);
         allBean.setRoadwayLocationStatus(roadwayLocationStatus);
         return TVResult.success(allBean);
     }
  
  
+    public List<ShipmentDetailTv> getShipmentDetailTaskByPort(String par) {
+        List<ShipmentDetailTv> returnList = new ArrayList<>();
+        List<TaskDetail> newShipmentDetailList = new ArrayList<>();
+
+        List<TaskHeader> taskHeaderList = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
+                .eq(TaskHeader::getInternalTaskType, 200)
+                .in(TaskHeader::getPort, par)
+                .eq(TaskHeader::getStatus, 50));
+
+        for (TaskHeader taskHeader : taskHeaderList) {
+            List<TaskDetail> taskDetailList = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId()));
+            newShipmentDetailList.addAll(taskDetailList);
+        }
+        for (TaskDetail taskDetail : newShipmentDetailList) {
+            ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getCode, taskDetail.getBillCode()));
+            ShipmentDetailTv tv = new ShipmentDetailTv();
+            tv.setMaterialcode(taskDetail.getMaterialCode());
+            tv.setMaterialname(taskDetail.getMaterialName());
+            tv.setQty(String.valueOf(taskDetail.getQty()));
+            tv.setInvoicenumber(taskDetail.getBillCode());
+            tv.setTraynumber(taskDetail.getContainerCode());
+            tv.setNoticeNo(shipmentHeader.getNoticeNo());
+            if (taskDetail.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLESHIPMENT)) {
+                tv.setType("整出");
+            } else {
+                tv.setType("分拣");
+            }
+            returnList.add(tv);
+        }
+        return returnList;
+    }
+
+
     private RoadwayLocationStatus getRoadwayLocationStatus(String roadway) {
         RoadwayLocationStatus roadwayLocationStatus = new RoadwayLocationStatus();
         int highEmptyContainer = getCount(2, roadway); //高库位空托
@@ -137,7 +137,7 @@ public class ReceiptDetailController extends BaseController {
      */
     @ApiOperation(value = "PDA查询入库详情", notes = "根据头表id获取入库单明细信息", httpMethod = "POST")
     @RequiresPermissions("receipt:receiptDetail:list")
-    @Log(title = "入库-PDA查询入库详情", operating = "PDA查询入库详情", action = BusinessType.GRANT)
+    //@Log(title = "入库-PDA查询入库详情", operating = "PDA查询入库详情", action = BusinessType.GRANT)
     @PostMapping("/pdaList")
     @ResponseBody
     public TableDataInfo pdaList(@ApiParam(name = "receiptDetail", value = "入库详情") ReceiptDetail receiptDetail,
@@ -185,7 +185,7 @@ public class ReceiptDetailController extends BaseController {
      * 通过id查询入库详情
      */
     @ApiOperation(value = "查看入库详情", notes = "根据从表id获取入库单明细信息", httpMethod = "POST")
-    @Log(title = "入库-入库单明细刷新", operating = "刷新入库单明细", action = BusinessType.GRANT)
+    //@Log(title = "入库-入库单明细刷新", operating = "刷新入库单明细", action = BusinessType.GRANT)
     @PostMapping("/refreshList")
     @ResponseBody
     public TableDataInfo refreshList(@RequestBody List<String> ids) {
@@ -204,7 +204,7 @@ public class ReceiptDetailController extends BaseController {
      * 查询入库详情
      */
     @ApiOperation(value = "查看合并入库详情", notes = "根据头表ids获取入库单明细信息", httpMethod = "POST")
-    @Log(title = "入库-入库单明细管理", operating = "查看入库单明细", action = BusinessType.GRANT)
+    //@Log(title = "入库-入库单明细管理", operating = "查看入库单明细", action = BusinessType.GRANT)
     @PostMapping("/mergeList")
     @ResponseBody
     public TableDataInfo mergeList(@ApiParam(name = "receiptDetail", value = "入库详情") ReceiptDetail receiptDetail,
@@ -402,7 +402,8 @@ public class ShippingCombinationController extends BaseController {
             }
         }
         String collect = idsList.stream().map(String::valueOf).collect(Collectors.joining(","));
-        return handleMultiProcess(() -> createTask(collect));
+        //return handleMultiProcess(() -> createTask(collect));
+        return createTask(collect);
     }
  
     /**