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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-07-09 11:19:12 +08:00
parent 85476dd63d
commit e9679d8f13
7 changed files with 85 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java
View File

@@ -196,6 +196,8 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
jsonProduc.put("is_need_move", map.get("is_need_move"));
jsonProduc.put("net_rate", map.get("net_rate"));
jsonProduc.put("technology_code", map.get("technology_code"));
jsonProduc.put("ball_rate", map.get("ball_rate"));
jsonProduc.put("liquid_rate", map.get("liquid_rate"));
producTab.insert(jsonProduc);
} else {
json.put("standard_weight", map.get("standard_weight"));
@@ -217,6 +219,8 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
json.put("is_need_move", map.get("is_need_move"));
json.put("net_rate", map.get("net_rate"));
json.put("technology_code", map.get("technology_code"));
json.put("ball_rate", map.get("ball_rate"));
json.put("liquid_rate", map.get("liquid_rate"));
producTab.update(json);
}
JSONObject jsonMater = materTab.query("material_id = '" + material_id + "' and is_delete = '0'").uniqueResult(0);

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql
View File

@@ -77,6 +77,8 @@
p.is_need_move AS product_is_need_move,
p.net_rate,
p.technology_code,
p.ball_rate,
p.liquid_rate,
m.is_used,
m.update_optname,
m.update_time,

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls
View File

Binary file not shown.

22
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/ProductProcessParamServiceImpl.java
View File

@@ -4,10 +4,12 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.exception.BadRequestException;
import org.nl.utils.SecurityUtils;
import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
import org.nl.wms.basedata.master.service.ClassstandardService;
@@ -182,9 +184,19 @@ public class ProductProcessParamServiceImpl implements ProductProcessParamServic
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
String jx1 = "";
String jx2 = "";
for (int i = 0; i < dtlArr.size(); i++) {
JSONObject jsonObject = dtlArr.getJSONObject(i);
String para_code = jsonObject.getString("para_code");
if (StrUtil.equals(para_code, "QM001")) {
jx1 = jsonObject.getString("value");
}
if (StrUtil.equals(para_code, "QM002")) {
jx2 = jsonObject.getString("value");
}
jsonObject.put("paradtl_id", IdUtil.getSnowflake(1, 1).nextId());
jsonObject.put("material_id", materialDto.getMaterial_id());
jsonObject.put("create_id", currentUserId);
@@ -194,8 +206,16 @@ public class ProductProcessParamServiceImpl implements ProductProcessParamServic
jsonObject.put("update_optname", nickName);
jsonObject.put("update_time", now);
wppTab.insert(jsonObject);
}
if (ObjectUtil.isNotEmpty(jx1) && ObjectUtil.isNotEmpty(jx2)) {
if (StrUtil.equals(jx1, "0") && StrUtil.equals(jx2, "0")) {
throw new BadRequestException("98酒精和92酒精不能同时为0");
}
if (StrUtil.equals(jx1, "1") && StrUtil.equals(jx2, "1")) {
throw new BadRequestException("98酒精和92酒精不能同时为1");
}
}
}
@Override

2
mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
View File

@@ -93,6 +93,8 @@
<el-table-column prop="weight_lost_up" label="重损上限" />
<el-table-column prop="net_rate" label="纯粉系数" />
<el-table-column prop="technology_code" label="工艺代码" />
<el-table-column prop="ball_rate" label="球料比" />
<el-table-column prop="liquid_rate" label="液料比" />
<el-table-column v-if="false" prop="is_used" label="是否启用" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150px" />

87
mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue
View File

