wenshijun/smart_management_dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wenshijun
2026-03-10 10:52:51 +08:00
parent cd0f7b371d 424aac6748
commit ef0c52b6df
7 changed files with 71 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/zg/project/inventory/AutoInventory/controller/InventoryMatchScanController.java
View File

@@ -170,5 +170,29 @@ public class InventoryMatchScanController extends BaseController {
StockStatisticVO stockStatistic = rkInfoMapper.selectStockStatisticByCondition(rkInfo); StockStatisticVO stockStatistic = rkInfoMapper.selectStockStatisticByCondition(rkInfo);
return AjaxResult.success(stockStatistic); 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<RkInfo> list =
rkInfoMapper.getByWarehouseAndScene(warehouseCode, sceneId);
ExcelUtil<RkInfo> util = new ExcelUtil<>(RkInfo.class);
util.exportExcel(response, list, "盘点数据");
}
} }

30
src/main/java/com/zg/project/wisdom/domain/RkInfo.java
View File

@@ -25,7 +25,7 @@ public class RkInfo extends BaseEntity
private Long id; private Long id;
/** 业务操作类型（0入库，1出库，2借料出库，3还料入库） */ /** 业务操作类型（0入库，1出库，2借料出库，3还料入库） */
@Excel(name = "业务类型", readConverterExp = "0=入库,1=出库,2=借料出库,3=还料入库") // @Excel(name = "业务类型", readConverterExp = "0=入库,1=出库,2=借料出库,3=还料入库")
private String bizType; private String bizType;
/** 出入库类型 */ /** 出入库类型 */
@@ -37,7 +37,7 @@ public class RkInfo extends BaseEntity
private String operationTypeName; private String operationTypeName;
/** 执行状态（0预入/预出，1已完成） */ /** 执行状态（0预入/预出，1已完成） */
@Excel(name = "执行状态", readConverterExp = "0=预入/预出,1=已完成") // @Excel(name = "执行状态", readConverterExp = "0=预入/预出,1=已完成")
private String execStatus; private String execStatus;
/** 物资类型 */ /** 物资类型 */
@@ -80,11 +80,11 @@ public class RkInfo extends BaseEntity
private String operatorName; private String operatorName;
/** 是否已出库（0已入库，1已出库） */ /** 是否已出库（0已入库，1已出库） */
@Excel(name = "是否已出库", readConverterExp = "0=已入库,1=已出库") // @Excel(name = "是否已出库", readConverterExp = "0=已入库,1=已出库")
private String isChuku; private String isChuku;
/** 审核状态（0入库待审核，1已通过，2已驳回，3出库待审核） */ /** 审核状态（0入库待审核，1已通过，2已驳回，3出库待审核） */
@Excel(name = "审核状态", readConverterExp = "0=入库待审核,1=已通过,2=已驳回,3=出库待审核") // @Excel(name = "审核状态", readConverterExp = "0=入库待审核,1=已通过,2=已驳回,3=出库待审核")
private String status; private String status;
/** 单据号 */ /** 单据号 */
@@ -92,7 +92,7 @@ public class RkInfo extends BaseEntity
private String billNo; private String billNo;
/** 县局 */ /** 县局 */
@Excel(name = "县局") // @Excel(name = "县局")
private String xj; private String xj;
/** 项目号 */ /** 项目号 */
@@ -104,11 +104,11 @@ public class RkInfo extends BaseEntity
private String xmMs; private String xmMs;
/** 出库项目号（借用方项目） */ /** 出库项目号（借用方项目） */
@Excel(name = "借用方项目号") // @Excel(name = "借用方项目号")
private String xmNoCk; private String xmNoCk;
/** 出库项目描述（借用方项目描述） */ /** 出库项目描述（借用方项目描述） */
@Excel(name = "借用方项目描述") // @Excel(name = "借用方项目描述")
private String xmMsCk; private String xmMsCk;
/** 物料号 */ /** 物料号 */
@@ -120,7 +120,7 @@ public class RkInfo extends BaseEntity
private String wlMs; private String wlMs;
/** 供应商编码 */ /** 供应商编码 */
@Excel(name = "供应商编码") // @Excel(name = "供应商编码")
private String gysNo; private String gysNo;
/** 供应商名称 */ /** 供应商名称 */
@@ -132,12 +132,12 @@ public class RkInfo extends BaseEntity
private String sapNo; private String sapNo;
/** 行号 */ /** 行号 */
@Excel(name = "行号") // @Excel(name = "行号")
private String xh; private String xh;
/** 计划交货金额 */ /** 计划交货金额 */
@Excel(name = "计划交货金额") // @Excel(name = "计划交货金额")
@JsonSerialize(using = BigDecimalSerializer.class) @JsonSerialize(using = BigDecimalSerializer.class)
private BigDecimal jhAmt; private BigDecimal jhAmt;
@@ -147,7 +147,7 @@ public class RkInfo extends BaseEntity
private BigDecimal htDj; private BigDecimal htDj;
/** 计划交货数量 */ /** 计划交货数量 */
@Excel(name = "计划交货数量") // @Excel(name = "计划交货数量")
@JsonSerialize(using = BigDecimalSerializer.class) @JsonSerialize(using = BigDecimalSerializer.class)
private BigDecimal jhQty; private BigDecimal jhQty;
@@ -187,7 +187,7 @@ public class RkInfo extends BaseEntity
private String entityId; private String entityId;
/** 施工队 */ /** 施工队 */
@Excel(name = "施工队") // @Excel(name = "施工队")
private String teamCode; private String teamCode;
/** 借用时间 */ /** 借用时间 */
@@ -205,7 +205,7 @@ public class RkInfo extends BaseEntity
private String hasMoved; private String hasMoved;
/** 是否借料（0否,1是,2已归还） */ /** 是否借料（0否,1是,2已归还） */
@Excel(name = "是否借料", readConverterExp = "0=否,1=是,2=已归还") // @Excel(name = "是否借料", readConverterExp = "0=否,1=是,2=已归还")
private String isBorrowed; private String isBorrowed;
/** 是否删除（0正常，1已删除） */ /** 是否删除（0正常，1已删除） */
@@ -213,7 +213,7 @@ public class RkInfo extends BaseEntity
private String isDelete; private String isDelete;
/** 供应计划ID */ /** 供应计划ID */
@Excel(name = "供应计划ID") // @Excel(name = "供应计划ID")
private Long gysJhId; private Long gysJhId;
/** rdid */ /** rdid */
@@ -226,7 +226,7 @@ public class RkInfo extends BaseEntity
private Long sid; private Long sid;
/** 配送状态：0否 1是 2待接单 3配送中 4配送完成 */ /** 配送状态：0否 1是 2待接单 3配送中 4配送完成 */
@Excel(name = "是否需要配送", readConverterExp = "0=否,1=是,2=待配送,3=配送中,4=配送完成") // @Excel(name = "是否需要配送", readConverterExp = "0=否,1=是,2=待配送,3=配送中,4=配送完成")
private String isDelivery; private String isDelivery;
/** 封样编号1 */ /** 封样编号1 */

