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

add:修改老车间工单打印

Browse Source
This commit is contained in:
zhangzq
2024-11-05 19:17:38 +08:00
parent d604552b9a
commit 5d09730b64
7 changed files with 146 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,36 +23,18 @@ public class MpsSaleOrderIcExt implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "orderext_id")
private String orderext_id;
/** /**
* 销售单标识 * 销售单标识
*/ */
@TableId(value = "sale_id")
private String sale_id; private String sale_id;
/**
* 销售单编号
*/
private String sale_code;
/** /**
* 明细序号 * 明细序号
*/ */
private Integer seq_no; private Integer seq_no;
/**
* print_序号
*/
private Integer print_no;
/**
* 物料规格
*/
private String material_code;
/** /**
* 包装袋类型 * 包装袋类型
*/ */

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

@@ -3,6 +3,7 @@ package org.nl.wms.mps_manage.saleorder.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.nl.common.anno.Log; import org.nl.common.anno.Log;
import org.nl.common.utils.IdUtil; import org.nl.common.utils.IdUtil;
@@ -55,13 +56,16 @@ public class MpsSaleOrderIcExtController {
@Log("新增订单扩展表") @Log("新增订单扩展表")
//("新增订单扩展表") //("新增订单扩展表")
public ResponseEntity<Object> query(@RequestBody JSONObject whereJson) { public ResponseEntity<Object> query(@RequestBody JSONObject whereJson) {
Map<String, Object> map = extService.getMap(new QueryWrapper<MpsSaleOrderIcExt>() MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper<MpsSaleOrderIcExt>()
.eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code"))); .eq("sale_id", whereJson.getString("sale_id")).eq("remark1", whereJson.getString("material_code")));
if (map==null){ Map result;
MpsSaleOrder saleOrder = saleOrderService.getById(whereJson.getString("sale_id")); if (one==null){
map= MapOf.of("sale_code",saleOrder.getSale_code(),"material_code",whereJson.getString("material_code"),"bar_code","","print_no",0,"orderext_id",""); String bar_code = whereJson.getString("workorder_code") + whereJson.getString("is_flip") + whereJson.getString("target_roadway") + "00001";
result = MapOf.of("sale_id",whereJson.getString("sale_id"),"material_code",whereJson.getString("material_code"),"bar_code",bar_code,"print_no",0);
}else {
result = MapOf.of("sale_id",one.getSale_id(),"material_code",one.getRemark1(),"bar_code",one.getBar_code(),"print_no",one.getRemark2());
} }
return new ResponseEntity<>(map,HttpStatus.OK); return new ResponseEntity<>(result,HttpStatus.OK);
} }
@PostMapping("/getExtList") @PostMapping("/getExtList")
@@ -71,14 +75,13 @@ public class MpsSaleOrderIcExtController {
if (StringUtils.isEmpty(whereJson.getString("sale_id"))){throw new BadRequestException("当前工单没有绑定订单无法打印");}; if (StringUtils.isEmpty(whereJson.getString("sale_id"))){throw new BadRequestException("当前工单没有绑定订单无法打印");};
if (whereJson.getInteger("print_num")==null){throw new BadRequestException("没有设置打印标签数量");}; if (whereJson.getInteger("print_num")==null){throw new BadRequestException("没有设置打印标签数量");};
MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper<MpsSaleOrderIcExt>() MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper<MpsSaleOrderIcExt>()
.eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code"))); .eq("sale_id", whereJson.getString("sale_id")).eq("remark1", whereJson.getString("material_code")));
int print_no = 0; int print_no = 0;
if (one==null){ if (one==null){
one = new MpsSaleOrderIcExt(); one = new MpsSaleOrderIcExt();
one.setSale_id(whereJson.getString("sale_id")); one.setRemark1(whereJson.getString("material_code"));
one.setMaterial_code(whereJson.getString("material_code"));
}else { }else {
print_no = one.getPrint_no(); print_no = Integer.parseInt(one.getRemark2());
} }
LinkedList<String> barCodes = new LinkedList<>(); LinkedList<String> barCodes = new LinkedList<>();
for (int i =0;i<whereJson.getInteger("print_num");i++){ for (int i =0;i<whereJson.getInteger("print_num");i++){
@@ -86,16 +89,34 @@ public class MpsSaleOrderIcExtController {
barCodes.add(bar_code); barCodes.add(bar_code);
} }
one.setPrint_no(print_no+whereJson.getInteger("print_num")); one.setRemark2(String.valueOf(print_no+whereJson.getInteger("print_num")));
one.setBar_code(barCodes.getLast()); one.setBar_code(barCodes.getLast());
if (one.getOrderext_id() == null){ if (StringUtils.isEmpty(one.getSale_id())){
one.setOrderext_id(IdUtil.getStringId()); one.setSale_id(whereJson.getString("sale_id"));
one.setSeq_no(1);
extService.save(one); extService.save(one);
}else { }else {
extService.updateById(one); extService.update(new UpdateWrapper<MpsSaleOrderIcExt>()
.set("remark2",one.getRemark2())
.set("bar_code",one.getBar_code())
.eq("sale_id", whereJson.getString("sale_id"))
.eq("remark1", whereJson.getString("material_code")));
} }
return new ResponseEntity<>(barCodes,HttpStatus.OK); return new ResponseEntity<>(barCodes,HttpStatus.OK);
} }
@PostMapping("/reset")
@Log("根据工单获取条码")
//("根据工单获取条码")
public ResponseEntity<Object> reset(@RequestBody JSONObject whereJson) {
if (StringUtils.isEmpty(whereJson.getString("sale_id"))||StringUtils.isEmpty(whereJson.getString("material_code"))) {
throw new BadRequestException("请求参数不能为空，缺少sale_id或者物料信息");
};
extService.remove(new QueryWrapper<MpsSaleOrderIcExt>()
.eq("sale_id", whereJson.getString("sale_id"))
.eq("remark1", whereJson.getString("material_code")));
return new ResponseEntity<>(HttpStatus.OK);
}
} }

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
View File