@@ -116,28 +116,49 @@
<el-input-number :precision="2" :step="0.01" :max="100" v-model="formData.c_balance" :controls="false" placeholder="%" style="width: 200px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="球磨时间" prop="ball_time">
<el-input-number :precision="2" :step="0.1" :max="1000" v-model="formData.ball_time" :controls="false" placeholder="小时" style="width: 200px;"/>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="8">
<el-form-item label="球磨转速" prop="ball_speed">
<el-input-number :precision="2" :step="0.1" v-model="formData.ball_speed" :controls="false" placeholder="每分钟" style="width: 200px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="对应球磨机产品编号">
<el-input v-model="formData.product_ball_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="原牌号">
<el-input v-model="formData.old_mark" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="8">
<el-form-item label="对应球磨机产品编号">
<el-input v-model="formData.product_ball_code" style="width: 200px;" />
</el-form-item>
</el-col>-->
</el-row>
<el-row>
<!-- <el-col :span="8">
<el-form-item label="产品排产球磨时间">
<el-select
v-model="formData.product_ball_time"
clearable
size="mini"
placeholder="小时"
class="filter-item"
style="width: 200px;"
>
<el-option
v-for="item in dict.product_ball_time"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item label="生产方式">
<el-select
@@ -156,26 +177,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品排产球磨时间">
<el-select
v-model="formData.product_ball_time"
clearable
size="mini"
placeholder="小时"
class="filter-item"
style="width: 200px;"
>
<el-option
v-for="item in dict.product_ball_time"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="重损上限" prop="weight_lost_up">
<el-input-number :precision="2" :step="0.1" v-model="formData.weight_lost_up" :controls="false" style="width: 200px;"/>
@@ -198,20 +199,32 @@
<el-input v-model="formData.technology_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="球料比" prop="ball_rate">
<el-input-number :precision="2" :step="0.1" v-model="formData.ball_rate" :controls="false" style="width: 200px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="液料比" prop="liquid_rate">
<el-input-number :precision="2" :step="0.1" v-model="formData.liquid_rate" :controls="false" style="width: 200px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否允许自动开单" prop="is_auto_open">
<el-radio v-model="formData.is_auto_open" label="0">否</el-radio>
<el-radio v-model="formData.is_auto_open" label="1">是</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="是否二次投料" prop="is_again_put">
<el-radio v-model="formData.is_again_put" label="0">否</el-radio>
<el-radio v-model="formData.is_again_put" label="1">是</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="是否生成理化报告" prop="is_report">
<el-radio v-model="formData.is_report" label="0">否</el-radio>
@@ -226,13 +239,13 @@
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<!-- <el-col :span="16">
<el-form-item label="控制记录卡打印模板">
<el-input v-model="file_name" disabled style="width: 200px;" />
<el-button type="primary" @click="openTemplate">上传模板</el-button>
<el-button type="success" @click="lookTemplate">查看模板</el-button>
</el-form-item>
</el-col>
</el-col>-->
</el-row>
</el-form>
@@ -320,6 +333,14 @@ export default {
net_rate: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
ball_rate: [
{ required: true, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
liquid_rate: [
{ required: true, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
standard_weight: [
{ required: true, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }

4
mes/qd/src/views/wms/pf/flourwork/index.vue
View File

@@ -125,8 +125,8 @@
<el-table-column prop="status" label="配粉状态" :formatter="statusName" />
<el-table-column prop="planstart_time" label="计划开始时间" width="150px" show-overflow-tooltip />
<el-table-column prop="planend_time" label="计划结束时间" width="150px" show-overflow-tooltip />
<el-table-column prop="start_time" label="实际开始时间" width="150px" show-overflow-tooltip />
<el-table-column prop="end_time" label="实际结束时间" width="150px" show-overflow-tooltip />
<!-- <el-table-column prop="start_time" label="实际开始时间" width="150px" show-overflow-tooltip />
<el-table-column prop="end_time" label="实际结束时间" width="150px" show-overflow-tooltip />-->
<el-table-column prop="fstart_time" label="配粉开始时间" width="150px" show-overflow-tooltip />
<el-table-column prop="fend_time" label="配粉结束时间" width="150px" show-overflow-tooltip />
<el-table-column prop="start_name" label="开始人" />