10
src/main/java/com/zg/project/wisdom/domain/RkRecord.java
View File

@@ -51,7 +51,7 @@ public class RkRecord extends BaseEntity
private String teamName; private String teamName;
/** 执行状态（0预入/预出，1已完成） */ /** 执行状态（0预入/预出，1已完成） */
@Excel(name = "执行状态", readConverterExp = "0=预操作,1=已完成") // @Excel(name = "执行状态", readConverterExp = "0=预操作,1=已完成")
private String execStatus; private String execStatus;
/** 物资类型 */ /** 物资类型 */
@@ -119,11 +119,11 @@ public class RkRecord extends BaseEntity
private String xmMs; private String xmMs;
/** 出库项目号（借用方项目） */ /** 出库项目号（借用方项目） */
@Excel(name = "出库项目号", readConverterExp = "借=用方项目") // @Excel(name = "出库项目号", readConverterExp = "借=用方项目")
private String xmNoCk; private String xmNoCk;
/** 出库项目描述（借用方项目描述） */ /** 出库项目描述（借用方项目描述） */
@Excel(name = "出库项目描述", readConverterExp = "借=用方项目描述") // @Excel(name = "出库项目描述", readConverterExp = "借=用方项目描述")
private String xmMsCk; private String xmMsCk;
/** 物料号 */ /** 物料号 */
@@ -151,7 +151,7 @@ public class RkRecord extends BaseEntity
private String xh; private String xh;
/** 计划交货金额 */ /** 计划交货金额 */
@Excel(name = "计划交货金额") // @Excel(name = "计划交货金额")
@JsonSerialize(using = BigDecimalSerializer.class) @JsonSerialize(using = BigDecimalSerializer.class)
private BigDecimal jhAmt; private BigDecimal jhAmt;
@@ -161,7 +161,7 @@ public class RkRecord extends BaseEntity
private BigDecimal htDj; private BigDecimal htDj;
/** 计划交货数量 */ /** 计划交货数量 */
@Excel(name = "计划交货数量") // @Excel(name = "计划交货数量")
@JsonSerialize(using = BigDecimalSerializer.class) @JsonSerialize(using = BigDecimalSerializer.class)
private BigDecimal jhQty; private BigDecimal jhQty;

