优化
This commit is contained in:
@@ -44,6 +44,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
private final MaterialbaseService materialbaseService;
|
private final MaterialbaseService materialbaseService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> checkVehicle(Map jsonObject) {
|
public Map<String, Object> checkVehicle(Map jsonObject) {
|
||||||
WQLObject vehicle_wql = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo");
|
WQLObject vehicle_wql = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo");
|
||||||
WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
|
WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
|
||||||
@@ -119,6 +120,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> checkBucket(Map jsonObject) {
|
public Map<String, Object> checkBucket(Map jsonObject) {
|
||||||
WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
|
WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
|
||||||
WQLObject mater_wql = WQLObject.getWQLObject("md_me_materialbase");
|
WQLObject mater_wql = WQLObject.getWQLObject("md_me_materialbase");
|
||||||
@@ -677,6 +679,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> getBillDtl(Map<String, String> jsonObject, HttpContext ctx) {
|
public Map<String, Object> getBillDtl(Map<String, String> jsonObject, HttpContext ctx) {
|
||||||
HashMap<String, String> map = new HashMap<>();
|
HashMap<String, String> map = new HashMap<>();
|
||||||
map.put("flag", "2");
|
map.put("flag", "2");
|
||||||
@@ -690,6 +693,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> getRecBillDtl(Map<String, String> jsonObject, HttpContext ctx) {
|
public Map<String, Object> getRecBillDtl(Map<String, String> jsonObject, HttpContext ctx) {
|
||||||
String class_idStr = MaterOptTypeEnum.RF.getClass_idStr();
|
String class_idStr = MaterOptTypeEnum.RF.getClass_idStr();
|
||||||
|
|
||||||
@@ -714,6 +718,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> findVehicle(Map<String, String> jsonObject, HttpContext ctx) {
|
public Map<String, Object> findVehicle(Map<String, String> jsonObject, HttpContext ctx) {
|
||||||
String bucket_code = jsonObject.get("bucket_code");
|
String bucket_code = jsonObject.get("bucket_code");
|
||||||
if (StrUtil.isEmpty(bucket_code)) {
|
if (StrUtil.isEmpty(bucket_code)) {
|
||||||
@@ -749,6 +754,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> queryPoint(Map jsonObject) {
|
public Map<String, Object> queryPoint(Map jsonObject) {
|
||||||
WQLObject point_wql = WQLObject.getWQLObject("SCH_BASE_Point");
|
WQLObject point_wql = WQLObject.getWQLObject("SCH_BASE_Point");
|
||||||
WQLObject vehicle_wql = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo");
|
WQLObject vehicle_wql = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo");
|
||||||
@@ -842,6 +848,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> queryLKvehicle(Map jsonObject) {
|
public Map<String, Object> queryLKvehicle(Map jsonObject) {
|
||||||
if (ObjectUtil.isEmpty(jsonObject.get("lk_vehicle"))) {
|
if (ObjectUtil.isEmpty(jsonObject.get("lk_vehicle"))) {
|
||||||
throw new BadRequestException("立库载具码不能为空!");
|
throw new BadRequestException("立库载具码不能为空!");
|
||||||
@@ -857,6 +864,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> queryOutPoint(Map jsonObject) {
|
public Map<String, Object> queryOutPoint(Map jsonObject) {
|
||||||
JSONArray point_rows = WQLObject.getWQLObject("sch_base_point").query("area_type = '21' AND is_used = '1' AND is_delete = '0'").getResultJSONArray(0);
|
JSONArray point_rows = WQLObject.getWQLObject("sch_base_point").query("area_type = '21' AND is_used = '1' AND is_delete = '0'").getResultJSONArray(0);
|
||||||
JSONObject returnjo = new JSONObject();
|
JSONObject returnjo = new JSONObject();
|
||||||
@@ -867,6 +875,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map<String, Object> askVehicle(Map jsonObject) {
|
public Map<String, Object> askVehicle(Map jsonObject) {
|
||||||
if (ObjectUtil.isEmpty(jsonObject.get("point"))) {
|
if (ObjectUtil.isEmpty(jsonObject.get("point"))) {
|
||||||
throw new BadRequestException("点位不能为空!");
|
throw new BadRequestException("点位不能为空!");
|
||||||
@@ -951,6 +960,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
|
|||||||
return returnjo;
|
return returnjo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public void insertBucket(HashMap row) {
|
public void insertBucket(HashMap row) {
|
||||||
WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
|
WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
|
||||||
WQLObject change = WQLObject.getWQLObject("MD_PB_BucketChangeFlow");
|
WQLObject change = WQLObject.getWQLObject("MD_PB_BucketChangeFlow");
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ export default {
|
|||||||
url: 'api/materialsafeivt/bjsafeivt',
|
url: 'api/materialsafeivt/bjsafeivt',
|
||||||
idField: 'material_id',
|
idField: 'material_id',
|
||||||
sort: 'material_id,desc',
|
sort: 'material_id,desc',
|
||||||
|
query: { stor_id: '1473162033548627968' },
|
||||||
crudMethod: { ...crudMaterialsafeivt }
|
crudMethod: { ...crudMaterialsafeivt }
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ export default {
|
|||||||
size: 20
|
size: 20
|
||||||
},
|
},
|
||||||
sort: 'material_id,desc',
|
sort: 'material_id,desc',
|
||||||
|
query: { stor_id: '1473161852946092032' },
|
||||||
crudMethod: { ...crudMaterialsafeivt }
|
crudMethod: { ...crudMaterialsafeivt }
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user