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-06-30 16:27:01 +08:00
parent c91da27002
commit 5dcb227b03
5 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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;
@@ -166,6 +167,8 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
if (is_bcp) {
//半成品
String technology_code = MapUtil.getStr(map, "technology_code");
if (technology_code.length() > 1) throw new BadRequestException("工艺代码长度大于1");
String material_id = (String) map.get("material_id");
JSONObject json = producTab.query("material_id= '" + material_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(json)) {
@@ -192,6 +195,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
jsonProduc.put("product_ball_code", map.get("product_ball_code"));
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"));
producTab.insert(jsonProduc);
} else {
json.put("standard_weight", map.get("standard_weight"));
@@ -212,6 +216,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
json.put("weight_lost_down", map.get("weight_lost_down"));
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"));
producTab.update(json);
}
JSONObject jsonMater = materTab.query("material_id = '" + material_id + "' and is_delete = '0'").uniqueResult(0);

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

@@ -76,6 +76,7 @@
p.standard_weight_pft,
p.is_need_move AS product_is_need_move,
p.net_rate,
p.technology_code,
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.

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

@@ -92,6 +92,7 @@
<el-table-column prop="weight_lost_down" label="重损上限" />
<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 v-if="false" prop="is_used" label="是否启用" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150px" />

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

@@ -194,9 +194,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否配粉移库" prop="is_need_move">
<el-radio v-model="formData.is_need_move" label="0">否</el-radio>
<el-radio v-model="formData.is_need_move" label="1">是</el-radio>
<el-form-item label="工艺代码">
<el-input v-model="formData.technology_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -219,6 +218,12 @@
<el-radio v-model="formData.is_report" label="1">是</el-radio>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否配粉移库" prop="is_need_move">
<el-radio v-model="formData.is_need_move" label="0">否</el-radio>
<el-radio v-model="formData.is_need_move" label="1">是</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">