lhq/FT542-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化页面

Browse Source
This commit is contained in:
zgw
2025-12-25 13:47:24 +08:00
parent 9fc1cc53e9
commit f64216f3c1
47 changed files with 2376 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -100,15 +100,15 @@ public class PdaServiceImp implements PdaService {
mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode());
mydoJobParam.setStatus("3");
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJobParam);
BasWarehouse basWarehouse = basWarehouseMapper.selectBasWarehouseByWarehouseId(mydoJobDetails.get(0).getWarehouseId());
if("2".equals(basWarehouse.getWarehouseType()) && mydoJobDetails.isEmpty()){
BasStock basStock = new BasStock();
basStock.setTrayCode(trayCodeMakeSure.getTrayCode());
List<BasStock> basStocks = basStockMapper.selectBasStockList(basStock);
basStockMapper.deleteBasStockByStockIds((String[]) basStocks.stream().map(BasStock::getStockId).toArray());
}
if(mydoJobDetails.isEmpty() && "1".equals(basWarehouse.getWarehouseType())){
// BasWarehouse basWarehouse = basWarehouseMapper.selectBasWarehouseByWarehouseId(mydoJobDetails.get(0).getWarehouseId());
// if("2".equals(basWarehouse.getWarehouseType()) && mydoJobDetails.isEmpty()){
// BasStock basStock = new BasStock();
// basStock.setTrayCode(trayCodeMakeSure.getTrayCode());
// List<BasStock> basStocks = basStockMapper.selectBasStockList(basStock);
// basStockMapper.deleteBasStockByStockIds((String[]) basStocks.stream().map(BasStock::getStockId).toArray());
//
// }
if(mydoJobDetails.isEmpty() ){
return AjaxResult.error("该物料没有出库作业，请检查");
}
HashMap<String, Object> map = new HashMap<>();
@@ -120,8 +120,6 @@ public class PdaServiceImp implements PdaService {
} else {
return AjaxResult.error( map.get("v_resultmsg").toString());
}
}
@@ -246,8 +244,7 @@ public class PdaServiceImp implements PdaService {
@Override
public AjaxResult ktpout(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>();
map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
map.put("v_exit_id", trayCodeMsg.getExitId());
map.put("v_num", trayCodeMsg.getInQuantity());
pdaMapper.ktpout(map);
String result = map.get("v_result").toString();
if ("10".equals(result)){