diff --git a/src/main/java/com/zg/project/inventory/AutoInventory/controller/InventoryMatchScanController.java b/src/main/java/com/zg/project/inventory/AutoInventory/controller/InventoryMatchScanController.java index cbec666..7dd219c 100644 --- a/src/main/java/com/zg/project/inventory/AutoInventory/controller/InventoryMatchScanController.java +++ b/src/main/java/com/zg/project/inventory/AutoInventory/controller/InventoryMatchScanController.java @@ -170,5 +170,29 @@ public class InventoryMatchScanController extends BaseController { StockStatisticVO stockStatistic = rkInfoMapper.selectStockStatisticByCondition(rkInfo); return AjaxResult.success(stockStatistic); } + /** + * 条目数 + */ + @PostMapping("/countByWarehouseAndScene") + public AjaxResult countByWarehouseAndScene(@RequestBody InventoryDTO query) + { + String warehouseCode = query.getWarehouseCode(); + String sceneId = query.getSceneId(); + int count = rkInfoService.countByWarehouseAndScene(warehouseCode, sceneId); + return AjaxResult.success(count); + } + @PostMapping("/exportInventory") + public void exportInventory(HttpServletResponse response, InventoryDTO query) + { + String warehouseCode = query.getWarehouseCode(); + String sceneId = query.getSceneId(); + + // 查询数据（不分页） + List list = + rkInfoMapper.getByWarehouseAndScene(warehouseCode, sceneId); + + ExcelUtil util = new ExcelUtil<>(RkInfo.class); + util.exportExcel(response, list, "盘点数据"); + } } diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java index d718837..08be7b5 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java @@ -25,7 +25,7 @@ public class RkInfo extends BaseEntity private Long id; /** 业务操作类型（0入库，1出库，2借料出库，3还料入库） */ - @Excel(name = "业务类型", readConverterExp = "0=入库,1=出库,2=借料出库,3=还料入库") +// @Excel(name = "业务类型", readConverterExp = "0=入库,1=出库,2=借料出库,3=还料入库") private String bizType; /** 出入库类型 */ @@ -37,7 +37,7 @@ public class RkInfo extends BaseEntity private String operationTypeName; /** 执行状态（0预入/预出，1已完成） */ - @Excel(name = "执行状态", readConverterExp = "0=预入/预出,1=已完成") +// @Excel(name = "执行状态", readConverterExp = "0=预入/预出,1=已完成") private String execStatus; /** 物资类型 */ @@ -80,11 +80,11 @@ public class RkInfo extends BaseEntity private String operatorName; /** 是否已出库（0已入库，1已出库） */ - @Excel(name = "是否已出库", readConverterExp = "0=已入库,1=已出库") +// @Excel(name = "是否已出库", readConverterExp = "0=已入库,1=已出库") private String isChuku; /** 审核状态（0入库待审核，1已通过，2已驳回，3出库待审核） */ - @Excel(name = "审核状态", readConverterExp = "0=入库待审核,1=已通过,2=已驳回,3=出库待审核") +// @Excel(name = "审核状态", readConverterExp = "0=入库待审核,1=已通过,2=已驳回,3=出库待审核") private String status; /** 单据号 */ @@ -92,7 +92,7 @@ public class RkInfo extends BaseEntity private String billNo; /** 县局 */ - @Excel(name = "县局") +// @Excel(name = "县局") private String xj; /** 项目号 */ @@ -104,11 +104,11 @@ public class RkInfo extends BaseEntity private String xmMs; /** 出库项目号（借用方项目） */ - @Excel(name = "借用方项目号") +// @Excel(name = "借用方项目号") private String xmNoCk; /** 出库项目描述（借用方项目描述） */ - @Excel(name = "借用方项目描述") +// @Excel(name = "借用方项目描述") private String xmMsCk; /** 物料号 */ @@ -120,7 +120,7 @@ public class RkInfo extends BaseEntity private String wlMs; /** 供应商编码 */ - @Excel(name = "供应商编码") +// @Excel(name = "供应商编码") private String gysNo; /** 供应商名称 */ @@ -132,12 +132,12 @@ public class RkInfo extends BaseEntity private String sapNo; /** 行号 */ - @Excel(name = "行号") +// @Excel(name = "行号") private String xh; /** 计划交货金额 */ - @Excel(name = "计划交货金额") +// @Excel(name = "计划交货金额") @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal jhAmt; @@ -147,7 +147,7 @@ public class RkInfo extends BaseEntity private BigDecimal htDj; /** 计划交货数量 */ - @Excel(name = "计划交货数量") +// @Excel(name = "计划交货数量") @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal jhQty; @@ -187,7 +187,7 @@ public class RkInfo extends BaseEntity private String entityId; /** 施工队 */ - @Excel(name = "施工队") +// @Excel(name = "施工队") private String teamCode; /** 借用时间 */ @@ -205,7 +205,7 @@ public class RkInfo extends BaseEntity private String hasMoved; /** 是否借料（0否,1是,2已归还） */ - @Excel(name = "是否借料", readConverterExp = "0=否,1=是,2=已归还") +// @Excel(name = "是否借料", readConverterExp = "0=否,1=是,2=已归还") private String isBorrowed; /** 是否删除（0正常，1已删除） */ @@ -213,7 +213,7 @@ public class RkInfo extends BaseEntity private String isDelete; /** 供应计划ID */ - @Excel(name = "供应计划ID") +// @Excel(name = "供应计划ID") private Long gysJhId; /** rdid */ @@ -226,7 +226,7 @@ public class RkInfo extends BaseEntity private Long sid; /** 配送状态：0否 1是 2待接单 3配送中 4配送完成 */ - @Excel(name = "是否需要配送", readConverterExp = "0=否,1=是,2=待配送,3=配送中,4=配送完成") +// @Excel(name = "是否需要配送", readConverterExp = "0=否,1=是,2=待配送,3=配送中,4=配送完成") private String isDelivery; /** 封样编号1 */ diff --git a/src/main/java/com/zg/project/wisdom/domain/RkRecord.java b/src/main/java/com/zg/project/wisdom/domain/RkRecord.java index 963945a..a594aa1 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkRecord.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkRecord.java @@ -51,7 +51,7 @@ public class RkRecord extends BaseEntity private String teamName; /** 执行状态（0预入/预出，1已完成） */ - @Excel(name = "执行状态", readConverterExp = "0=预操作,1=已完成") +// @Excel(name = "执行状态", readConverterExp = "0=预操作,1=已完成") private String execStatus; /** 物资类型 */ @@ -119,11 +119,11 @@ public class RkRecord extends BaseEntity private String xmMs; /** 出库项目号（借用方项目） */ - @Excel(name = "出库项目号", readConverterExp = "借=用方项目") +// @Excel(name = "出库项目号", readConverterExp = "借=用方项目") private String xmNoCk; /** 出库项目描述（借用方项目描述） */ - @Excel(name = "出库项目描述", readConverterExp = "借=用方项目描述") +// @Excel(name = "出库项目描述", readConverterExp = "借=用方项目描述") private String xmMsCk; /** 物料号 */ @@ -151,7 +151,7 @@ public class RkRecord extends BaseEntity private String xh; /** 计划交货金额 */ - @Excel(name = "计划交货金额") +// @Excel(name = "计划交货金额") @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal jhAmt; @@ -161,7 +161,7 @@ public class RkRecord extends BaseEntity private BigDecimal htDj; /** 计划交货数量 */ - @Excel(name = "计划交货数量") +// @Excel(name = "计划交货数量") @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal jhQty; diff --git a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java index 751caa4..8e7bf38 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java @@ -183,4 +183,11 @@ public interface RkInfoMapper @Param("wlNo") String wlNo, @Param("xmNo") String xmNo, @Param("dw") String dw); + /** + * 条目数 + * */ + int countByWarehouseAndScene( + @Param("warehouseCode") String warehouseCode, + @Param("sceneId") String sceneId + ); } diff --git a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java index dd51be4..5f63906 100644 --- a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java +++ b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java @@ -116,4 +116,8 @@ public interface IRkInfoService * @return */ List listRkInfoByPcodes(ArrayList strings); + /** + *条目数 + * */ + int countByWarehouseAndScene(String warehouseCode, String sceneId); } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java index 3f444b8..f4fca38 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java @@ -355,6 +355,10 @@ public class RkInfoServiceImpl implements IRkInfoService public List listRkInfoByPcodes(ArrayList strings) { return rkInfoMapper.listRkInfoByPcodes(strings); } - + @Override + public int countByWarehouseAndScene(String warehouseCode, String sceneId) + { + return rkInfoMapper.countByWarehouseAndScene(warehouseCode, sceneId); + } } diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index 3d745ba..37693d7 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -637,7 +637,7 @@ AND ri.is_delete = '0' AND ri.is_chuku = '0' AND ri.cangku = #{warehouseCode} - AND pd.scene = #{sceneId} + AND ri.scene = #{sceneId} + SELECT COUNT(1) + FROM rk_info ri + WHERE ri.exec_status = 1 + AND ri.is_delete = '0' + AND ri.is_chuku = '0' + AND ri.cangku = #{warehouseCode} + AND ri.scene = #{sceneId} + + diff --git a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml index c7bb847..3730654 100644 --- a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml @@ -290,7 +290,7 @@ ORDER BY rr.exec_status = '0' DESC, rr.create_time ASC, - gj.gys_jh_id ASC + gys_jh_id ASC