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

add:新增查询erp视图接口

Browse Source
This commit is contained in:
liuxy
2023-05-04 17:49:26 +08:00
parent 3b5f98eca7
commit 2b0d367303
7 changed files with 108 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
View File

@@ -25,6 +25,8 @@
输入.fbillflag TYPEAS s_string
输入.vbillcode TYPEAS s_string
输入.cmaterialvid TYPEAS s_string
输入.bill_code TYPEAS s_string
输入.return_code TYPEAS s_string
@@ -148,6 +150,34 @@
ENDQUERY
ENDIF
IF 输入.flag = "6"
QUERY
SELECT
pp.*
FROM
PRESS_ORDER pp
WHERE 1=1
OPTION 输入.bill_code <> ""
pp.PRESS_CODE > 输入.bill_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "7"
QUERY
SELECT
pp.*
FROM
EMPEE_INFO pp
WHERE 1=1
OPTION 输入.return_code <> ""
pp.EMPEE_CODE > 输入.return_code
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF

2
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
View File

@@ -996,6 +996,8 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
.addParam("storagevehicle_code", vehicle_code).addParam("flag", "13")
.process().getResultJSONArray(0);
if (ObjectUtil.isEmpty(disArr)) throw new PdaRequestException("未找到对应分配明细！");
// 调用入库分配接口并下发任务
ArrayList<HashMap<String, String>> list = new ArrayList<>();
for (int i = 0; i < disArr.size(); i++) {

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/BagrecordController.java
View File

@@ -76,6 +76,20 @@ public class BagrecordController {
return new ResponseEntity<>(bagrecordService.groupBag(json),HttpStatus.OK);
}
@Log("查询oracle视图获取单据信息")
@ApiOperation("查询oracle视图获取单据信息")
@PostMapping("/blurQueryMater")
public ResponseEntity<Object> blurQueryMater(@RequestBody JSONObject json) {
return new ResponseEntity<>(bagrecordService.blurQueryMater(json),HttpStatus.OK);
}
@Log("查询oracle视图获取人员信息")
@ApiOperation("查询oracle视图获取人员信息")
@PostMapping("/blurPerson")
public ResponseEntity<Object> blurPerson(@RequestBody JSONObject json) {
return new ResponseEntity<>(bagrecordService.blurPerson(json),HttpStatus.OK);
}
@ApiOperation("导出数据")
@GetMapping(value = "/download")
public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/BagrecordService.java
View File

@@ -84,4 +84,16 @@ public interface BagrecordService {
*
*/
JSONObject groupBag(JSONObject json);
/**
* 查询oracle视图获取单据信息
*
*/
JSONObject blurQueryMater(JSONObject json);
/**
* 查询oracle视图获取人员信息
*
*/
JSONObject blurPerson(JSONObject json);
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BagrecordServiceImpl.java
View File

@@ -226,4 +226,25 @@ public class BagrecordServiceImpl implements BagrecordService {
return resultParam;
}
@Override
public JSONObject blurQueryMater(JSONObject json) {
String bill_code = json.getString("bill_code");
// 利用数据源查询oracle视图。数据源： dataSource1
JSONArray ja = WQL.getWO("QERP").setDbname("dataSource1").addParam("flag", "6").addParam("bill_code", bill_code).process().getResultJSONArray(0);
JSONObject jsonObject = new JSONObject();
jsonObject.put("data", ja);
return jsonObject;
}
@Override
public JSONObject blurPerson(JSONObject json) {
String return_code = json.getString("return_code");
// 利用数据源查询oracle视图。数据源： dataSource1
JSONObject jsonObject = WQL.getWO("QERP").setDbname("dataSource1").addParam("flag", "7").addParam("return_code", return_code).process().uniqueResult(0);
return jsonObject;
}
}

18
mes/qd/src/api/wms/basedata/master/bagrecord.js
View File

@@ -32,4 +32,20 @@ export function groupBag(data) {
})
}
export default { add, edit, del, groupBag }
export function blurQueryMater(data) {
return request({
url: 'api/bagrecord/blurQueryMater',
method: 'post',
data
})
}
export function blurPerson(data) {
return request({
url: 'api/bagrecord/blurPerson',
method: 'post',
data
})
}
export default { add, edit, del, groupBag, blurQueryMater, blurPerson }

27
mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue
View File

@@ -25,9 +25,9 @@
>
<el-option
v-for="item in materialList"
:key="item.pcsn"
:label="item.material_code"
:value="item.material_code"
:key="item.BATCH_SEQ"
:label="item.ITEM_CODE"
:value="item.ITEM_CODE"
/>
</el-select>
</el-form-item>
@@ -134,32 +134,29 @@ export default {
},
blurQueryMater(val) {
// 根据单据号查询调用接口获取压制订单内信息
const res = [
{ 'pcsn': '111', 'material_code': 'XR13II-P-B-20' },
{ 'pcsn': '23423', 'material_code': '001' },
{ 'pcsn': '444', 'material_code': '002' },
{ 'pcsn': '1215552', 'material_code': '003' }
]
this.materialList = res
crudBagrecord.blurQueryMater({ 'bill_code': val }).then(res => {
this.materialList = res.data
})
},
changePcsn(val) {
this.materialList.forEach(item => {
if (item.material_code === val) {
this.form1.pcsn = item.pcsn
if (item.ITEM_CODE === val) {
this.form1.pcsn = item.BATCH_SEQ
}
})
},
blurPerson(val) {
// 调用接口查询对应的人员信息
this.form1.return_person = val
crudBagrecord.blurPerson({ 'return_code': val }).then(res => {
this.form1.return_person = res.EMPEE_NAME
})
},
groupBag() {
crudBagrecord.groupBag(this.form1).then(res => {
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
const LODOP = getLodop()
const data = res.data
debugger
data.forEach(item => {
debugger