增加电视看板接口

陈翱
1 parent 2185b137
Showing 5 changed files with 181 additions and 0 deletions
src/main/java/com/huaheng/api/tv/controller/TvController.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetailTv.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/mapper/ShipmentDetailMapper.java
src/main/resources/mybatis/shipment/ShipmentDetailMapper.xml
@@ -23,15 +23,19 @@ import com.huaheng.pc.inventory.InventoryMaterialSummary.service.InventoryMateri
 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.shipment.shipmentDetail.domain.ShipmentDetailTv;
+import com.huaheng.pc.shipment.shipmentDetail.mapper.ShipmentDetailMapper;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
  
 @RestController
 @RequestMapping("/API/WMS/v2")
@@ -55,6 +59,8 @@ public class TvController extends BaseController {
     private InventoryMaterialSummaryService inventoryMaterialSummaryService;
     @Resource
     private MaterialService materialService;
+    @Resource
+    private ShipmentDetailMapper shipmentDetailMapper;
  
     @PostMapping("/getTvView")
     @ApiOperation("获取电视信息")
@@ -157,4 +163,14 @@ public class TvController extends BaseController {
         allBean.setUpList(upList);
         return AjaxResult.success(allBean);
     }
+
+    @PostMapping("/getTvPortShipmentView")
+    @ApiOperation("获取出站口出库信息")
+    @CrossOrigin
+    @ResponseBody
+    public AjaxResult getTvPortShipmentView(@RequestBody Map<String,String> map) {
+        String par = map.get("par");
+        List<ShipmentDetailTv>upList=shipmentDetailMapper.getTvOutList(par);
+        return AjaxResult.success(upList);
+    }
 }
@@ -137,6 +137,75 @@ public class ReceiptHeaderController extends BaseController {
         return getDataTable(list);
     }
  
+
+    /**
+     * 查询PDA入库单
+     */
+    @Log(title = "入库-PDA入库单头表", operating = "查看PDA入库单列表", action = BusinessType.GRANT)
+    @PostMapping("/listPda")
+    @ResponseBody
+    @ApiOperation("入库单查询接口")
+    public TableDataInfo listPda(@ApiParam(name="receiptHeader",value="入库头表")ReceiptHeader receiptHeader,
+                              @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd,
+                              Integer statusFirst, Integer statusLast) {
+        LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        List<ReceiptHeader> list = new ArrayList<>();
+
+        if(StringUtils.isNotEmpty(receiptHeader.getSNNO())){
+            LambdaQueryWrapper<ReceiptDetail> receiptDetailLambdaQuery = Wrappers.lambdaQuery();
+            receiptDetailLambdaQuery.eq(ReceiptDetail::getSNNO, receiptHeader.getSNNO());
+            ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailLambdaQuery);
+            ReceiptHeader receiptHeaderData = new ReceiptHeader();
+            if (StringUtils.isNotNull(receiptDetail))
+                receiptHeaderData = receiptHeaderService.getById(receiptDetail.getReceiptId());
+            if (StringUtils.isNotNull(receiptHeaderData)){
+                list.add(receiptHeaderData);
+                return getDataTable(list);
+            }else{
+                return getDataTable(list);
+            }
+        }
+        if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getLastStatus())){
+            lambdaQueryWrapper.le(ReceiptHeader::getLastStatus, receiptHeader.getLastStatus());
+        }else {
+            lambdaQueryWrapper.eq(StringUtils.isNotNull(receiptHeader.getLastStatus()),
+                    ReceiptHeader::getLastStatus, receiptHeader.getLastStatus());
+        }
+        if (QuantityConstant.HEADER_STATE.equals(receiptHeader.getFirstStatus())){
+            lambdaQueryWrapper.le(ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus());
+        }else {
+            lambdaQueryWrapper.eq(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
+                    ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus());
+        }
+        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeader::getCreated, createdBegin)
+                .le(StringUtils.isNotEmpty(createdEnd), ReceiptHeader::getCreated, createdEnd)
+                .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()),ReceiptHeader::getCompanyCode, receiptHeader.getCompanyCode())
+                .in(StringUtils.isEmpty(receiptHeader.getCompanyCode()), ReceiptHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
+                .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()),
+                        ReceiptHeader::getReceiptType, receiptHeader.getReceiptType())
+                .likeRight(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode())
+                .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode())
+                .orderByDesc(ReceiptHeader::getCreated);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /**
+             * 使用分页查询
+             */
+            Page<ReceiptHeader> page = new Page<>(pageNum, pageSize);
+            IPage<ReceiptHeader> iPage = receiptHeaderService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+        } else {
+            list = receiptHeaderService.list(lambdaQueryWrapper);
+        }
+        return getDataTable(list);
+    }
+
+
     /**
      * 新增入库单
      */
+package com.huaheng.pc.shipment.shipmentDetail.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class ShipmentDetailTv implements Serializable {
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value="物料编码")
+    private String materialcode;
+
+    /**
+     * 物料名称
+     */
+    @ApiModelProperty(value="物料名称")
+    private String materialname;
+
+    /**
+     * 托盘号
+     */
+    @ApiModelProperty(value="托盘号")
+    private String Traynumber;
+
+    /**
+     * 出库单号
+     */
+    @ApiModelProperty(value="出库单号")
+    private String Invoicenumber;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value="数量")
+    private String qty;
+
+    /**
+     * 通知单号
+     */
+    @ApiModelProperty(value="通知单号")
+    private String NoticeNo;
+
+
+
+}
@@ -2,6 +2,7 @@ package com.huaheng.pc.shipment.shipmentDetail.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
+import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetailTv;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import org.apache.ibatis.annotations.Param;
  
@@ -30,4 +31,7 @@ public interface ShipmentDetailMapper extends BaseMapper&lt;ShipmentDetail&gt; {
  
     //以货主维度获取入库量
     List<TaskDetail> getCompanyShipment();
+
+    //看板显示当前站台出库明细
+    List<ShipmentDetailTv> getTvOutList(@Param("par")String par);
 }
 \ No newline at end of file
@@ -159,4 +159,41 @@ ORDER BY
     )
     </foreach>
   </insert>
+
+    <select id="getTvOutList" resultType="com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetailTv" parameterType="java.lang.String">
+        SELECT
+        o.materialCode materialcode,
+        o.materialName materialname,
+        o.containerCode Traynumber,
+        o.qty qty,
+        k.CODE Invoicenumber,
+        k.noticeNo NoticeNo
+        FROM
+        shipment_header k,(
+        SELECT
+        d.shipmentId,
+        p.*
+        FROM
+        shipment_detail d,(
+        SELECT
+        r.containerCode,
+        l.materialCode,
+        l.materialName,
+        l.qty,
+        l.billDetailId
+        FROM
+        task_header r,
+        task_detail l
+        WHERE
+        r.id = l.taskId
+        AND r.taskType IN ( '300', '400' )
+        AND r.`status` <![CDATA[ < ]]> 100
+        AND r.`port` = #{par}
+        ) p
+        WHERE
+        d.id = p.billDetailId
+        ) o
+        WHERE
+        k.id = o.shipmentId
+    </select>
 </mapper>
 \ No newline at end of file