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

修改

Browse Source
This commit is contained in:
zds
2022-07-09 20:44:09 +08:00
parent a5faa15fa8
commit 6f509b0ac2
6 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
View File

@@ -239,6 +239,7 @@ public class FormulaServiceImpl implements FormulaService {
PDM_BI_FormulaDtl.insert(jo);
}
Formula.put("masterbucket_qty",masterbucket_qty+"");
Formula.put("ball_time",whereJson.getString("ball_time"));
Formula.put("extadd_qty",extadd_qty+"");
Formula.put("is_audit", "1");
Formula.put("audit_id",currentUserId);

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java
View File

@@ -293,6 +293,7 @@ public class InitformulaServiceImpl implements InitformulaService {
Formula_01.put("total_qty","0");
Formula_01.put("status","10");
Formula_01.put("is_delete", "0");
Formula_01.put("ball_time", whereJson.getString("ball_time"));
Formula_01.put("create_id", currentUserId);
Formula_01.put("create_name", nickName);
Formula_01.put("create_time", now);
@@ -400,6 +401,7 @@ public class InitformulaServiceImpl implements InitformulaService {
Formula_02.put("total_qty","0");
Formula_02.put("status","10");
Formula_02.put("is_delete", "0");
Formula_02.put("ball_time", whereJson.getString("ball_time"));
Formula_02.put("create_id", currentUserId);
Formula_02.put("create_name", nickName);
Formula_02.put("create_time", now);
@@ -576,6 +578,7 @@ public class InitformulaServiceImpl implements InitformulaService {
Formula_01.put("total_qty","0");
Formula_01.put("status","20");
Formula_01.put("is_delete", "0");
Formula_01.put("ball_time", whereJson.getString("ball_time"));
Formula_01.put("create_id", currentUserId);
Formula_01.put("create_name", nickName);
Formula_01.put("create_time", now);
@@ -684,6 +687,7 @@ public class InitformulaServiceImpl implements InitformulaService {
Formula_02.put("total_qty","0");
Formula_02.put("status","20");
Formula_02.put("is_delete", "0");
Formula_02.put("ball_time", whereJson.getString("ball_time"));
Formula_02.put("create_id", currentUserId);
Formula_02.put("create_name", nickName);
Formula_02.put("create_time", now);
@@ -806,6 +810,7 @@ public class InitformulaServiceImpl implements InitformulaService {
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject getform(Map json) {
WQLObject pdm_bi_workprocedureparaproduct = WQLObject.getWQLObject("pdm_bi_workprocedureparaproduct");
WQLObject MD_ME_ProductMaterialExt = WQLObject.getWQLObject("MD_ME_ProducMaterialExt");
WQLObject md_me_materialbase = WQLObject.getWQLObject("md_me_materialbase");
WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder");
@@ -824,7 +829,14 @@ public class InitformulaServiceImpl implements InitformulaService {
throw new BadRequestException("当前成品查询不到成品物料扩展信息！");
}
JSONObject mater = md_me_materialbase.query("material_id ='"+material_id+"'").uniqueResult(0);
JSONObject materPa = pdm_bi_workprocedureparaproduct.query("para_code ='QM008' and workprocedure_code='GX002' and material_id ='"+material_id+"'").uniqueResult(0);
if(materPa == null ){
throw new BadRequestException("当前成品查询不到球磨工艺参数球磨时间！");
}
workorder.put("formula_type","00");
workorder.put("ball_time",materPa.getDouble("value"));
workorder.put("waste_limit_down",material.getString("waste_limit_down"));
workorder.put("waste_limit_up",material.getString("waste_limit_up"));
workorder.put("c_balance",material.getString("c_balance"));

3
mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue
View File

@@ -65,7 +65,7 @@
<script>
import worktask from "@/api/wms/pdm/worktask";
import CRUD from "@crud/crud";
import CRUD, { crud } from '@crud/crud'
import {getLodop} from "@/assets/js/lodop/LodopFuncs";
export default {
@@ -81,6 +81,7 @@ export default {
}
},
dicts: ['is_line'],
mixins: [crud()],
data() {
return {
dialogVisible: false,

11
mes/qd/src/views/wms/pf/formula/DivDialog.vue
View File

@@ -139,6 +139,17 @@
/>
</el-select>
</el-form-item>
<el-form-item label="球磨时间">
<label slot="label">球磨时间:</label>
<el-input-number
v-model="form.ball_time"
:controls="false"
:precision="2"
:min="1"
:max="9999"
style="width:80px"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备注:</label>
<el-input v-model="form.remark" disabled style="width: 210px" />

12
mes/qd/src/views/wms/pf/formula/ViewDialog.vue
View File

@@ -126,6 +126,18 @@
/>
</el-select>
</el-form-item>
<el-form-item label="球磨时间">
<label slot="label">球磨时间:</label>
<el-input-number
v-model="form.ball_time"
:controls="false"
:precision="2"
:min="1"
:max="9999"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备注:</label>
<el-input v-model="form.remark" disabled style="width: 210px" />

13
mes/qd/src/views/wms/pf/initformula/DivDialog.vue
View File

@@ -90,7 +90,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="软废含量%" prop="total_qty">
<el-form-item label="软废含量%">
<label slot="label">软废含量%:</label>
<el-input-number
v-model="form.waste_limit_down"
@@ -110,6 +110,17 @@
style="width: 80px"
/>
</el-form-item>
<el-form-item label="球磨时间">
<label slot="label">球磨时间:</label>
<el-input-number
v-model="form.ball_time"
:controls="false"
:precision="2"
:min="1"
:max="9999"
style="width:80px"
/>
</el-form-item>
</el-form>
<div class="crud-opts2">