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

修改问题

Browse Source
This commit is contained in:
zds
2022-07-04 09:32:55 +08:00
parent 5f9bf824a9
commit 3f56bd478e
13 changed files with 88 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java
View File

@@ -214,7 +214,7 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
public JSONArray queryAll1(Map whereJson) {
String devicerecord_id = (String) whereJson.get("devicerecord_id");
WQLObject EM_BI_DeviceLifeCycle = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle"); // 工艺路线主表
JSONArray ja = EM_BI_DeviceLifeCycle.query("devicerecord_id='"+devicerecord_id+"'").getResultJSONArray(0);
JSONArray ja = EM_BI_DeviceLifeCycle.query("devicerecord_id='"+devicerecord_id+"'"," create_time ").getResultJSONArray(0);
return ja;
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
View File

@@ -47,6 +47,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (StrUtil.isNotEmpty(workorder_code)) {
map.put("workorder_code", "%" + workorder_code + "%");
}
String pcsn = map.get("pcsn");
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
String material_id = map.get("material_id");
if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%");
@@ -71,6 +75,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (StrUtil.isNotEmpty(workorder_code)) {
map.put("workorder_code", "%" + workorder_code + "%");
}
String pcsn = map.get("pcsn");
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
String material_id = map.get("material_id");
if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%");

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
View File

@@ -40,6 +40,10 @@ public class WorkTaskServiceImpl implements WorkTaskService {
if (StrUtil.isNotEmpty(workorder_code)) {
map.put("workorder_code", "%" + workorder_code + "%");
}
String pcsn = map.get("pcsn");
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
String material_id = map.get("material_id");
if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%");

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql
View File

@@ -25,6 +25,7 @@
输入.product_series_id TYPEAS s_string
输入.workprocedure_id TYPEAS s_string
输入.device_id TYPEAS s_string
输入.pcsn TYPEAS s_string
[临时表]
@@ -69,6 +70,9 @@
OPTION 输入.workorder_code <> ""
WorkOrder.workorder_code like 输入.workorder_code
ENDOPTION
OPTION 输入.pcsn <> ""
WorkOrder.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.status <> ""
WorkOrder.status = 输入.status
ENDOPTION
@@ -127,6 +131,9 @@
OPTION 输入.status <> ""
WorkOrder.status = 输入.status
ENDOPTION
OPTION 输入.pcsn <> ""
WorkOrder.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.workorder_type <> ""
WorkOrder.workorder_type = 输入.workorder_type
ENDOPTION

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql
View File

@@ -72,6 +72,9 @@
OPTION 输入.workorder_code <> ""
WorkTask.workorder_code like 输入.workorder_code
ENDOPTION
OPTION 输入.pcsn <> ""
WorkTask.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.worktask_code <> ""
WorkTask.worktask_code like 输入.worktask_code
ENDOPTION

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
View File

@@ -66,6 +66,10 @@ public class FormulaServiceImpl implements FormulaService {
if (StrUtil.isNotEmpty(workorder_code)) {
map.put("workorder_code", "%" + workorder_code + "%");
}
String pcsn = map.get("pcsn");
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
String material_id = map.get("material_id");
if (StrUtil.isNotEmpty(material_id)) {
map.put("material_id", "%" + material_id + "%");

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_FORMULA01.wql
View File

@@ -21,6 +21,7 @@
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.formula_id TYPEAS s_string
输入.pcsn TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -68,6 +69,9 @@
OPTION 输入.workorder_code <> ""
Formula.workorder_code like 输入.workorder_code
ENDOPTION
OPTION 输入.pcsn <> ""
Formula.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.status <> ""
Formula.status = 输入.status
ENDOPTION

15
mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
View File

@@ -68,11 +68,13 @@
</el-form-item>
<el-form-item label="启用日期">
<el-date-picker
v-model="query.beginuse_date"
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
@input="onInput()"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
@@ -311,9 +313,6 @@ export default {
crudWorkProcedure.downSelect().then(res => {
this.workProcedureList = res
})
this.crud.query.beginuse_date = [new Date(), new Date()]
this.crud.toQuery()
const param = {
'materOpt_code': '23'
}
@@ -322,6 +321,9 @@ export default {
this.queryClassId()
})
this.getDepts()
this.crud.query.createTime = [new Date(), new Date()]
this.crud.toQuery()
},
methods: {
canUd(row) {
@@ -434,6 +436,9 @@ export default {
this.dissub_flag = true
this.open_flag = true
},
onInput() {
this.$forceUpdate()
},
checkboxT(row) {
return row.status !== '99'
},

13
mes/qd/src/views/wms/pdm/produce/workorder/index.vue
View File

@@ -33,6 +33,7 @@
<el-date-picker
v-model="query.createTime"
type="daterange"
@input="onInput()"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
@@ -93,6 +94,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="批次">
<el-input
v-model="query.pcsn"
size="mini"
clearable
placeholder="批次"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -399,6 +409,9 @@ export default {
this.mstrow = this.checkrows.pop()
this.changeShow = true
},
onInput() {
this.$forceUpdate()
},
submit(status) {
this.checkrows = this.$refs.table.selection
if(this.checkrows.length === 0 ){

14
mes/qd/src/views/wms/pdm/produce/worktask/index.vue
View File

@@ -55,7 +55,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="批次">
<el-input
v-model="query.pcsn"
size="mini"
clearable
placeholder="批次"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务状态">
<el-select
v-model="query.status"
@@ -90,6 +98,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="crud.toQuery"
/>
</el-form-item>
@@ -381,6 +390,9 @@ export default {
this.querytable()
})
},
onInput() {
this.$forceUpdate()
},
openWork() {
this.checkrows = this.$refs.table.selection
if(this.checkrows.length === 0 ){

9
mes/qd/src/views/wms/pf/formula/index.vue
View File

@@ -56,6 +56,15 @@
:value="item.value"
/>
</el-select>
<el-form-item label="批次">
<el-input
v-model="query.pcsn"
size="mini"
clearable
placeholder="批次"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
</el-form-item>
<rrOperation />
</el-form>

9
mes/qd/src/views/wms/pf/initformula/index.vue
View File

@@ -75,6 +75,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="批次">
<el-input
v-model="query.pcsn"
size="mini"
clearable
placeholder="批次"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>

4
mes/qd/src/views/wms/st/core/outbill/checkoutbill/DivDialog.vue
View File

@@ -325,10 +325,12 @@ export default {
this.areatype = "'31'"
} else if (this.mstrow.bill_type === '010201' || this.mstrow.bill_type === '010202' || this.mstrow.bill_type === '010401') {
this.areatype = "'21'"
} else if (this.mstrow.bill_type === '010503' || this.mstrow.bill_type === '010501' || this.mstrow.bill_type === '010801') {
} else if (this.mstrow.bill_type === '010503' || this.mstrow.bill_type === '010501') {
this.areatype = "'22','23','24'"
} else if (this.mstrow.bill_type === '010502') {
this.areatype = "'21','22','23','24'"
} else if (this.mstrow.bill_type === '010801') {
this.areatype = "'22','23','24','31','35'"
} else if (this.mstrow.bill_type === '010601') {
this.areatype = ''
}