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

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
zds
2022-12-27 16:12:00 +08:00
parent 6d26ef52e9 c019451aa6
commit c092970a8f
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
json.put("create_time", now); json.put("create_time", now);
json.put("sysdeptid", deptId); json.put("sysdeptid", deptId);
json.put("syscompanyid", deptId); json.put("syscompanyid", deptId);
json.put("is_out",ObjectUtil.isNotEmpty(json.get("send_date"))?"1":"0");
String planstart_time = json.getString("planstart_time"); String planstart_time = json.getString("planstart_time");
Date date = DateUtil.parse(planstart_time); Date date = DateUtil.parse(planstart_time);
int days = this.getDays(json.getString("material_id")); int days = this.getDays(json.getString("material_id"));
@@ -169,6 +170,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (StrUtil.isEmpty(product_series_id)) { if (StrUtil.isEmpty(product_series_id)) {
throw new BadRequestException("工令对应产品系列不能为空！"); throw new BadRequestException("工令对应产品系列不能为空！");
} }
whereJson.put("is_out",ObjectUtil.isNotEmpty(whereJson.get("send_date"))?"1":"0");
whereJson.put("update_optid", currentUserId); whereJson.put("update_optid", currentUserId);
whereJson.put("update_optname", nickName); whereJson.put("update_optname", nickName);
whereJson.put("update_time", now); whereJson.put("update_time", now);

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

@@ -106,11 +106,11 @@
:value="item.id" :value="item.id"
/></el-select> /></el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否外协" prop="is_out"> <!-- <el-form-item label="是否外协" prop="is_out">-->
<label slot="label">是否外协:</label> <!-- <label slot="label">是否外协:</label>-->
<el-radio v-model="form.is_out" label="1" style="width: 90px">是</el-radio> <!-- <el-radio v-model="form.is_out" label="1" style="width: 90px">是</el-radio>-->
<el-radio v-model="form.is_out" label="0" style="width: 90px" >否</el-radio> <!-- <el-radio v-model="form.is_out" label="0" style="width: 90px" >否</el-radio>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="发货日期" prop="send_date"> <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-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> </el-form-item>

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

@@ -277,6 +277,13 @@
<el-table-column prop="create_name" min-width="60" label="创建人" /> <el-table-column prop="create_name" min-width="60" label="创建人" />
<el-table-column prop="update_optname" min-width="60" label="修改人" /> <el-table-column prop="update_optname" min-width="60" label="修改人" />
<el-table-column prop="remark" min-width="180" label="备注" /> <el-table-column prop="remark" min-width="180" label="备注" />
<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> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />