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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-06-10 18:50:33 +08:00
parent 97ae627072
commit 1080f1eb00
4 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java
View File

@@ -93,5 +93,9 @@ public class ProduceshiftorderDto implements Serializable {
private String children;
private String alloy;
private String temper;
}

15
nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
View File

@@ -217,4 +217,19 @@ public class ProduceshiftorderdetailDto implements Serializable {
/** 模板id */
private String template_id;
/** 执行标准 */
private String standard;
/** 批号 */
private String batch;
/** 生产日期 */
private String prod_date;
/** 检验员 */
private String inspector;
/** 米克重 */
private String mg_weight;
}

18
nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -213,6 +213,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
String material_spec = MapUtil.getStr(whereJson, "material_spec");
String outer_diameter = MapUtil.getStr(whereJson, "outer_diameter");
String wall_thickness = MapUtil.getStr(whereJson, "wall_thickness");
String alloy = MapUtil.getStr(whereJson, "alloy");
String temper = MapUtil.getStr(whereJson, "temper");
String length = MapUtil.getStr(whereJson, "length");
String qty = MapUtil.getStr(whereJson, "qty");
@@ -246,6 +248,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
orderDto.setIs_strapping("1");
orderDto.setIs_unbundling("1");
orderDto.setFeeding_mouth("3");
orderDto.setAlloy(alloy);
orderDto.setTemper(temper);
for(int i=0; i<tableData.size(); i++){
JSONObject jsonObject = tableData.getJSONObject(i);
ProduceshiftorderdetailDto detaildto = JSON.toJavaObject(jsonObject,ProduceshiftorderdetailDto.class);
@@ -892,9 +896,17 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
// 4.将主表当中的属性填充到excel当中
HashMap<String, String> map = new HashMap<>();
map.put("material_name",jsonMst.getString("material_code"));
map.put("qty",jsonMst.getString("qty"));
map.put("tttt",jsonMst.getString("qty"));
map.put("alloy",whereJson.getString("alloy"));
map.put("temper",whereJson.getString("temper"));
map.put("material_spec",whereJson.getString("material_spec"));
map.put("number",whereJson.getString("number"));
map.put("outer_diameter",whereJson.getString("outer_diameter"));
map.put("standard",whereJson.getString("standard"));
map.put("batch",whereJson.getString("batch"));
map.put("prod_date",whereJson.getString("prod_date"));
map.put("present_strap_pack_number",whereJson.getString("present_strap_pack_number"));
map.put("inspector",whereJson.getString("inspector"));
map.put("mg_weight",whereJson.getString("mg_weight"));
workBook.fill(map, sheet);
workBook.finish();

38
qd/src/views/acs/order/AddDialog.vue
View File

@@ -40,6 +40,14 @@
<label slot="label">外 径:</label>
<el-input v-model="form.outer_diameter" size="mini" style="width: 210px" />
</el-form-item>
<el-form-item label="牌号" prop="alloy">
<label slot="label">牌 号:</label>
<el-input v-model="form.alloy" size="mini" style="width: 210px" />
</el-form-item>
<el-form-item label="状态" prop="temper">
<label slot="label">状 态:</label>
<el-input v-model="form.temper" size="mini" style="width: 210px" />
</el-form-item>
<el-form-item label="壁厚" prop="wall_thickness">
<label slot="label">壁 厚:</label>
<el-input v-model="form.wall_thickness" size="mini" style="width: 210px" />
@@ -107,6 +115,36 @@
<span v-show="scope.row.edit">{{ scope.row.order_detail_qty }}</span>
</template>
</el-table-column>
<el-table-column prop="standard" label="执行标准" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.standard" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.standard }}</span>
</template>
</el-table-column>
<el-table-column prop="batch" label="批号" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.batch" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.batch }}</span>
</template>
</el-table-column>
<el-table-column prop="prod_date" label="生产日期" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.prod_date" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.prod_date }}</span>
</template>
</el-table-column>
<el-table-column prop="inspector" label="检验员" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.inspector" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.inspector }}</span>
</template>
</el-table-column>
<el-table-column prop="mg_weight" label="米克重" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.mg_weight" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.mg_weight }}</span>
</template>
</el-table-column>
<el-table-column prop="lettering_message" label="图标前刻字信息" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.lettering_message" size="mini" />