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

add：三线包装工单

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-15 19:12:40 +08:00
parent 4bbaa58d36
commit aa54150593
7 changed files with 175 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java
View File

@@ -31,6 +31,16 @@ public class MpsSaleOrderIcExt implements Serializable {
*/
private Integer seq_no;
/**
* print_序号
*/
private Integer print_no;
/**
* 物料规格
*/
private String material_code;
/**
* 包装袋类型
*/

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.common.anno.Log;
import org.nl.wms.mps_manage.other.service.orderExt.IMpsSaleOrderIcExtService;
import org.nl.wms.mps_manage.other.service.orderExt.dao.MpsSaleOrderIcExt;
import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -28,6 +29,8 @@ public class MpsSaleOrderIcExtController {
@Autowired
private IMpsSaleOrderIcExtService extService;
@Autowired
private IPdmProduceWorkorderService workorderService;
@PostMapping
@Log("新增订单扩展表")
@@ -41,6 +44,15 @@ public class MpsSaleOrderIcExtController {
@Log("根据工单获取条码")
//("根据工单获取条码")
public ResponseEntity<Object> getExtList(@RequestBody JSONObject whereJson) {
String workorder_code = whereJson.getString("workorder_code");
MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper<MpsSaleOrderIcExt>()
.eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code")));
int print_no = 0;
if (one==null){
}else {
print_no = one.getPrint_no();
}
return new ResponseEntity<>(extService.list(new QueryWrapper<MpsSaleOrderIcExt>().eq("remark1",whereJson.getString("workorder_code"))),HttpStatus.OK);
}
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java
View File

@@ -112,7 +112,7 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
@Override
@Transactional
public void update(Map userDetail) {
if(CollectionUtils.isEmpty(userDetail)|| userDetail.get("userId")==null){
if(CollectionUtils.isEmpty(userDetail)|| userDetail.get("user_id")==null){
return;
}

4
mes/qd/src/views/system/user/center/updatePass.vue
View File

@@ -43,8 +43,8 @@ export default {
{ required: true, message: '请输入旧密码', trigger: 'blur' }
],
newPass: [
{ required: true, message: '请输入新密码', trigger: 'blur' },
{ min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' }
{ required: true, message: '请输入新密码', trigger: 'blur' }
// , { min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' }
],
confirmPass: [
{ required: true, validator: confirmPass, trigger: 'blur' }

4
mes/qd/src/views/wms/old_manage/old_package/index.vue
View File

@@ -411,8 +411,8 @@ export default {
},
query: {
workorder_status: '2',
product_area: 'A2',
workprocedure_code: 'A1_BZ',
product_area: 'A3',
workprocedure_code: 'A3_KZBZ',
is_error: '0'
},
url: 'api/produceWorkorder',

67
mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
View File

@@ -183,7 +183,72 @@
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="巷道码盘模版" prop="stack_model">
<el-input v-model="form.package_ext.stack_model" style="width: 200px;" />
</el-form-item>
<!--三线工单参数-->
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="每箱袋数" prop="one_box_package_qty">
<el-input-number
v-model="form.package_ext.one_box_package_qty"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="总箱数" prop="box_num">
<el-input-number
v-model="form.package_ext.box_num"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="每袋数量" prop="one_package_qty">
<el-input-number
v-model="form.package_ext.one_package_qty"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="总袋数" prop="package_qty">
<el-input-number
v-model="form.package_ext.package_qty"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="满托数量" prop="tray_full_num">
<el-input-number
v-model="form.package_ext.tray_full_num"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="箱型模版" prop="box_type">
<el-input-number
v-model="form.package_ext.box_type"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="目标巷道" prop="target_roadway">
<el-input-number
v-model="form.package_ext.target_roadway"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="是否翻转" prop="is_flip">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.package_ext.is_flip"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="码垛模版号" prop="lane_tray_template">
<el-input-number
v-model="form.package_ext.lane_tray_template"
style="width: 200px;"
clearable
/>
</el-form-item>
</el-form>
</el-card>
<div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">

85
mes/qd/src/views/wms/product_manage/workorder/index.vue
View File

@@ -479,6 +479,74 @@
clearable
/>
</el-form-item>
<!--三线工单参数-->
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="每箱袋数" prop="one_box_package_qty">
<el-input-number
v-model="form.package_ext.one_box_package_qty"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="总箱数" prop="box_num">
<el-input-number
v-model="form.package_ext.box_num"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="每袋数量" prop="one_package_qty">
<el-input-number
v-model="form.package_ext.one_package_qty"
style="width: 200px;"
clearable
@change="A3_changepackage(form)"
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="总袋数" prop="package_qty">
<el-input-number
v-model="form.package_ext.package_qty"
style="width: 200px;"
disabled
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="满托数量" prop="tray_full_num">
<el-input-number
v-model="form.package_ext.tray_full_num"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="箱型模版" prop="box_type">
<el-input-number
v-model="form.package_ext.box_type"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="目标巷道" prop="target_roadway">
<el-input-number
v-model="form.package_ext.target_roadway"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="是否翻转" prop="is_flip">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.package_ext.is_flip"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1689437952540807169'" label="码垛模版号" prop="lane_tray_template">
<el-input-number
v-model="form.package_ext.lane_tray_template"
style="width: 200px;"
clearable
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -496,7 +564,6 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
<el-table-column prop="workorder_id" label="工单id" width="160px" />
<el-table-column prop="workorder_code" label="工单编号" width="100px">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
@@ -563,6 +630,7 @@
<el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常" />
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="workorder_id" label="工单id" width="160px" />
<el-table-column prop="nok_qty" label="报废总数" />
<el-table-column prop="report_qty" label="报修总数" />
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
@@ -623,7 +691,7 @@ const defaultForm = {
workorder_code: null,
shift_type_scode: '1',
workprocedure_id: null,
product_area: 'A1',
product_area: '',
plan_qty: null,
real_qty: null,
person_real_qty: null,
@@ -685,7 +753,7 @@ export default {
},
query: {
order_status: '-1',
product_area: 'A1',
product_area: '',
is_error: '0'
},
crudMethod: { ...crudProduceshiftorder }
@@ -771,6 +839,11 @@ export default {
}
this.form.package_ext.is_foreward = '0'
},
A3_changepackage(form){
if (form.package_ext.one_package_qty !=null && form.package_ext.one_package_qty>0){
form.package_ext.package_qty = parseFloat(form.plan_qty/form.package_ext.one_package_qty).toFixed(0)
}
},
formatBoolean: function(row, column) {
var ret = ''
if (row[column.property] === true) {
@@ -780,6 +853,12 @@ export default {
}
return ret
},
formatNum0(row, column) {
if (!row[column.property]) {
return 0
}
return parseFloat(row[column.property]).toFixed(0)
},
tableChanged3() {
this.crud.toQuery()
},