@@ -38,7 +38,7 @@ public class MpsSaleOrder implements Serializable{
* 明细序号 * 明细序号
*/ */
private Integer seq_no; private int seq_no;
/** /**
* 销售单类型 * 销售单类型
*/ */

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
View File

@@ -1048,9 +1048,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
form.put("device_code", workOrder.getDevice_code()); form.put("device_code", workOrder.getDevice_code());
form.put("is_needmove", workOrder.getIs_needmove() ? 1 : 0); form.put("is_needmove", workOrder.getIs_needmove() ? 1 : 0);
form.put("package_ext", workOrder.getPackage_ext()); form.put("package_ext", workOrder.getPackage_ext());
if (param.containsKey("extra_map")) { form.put("extra_map", JSON.parseObject(workOrder.getPackage_ext()));
form.put("extra_map", param.getJSONObject("extra_map"));
}
return form; return form;
} }

2
mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -7,7 +7,7 @@ spring:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_xc}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
# url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:zjhl_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:zjhl_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
username: ${DB_USER:root} username: ${DB_USER:root}
password: ${DB_PWD:Root.123456} password: ${DB_PWD:Root.123456}

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

@@ -85,22 +85,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<rrOperation/> <rrOperation />
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"> <crudOperation :permission="permission">
<el-button <!-- <el-button-->
slot="right" <!-- slot="right"-->
class="filter-item" <!-- class="filter-item"-->
type="success" <!-- type="success"-->
size="mini" <!-- size="mini"-->
icon="el-icon-check" <!-- icon="el-icon-check"-->
@click="save" <!-- @click="save"-->
> <!-- >-->
保存 <!-- 保存-->
</el-button> <!-- </el-button>-->
<el-button <el-button
slot="right" slot="right"
class="filter-item" class="filter-item"
@@ -137,19 +137,19 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="仓位编码" prop="struct_code"> <el-form-item label="仓位编码" prop="struct_code">
<el-input v-model="form.struct_code" style="width: 200px;"/> <el-input v-model="form.struct_code" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="仓位名称" prop="struct_name"> <el-form-item label="仓位名称" prop="struct_name">
<el-input v-model="form.struct_name" style="width: 200px;"/> <el-input v-model="form.struct_name" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="仓位简称"> <el-form-item label="仓位简称">
<el-input v-model="form.simple_name" style="width: 200px;"/> <el-input v-model="form.simple_name" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -167,7 +167,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="载具号"> <el-form-item label="载具号">
<label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label> <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
<el-input v-model="form.storagevehicle_code" style="width: 200px;"/> <el-input v-model="form.storagevehicle_code" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -193,12 +193,12 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="容量" prop="capacity"> <el-form-item label="容量" prop="capacity">
<label slot="label">容&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量:</label> <label slot="label">容&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量:</label>
<el-input v-model="form.capacity" style="width: 200px;"/> <el-input v-model="form.capacity" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="承受重量" prop="weight"> <el-form-item label="承受重量" prop="weight">
<el-input v-model="form.weight" style="width: 200px;"/> <el-input v-model="form.weight" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -206,13 +206,13 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="宽度" prop="width"> <el-form-item label="宽度" prop="width">
<label slot="label">宽&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label> <label slot="label">宽&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.width" style="width: 200px;"/> <el-input v-model="form.width" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="深度" prop="zdepth"> <el-form-item label="深度" prop="zdepth">
<label slot="label">深&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label> <label slot="label">深&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.zdepth" style="width: 200px;"/> <el-input v-model="form.zdepth" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -220,7 +220,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="高度" prop="height"> <el-form-item label="高度" prop="height">
<label slot="label">高&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label> <label slot="label">高&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.height" style="width: 200px;"/> <el-input v-model="form.height" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -252,7 +252,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注"> <el-form-item label="备注">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label> <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 550px;" rows="2" type="textarea"/> <el-input v-model="form.remark" style="width: 550px;" rows="2" type="textarea" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -273,30 +273,30 @@
@open="printFormm()" @open="printFormm()"
@close="close()" @close="close()"
> >
<el-card class="box-card" shadow="never"> <el-card class="box-card" shadow="never">
<el-form ref="form" :inline="true" :model="form" size="mini" label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"> <el-form ref="form" :inline="true" :model="form" size="mini" label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
<el-form-item label="订单号" prop="pwd"> <el-form-item label="订单号" prop="pwd">
<el-input v-model="printForm.sale_code" disabled type="text" style="width: 200px" /> <el-input v-model="printForm.sale_id" disabled type="text" style="width: 200px" />
</el-form-item> </el-form-item>
<el-form-item label="物料编号" prop="pwd"> <el-form-item label="物料编号" prop="pwd">
<el-input v-model="printForm.material_code" disabled type="text" style="width: 200px" /> <el-input v-model="printForm.material_code" disabled type="text" style="width: 200px" />
</el-form-item> </el-form-item>
<el-form-item label="当前箱标签" prop="pwd"> <el-form-item label="当前箱标签" prop="pwd">
<el-input v-model="printForm.bar_code" disabled type="text" style="width: 200px" /> <el-input v-model="printForm.bar_code" disabled type="text" style="width: 200px" />
</el-form-item> </el-form-item>
<el-form-item label="当前打印箱号" prop="pwd"> <el-form-item label="当前打印箱号" prop="pwd">
<el-input v-model="printForm.print_no" type="text" style="width: 100px" /> <el-input v-model="printForm.print_no" type="text" style="width: 100px" />
<el-button type="primary" @click="resetno">重置箱号</el-button> <el-button type="primary" @click="resetno">重置箱号</el-button>
</el-form-item> </el-form-item>
<el-form-item label="打印标签数量" prop="pwd"> <el-form-item label="打印标签数量" prop="pwd">
<el-input-number v-model="printForm.print_number" type="text" style="width: 100px" /> <el-input-number v-model="printForm.print_num" type="text" style="width: 100px" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">打 印</el-button> <el-button type="primary" @click="submit">打 印</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
<el-table <el-table
@@ -310,29 +310,29 @@
@select="handleSelectionChange" @select="handleSelectionChange"
@select-all="onSelectAll" @select-all="onSelectAll"
> >
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识"/> <el-table-column prop="workorder_code" label="工单编号" width="140px" />
<el-table-column prop="workorder_code" label="工单编号" width="140px"/> <el-table-column prop="sale_id" label="订单号" width="140px" />
<el-table-column prop="shift_type_scode" label="班次类型"> <el-table-column prop="shift_type_scode" label="班次类型">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }} {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="workprocedure_code" label="工序编码" />--> <!-- <el-table-column prop="workprocedure_code" label="工序编码" />-->
<el-table-column prop="product_area" label="生产车间"/> <el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="plan_qty" label="计划数量"/> <el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量"/> <el-table-column prop="real_qty" label="实际数量" />
<el-table-column prop="person_name" label="生产人员"/> <el-table-column prop="person_name" label="生产人员" />
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip/> <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
<el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip/> <el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip/> <el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
<el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip/> <el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
<el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4"/> <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
<el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip/> <el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip />
<el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip/> <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip/> <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip/> <el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip/> <el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip />
<el-table-column prop="is_canupdate_update" label="操作工是否允许修改报工数量" width="200" show-overflow-tooltip> <el-table-column prop="is_canupdate_update" label="操作工是否允许修改报工数量" width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_canupdate_update] }} {{ dict.label.IS_OR_NOT[scope.row.is_canupdate_update] }}
@@ -358,29 +358,29 @@
{{ dict.label.IS_OR_NOT[scope.row.is_error] }} {{ dict.label.IS_OR_NOT[scope.row.is_error] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip/> <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
<el-table-column prop="remark" label="备注"/> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" show-overflow-tooltip/> <el-table-column prop="create_name" label="创建人" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip/> <el-table-column prop="create_time" label="创建时间" show-overflow-tooltip />
<el-table-column prop="update_name" label="修改人" show-overflow-tooltip/> <el-table-column prop="update_name" label="修改人" show-overflow-tooltip />
<el-table-column prop="update_time" label="修改时间" show-overflow-tooltip/> <el-table-column prop="update_time" label="修改时间" show-overflow-tooltip />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination/> <pagination />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import crudStructattr from '@/api/wms/basedata/st/structattr' import crudStructattr from '@/api/wms/basedata/st/structattr'
import CRUD, {crud, form, header, presenter} from '@crud/crud' import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation' import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import crudSectattr from '@/api/wms/basedata/st/sectattr' import crudSectattr from '@/api/wms/basedata/st/sectattr'
import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder' import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
import {getLodop} from '@/assets/js/lodop/LodopFuncs' import { getLodop } from '@/assets/js/lodop/LodopFuncs'
import orderExt from '@/views/wms/old_manage/old_package/orderExt' import orderExt from '@/views/wms/old_manage/old_package/orderExt'
const defaultForm = { const defaultForm = {
@@ -431,7 +431,7 @@ const defaultForm = {
export default { export default {
name: 'Structattr', name: 'Structattr',
dicts: ['ST_HEIGHT_TYPE', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'IS_OR_NOT', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'PDM_BI_SHIFTTYPE'], dicts: ['ST_HEIGHT_TYPE', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'IS_OR_NOT', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'PDM_BI_SHIFTTYPE'],
components: {pagination, crudOperation, rrOperation, udOperation}, components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {
return CRUD({ return CRUD({
@@ -447,7 +447,7 @@ export default {
}, },
url: 'api/produceWorkorder', url: 'api/produceWorkorder',
idField: 'struct_id', idField: 'struct_id',
crudMethod: {...crudStructattr} crudMethod: { ...crudStructattr }
}) })
}, },
data() { data() {
@@ -493,8 +493,16 @@ export default {
val[1] = form.sect_id val[1] = form.sect_id
form.cascader = val form.cascader = val
}, },
submit() {}, submit() {
resetno() {}, this.printNumber()
},
resetno() {
const param = { 'sale_id': this.currentRow.sale_id, 'material_code': this.currentRow.material_code }
orderExt.reset(param).then(res => {
this.crud.notify('重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.dialogVisible = false
})
},
handleSelectionChange(val, row) { handleSelectionChange(val, row) {
if (val.length > 1) { if (val.length > 1) {
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
@@ -536,17 +544,6 @@ export default {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type] return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
}, },
startWork() { startWork() {
if (!this.crud.query.one_box_package_qty || !this.crud.query.one_package_qty || !this.crud.query.box_type ||
!this.crud.query.target_roadway || !this.crud.query.is_flip ||
!this.crud.query.tray_full_num) {
this.crud.notify('缺少开工必要参数，保证输入框内不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.currentRow.extra_map = this.crud.query
this.currentRow.extra_map.package_qty = Math.ceil(this.currentRow.plan_qty / this.currentRow.extra_map.one_package_qty)
this.currentRow.extra_map.box_num = Math.ceil(this.currentRow.extra_map.package_qty / this.currentRow.extra_map.one_box_package_qty)
orderExt.add(this.currentRow).then(res => {
})
crudProduceshiftorder.openStart(this.currentRow).then(res => { crudProduceshiftorder.openStart(this.currentRow).then(res => {
}) })
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -584,20 +581,29 @@ export default {
this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}) })
}, },
printFormm(){ printFormm() {
const param ={"sale_id":this.currentRow.sale_id,"material_code":this.currentRow.material_code} const parse = JSON.parse(this.currentRow.package_ext)
const flip = parse.is_flip
const target_roadway = parse.target_roadway
const workorderCode = this.currentRow.workorder_code
const param = { 'workorder_code': workorderCode, 'is_flip': flip, 'target_roadway': target_roadway, 'sale_id': this.currentRow.sale_id, 'material_code': this.currentRow.material_code }
orderExt.getQuery(param).then(res => { orderExt.getQuery(param).then(res => {
this.printForm = res this.printForm = res
}) })
}, },
close(){ close() {
this.printForm = {}, this.printForm = {},
this.dialogVisible =false this.dialogVisible = false
}, },
print(){ print() {
this.dialogVisible =true this.dialogVisible = true
}, },
printNumber(){ printNumber() {
const parse = JSON.parse(this.currentRow.package_ext)
this.currentRow.print_num = this.printForm.print_num
this.currentRow.is_flip = parse.is_flip
this.currentRow.target_roadway = parse.target_roadway
orderExt.getExtList(this.currentRow).then(res => { orderExt.getExtList(this.currentRow).then(res => {
if (res.length == 0 || !res) { if (res.length == 0 || !res) {
this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO) this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO)

8
mes/qd/src/views/wms/old_manage/old_package/orderExt.js
View File

@@ -22,6 +22,12 @@ export function getQuery(data) {
method: 'post', method: 'post',
data data
}) })
} export function reset(data) {
return request({
url: 'api/mpsSaleOrderIcExt/reset',
method: 'post',
data
})
} }
export default { add, getExtList, getQuery } export default { add, getExtList, getQuery, reset }