root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:优化实时库存页面的查询条件：物料、厂家、批次根据当前库存记录group by

Browse Source
This commit is contained in:
zds
2024-09-12 17:51:46 +08:00
parent ad2f8e2e58
commit f14ca73f60
12 changed files with 192 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java
View File

@@ -191,6 +191,14 @@ public class ReportController {
return new ResponseEntity<>(TableDataInfo.build(reportService.getSupplierNameList()),HttpStatus.OK);
}
@GetMapping("/getNowSupplierNameList")
@Log("查询供应商名称列表")
@ApiOperation("查询供应商名称列表")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> getNowSupplierNameList(){
return new ResponseEntity<>(TableDataInfo.build(reportService.getNowSupplierNameList()),HttpStatus.OK);
}
@GetMapping("/getProductDescriptionList")
@Log("查询物料名称列表")
@ApiOperation("查询物料名称列表")
@@ -199,6 +207,14 @@ public class ReportController {
return new ResponseEntity<>(TableDataInfo.build(reportService.getProductDescriptionList()),HttpStatus.OK);
}
@GetMapping("/getNowProductDescriptionList")
@Log("查询物料名称列表")
@ApiOperation("查询物料名称列表")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> getNowProductDescriptionList(){
return new ResponseEntity<>(TableDataInfo.build(reportService.getNowProductDescriptionList()),HttpStatus.OK);
}
@GetMapping("/getLotSNList")
@Log("查询晶棒编号列表")
@ApiOperation("查询晶棒编号列表")
@@ -215,6 +231,14 @@ public class ReportController {
return new ResponseEntity<>(TableDataInfo.build(reportService.getIngotBatchList()),HttpStatus.OK);
}
@GetMapping("/getNowIngotBatchList")
@Log("查询批次号列表")
@ApiOperation("查询批次号列表")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> getNowIngotBatchList(){
return new ResponseEntity<>(TableDataInfo.build(reportService.getNowIngotBatchList()),HttpStatus.OK);
}
@PostMapping("/hwtask")
@Log("回温出库")
@ApiOperation("回温出库")

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java
View File

@@ -119,12 +119,18 @@ public interface IReportService extends IService<ReportDto> {
List<String> getSupplierNameList();
List<String> getNowSupplierNameList();
List<String> getProductDescriptionList();
List<String> getNowProductDescriptionList();
List<String> getLotSNList();
List<String> getIngotBatchList();
List<String> getNowIngotBatchList();
void hwtask(JSONObject param);
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java
View File

@@ -46,12 +46,18 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
@Select("select supplierName from sch_base_material group by supplierName")
List<String> getSupplierNameList();
List<String> getNowSupplierNameList();
@Select("select productDescription from sch_base_material group by productDescription")
List<String> getProductDescriptionList();
List<String> getNowProductDescriptionList();
@Select("select lotSN from sch_base_material")
List<String> getLotSNList();
@Select("select ingotBatch from sch_base_material group by ingotBatch")
List<String> getIngotBatchList();
List<String> getNowIngotBatchList();
}

41
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
View File

@@ -612,4 +612,45 @@
ORDER BY p.update_time DESC, pointCode ASC
</select>
<select id="getNowSupplierNameList" resultType="String">
SELECT
m.supplierName
FROM
sch_base_material m,
sch_base_point p
WHERE
m.PalletSN = p.vehicle_code2
AND m.supplierName IS NOT NULL
AND m.supplierName != ''
GROUP BY
m.supplierName
</select>
<select id="getNowProductDescriptionList" resultType="String">
SELECT
m.productDescription
FROM
sch_base_material m,
sch_base_point p
WHERE
m.PalletSN = p.vehicle_code2
AND m.productDescription IS NOT NULL
AND m.productDescription != ''
GROUP BY
m.productDescription
</select>
<select id="getNowIngotBatchList" resultType="String">
SELECT
m.ingotBatch
FROM
sch_base_material m,
sch_base_point p
WHERE
m.PalletSN = p.vehicle_code2
AND m.ingotBatch IS NOT NULL
AND m.ingotBatch != ''
GROUP BY
m.ingotBatch
</select>
</mapper>

12
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java
View File

@@ -320,10 +320,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
return reportMapper.getSupplierNameList();
}
public List<String> getNowSupplierNameList(){
return reportMapper.getNowSupplierNameList();
}
public List<String> getProductDescriptionList(){
return reportMapper.getProductDescriptionList();
}
public List<String> getNowProductDescriptionList(){
return reportMapper.getNowProductDescriptionList();
}
public List<String> getLotSNList(){
return reportMapper.getLotSNList();
}
@@ -332,6 +340,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
return reportMapper.getIngotBatchList();
}
public List<String> getNowIngotBatchList(){
return reportMapper.getNowIngotBatchList();
}
@Override
public void hwtask(JSONObject param){