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

add:日计划外协修改

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-27 16:26:10 +08:00
parent c019451aa6
commit ebe563f0fc
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,7 +297,7 @@ public class DailyplanServiceImpl implements DailyplanService {
json.put("plan_org_name", product.getString("org_name"));
json.put("product_series", json.getString("product_series_id"));
json.put("is_out",ObjectUtil.isNotEmpty(json.get("send_date"))?"1":"0");
MPS_BD_ProductDailyPlan.insert(json);
}
@@ -348,6 +348,7 @@ public class DailyplanServiceImpl implements DailyplanService {
whereJson.put("plan_org_name", product.getString("org_name"));
whereJson.put("product_series", whereJson.getString("product_series_id"));
whereJson.put("is_out",ObjectUtil.isNotEmpty(whereJson.get("send_date"))?"1":"0");
MPS_BD_ProductDailyPlan.update(whereJson);
}
@@ -427,6 +428,7 @@ public class DailyplanServiceImpl implements DailyplanService {
new_jo.put("org_id",jo.getString("org_id"));
new_jo.put("is_experiment","0");
new_jo.put("is_out",ObjectUtil.isNotEmpty(new_jo.get("send_date"))?"1":"0");
workOrdereService.create(new_jo);
}
}

10
mes/qd/src/views/wms/pdm/produce/dailyplan/AddDialog.vue
View File

@@ -97,11 +97,11 @@
:value="item.id"
/></el-select>
</el-form-item>
<el-form-item label="是否外协" prop="is_out">
<label slot="label">是否外协:</label>
<el-radio v-model="form.is_out" label="1" >是</el-radio>
<el-radio v-model="form.is_out" label="0" >否</el-radio>
</el-form-item>
<!-- <el-form-item label="是否外协" prop="is_out">-->
<!-- <label slot="label">是否外协:</label>-->
<!-- <el-radio v-model="form.is_out" label="1" >是</el-radio>-->
<!-- <el-radio v-model="form.is_out" label="0" >否</el-radio>-->
<!-- </el-form-item>-->
<el-form-item label="发货日期" prop="send_date">
<el-date-picker v-model="form.send_date" value-format="yyyy-MM-dd" type="date" style="width: 210px" :disabled="crud.status.view > 0" />
</el-form-item>

7
mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
View File

@@ -206,6 +206,13 @@
<el-table-column prop="create_time" label="创建时间" min-width="135" />
<el-table-column prop="create_name" label="创建人" min-width="60" />
<el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="is_out" min-width="80" label="是否外协">
<template slot-scope="scope">
<span v-if="scope.row.is_out==='1'">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column prop="send_date" min-width="120" label="发货日期" />
</el-table>
</div>
<AddDialog @AddChanged="querytable" />

10
mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue
View File

@@ -70,11 +70,11 @@
<el-form-item label="发货日期" prop="send_date">
<el-date-picker disabled v-model="form.send_date" value-format="yyyy-MM-dd" type="date" style="width: 210px" />
</el-form-item>
<el-form-item label="是否外协" prop="is_out">
<label slot="label">是否外协:</label>
<el-radio v-model="form.is_out" label="1" disabled>是</el-radio>
<el-radio v-model="form.is_out" label="0" disabled>否</el-radio>
</el-form-item>
<!-- <el-form-item label="是否外协" prop="is_out">-->
<!-- <label slot="label">是否外协:</label>-->
<!-- <el-radio v-model="form.is_out" label="1" disabled>是</el-radio>-->
<!-- <el-radio v-model="form.is_out" label="0" disabled>否</el-radio>-->
<!-- </el-form-item>-->
<el-form-item label="生产批次" prop="pcsn">
<label slot="label">生产批次:</label>
<el-input v-model.trim="form.pcsn" style="width: 210px" disabled />