7
src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java
View File

@@ -183,4 +183,11 @@ public interface RkInfoMapper
@Param("wlNo") String wlNo, @Param("wlNo") String wlNo,
@Param("xmNo") String xmNo, @Param("xmNo") String xmNo,
@Param("dw") String dw); @Param("dw") String dw);
/**
* 条目数
* */
int countByWarehouseAndScene(
@Param("warehouseCode") String warehouseCode,
@Param("sceneId") String sceneId
);
} }

4
src/main/java/com/zg/project/wisdom/service/IRkInfoService.java
View File

@@ -116,4 +116,8 @@ public interface IRkInfoService
* @return * @return
*/ */
List<RkInfo> listRkInfoByPcodes(ArrayList<String> strings); List<RkInfo> listRkInfoByPcodes(ArrayList<String> strings);
/**
*条目数
* */
int countByWarehouseAndScene(String warehouseCode, String sceneId);
} }

6
src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
View File

@@ -355,6 +355,10 @@ public class RkInfoServiceImpl implements IRkInfoService
public List<RkInfo> listRkInfoByPcodes(ArrayList<String> strings) { public List<RkInfo> listRkInfoByPcodes(ArrayList<String> strings) {
return rkInfoMapper.listRkInfoByPcodes(strings); return rkInfoMapper.listRkInfoByPcodes(strings);
} }
@Override
public int countByWarehouseAndScene(String warehouseCode, String sceneId)
{
return rkInfoMapper.countByWarehouseAndScene(warehouseCode, sceneId);
}
} }

12
src/main/resources/mybatis/wisdom/RkInfoMapper.xml
View File

@@ -637,7 +637,7 @@
AND ri.is_delete = '0' AND ri.is_delete = '0'
AND ri.is_chuku = '0' AND ri.is_chuku = '0'
AND ri.cangku = #{warehouseCode} AND ri.cangku = #{warehouseCode}
AND pd.scene = #{sceneId} AND ri.scene = #{sceneId}
</select> </select>
<select id="listRkInfoByPcodes" <select id="listRkInfoByPcodes"
@@ -667,4 +667,14 @@
AND wl_no = #{wlNo} AND wl_no = #{wlNo}
AND xm_no = #{xmNo} AND xm_no = #{xmNo}
</update> </update>
<select id="countByWarehouseAndScene" resultType="int">
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}
</select>
</mapper> </mapper>