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-08-22 14:50:51 +08:00
parent 6b054b04c2
commit 811d192b84
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,6 +198,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
jsonProduc.put("technology_code", map.get("technology_code"));
jsonProduc.put("ball_rate", map.get("ball_rate"));
jsonProduc.put("liquid_rate", map.get("liquid_rate"));
json.put("standard_mark", map.get("standard_mark"));
producTab.insert(jsonProduc);
} else {
json.put("standard_weight", map.get("standard_weight"));
@@ -221,6 +222,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
json.put("technology_code", map.get("technology_code"));
json.put("ball_rate", map.get("ball_rate"));
json.put("liquid_rate", map.get("liquid_rate"));
json.put("standard_mark", map.get("standard_mark"));
producTab.update(json);
}
JSONObject jsonMater = materTab.query("material_id = '" + material_id + "' and is_delete = '0'").uniqueResult(0);

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

@@ -1,10 +1,10 @@
[交易说明]
交易名： 产品参数分页查询
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
@@ -22,26 +22,26 @@
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
PAGEQUERY
SELECT
@@ -58,6 +58,7 @@
s.is_pure,
s.is_need_move AS stock_is_need_move,
p.old_mark,
p.standard_mark,
p.product_mode,
p.is_auto_open,
p.waste_limit_down,

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

Binary file not shown.

18
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
View File

@@ -688,9 +688,9 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (ObjectUtil.isEmpty(mater)) {
throw new BadRequestException("成品物料扩展信息查询失败！");
}
String old_mark = mater.getString("old_mark");
if(StrUtil.isEmpty(old_mark)){
throw new BadRequestException("成品物料扩展信息表牌号不能为空！");
String standard_mark = mater.getString("standard_mark");
if(StrUtil.isEmpty(standard_mark)){
throw new BadRequestException("成品物料扩展信息表标准牌号不能为空！");
}
WQLObject pdm_bi_productdeptpcsn = WQLObject.getWQLObject("pdm_bi_productdeptpcsn");
JSONObject org = pdm_bi_productdeptpcsn.query("org_id='"+org_id+"'").uniqueResult(0);
@@ -712,7 +712,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
WQLObject PDM_BI_BrandMaxPCSN = WQLObject.getWQLObject("PDM_BI_BrandMaxPCSN");
DateTime now = DateTime.now();
String year = now.year()+"";
JSONObject jo_pcsn = PDM_BI_BrandMaxPCSN.query("brand_code='"+old_mark+"' and year='"+year+"' and org_id='"+org_id+"'").uniqueResult(0);
JSONObject jo_pcsn = PDM_BI_BrandMaxPCSN.query("brand_code='"+standard_mark+"' and year='"+year+"' and org_id='"+org_id+"'").uniqueResult(0);
JSONObject ret = new JSONObject();
if(jo_pcsn==null){
String value = "";
@@ -775,18 +775,18 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (ObjectUtil.isEmpty(mater)) {
throw new BadRequestException("成品物料扩展信息查询失败！");
}
String old_mark = mater.getString("old_mark");
if(StrUtil.isEmpty(old_mark)){
throw new BadRequestException("成品物料扩展信息表牌号不能为空！");
String standard_mark = mater.getString("standard_mark");
if(StrUtil.isEmpty(standard_mark)){
throw new BadRequestException("成品物料扩展信息表标准牌号不能为空！");
}
WQLObject PDM_BI_BrandMaxPCSN = WQLObject.getWQLObject("PDM_BI_BrandMaxPCSN");
DateTime now = DateTime.now();
String year = now.year()+"";
JSONObject jo_pcsn = PDM_BI_BrandMaxPCSN.query("brand_code='"+old_mark+"' and year='"+year+"' and org_id='"+org_id+"'").uniqueResult(0);
JSONObject jo_pcsn = PDM_BI_BrandMaxPCSN.query("brand_code='"+standard_mark+"' and year='"+year+"' and org_id='"+org_id+"'").uniqueResult(0);
if(jo_pcsn == null){
JSONObject ret = new JSONObject();
ret.put("brandmax_id", IdUtil.getSnowflake(1, 1).nextId());
ret.put("brand_code",old_mark);
ret.put("brand_code",standard_mark);
ret.put("year",year);
ret.put("org_id",org_id);
int length = param.getInteger("value");

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

@@ -74,6 +74,7 @@
<el-table-column prop="stock_is_report" label="原料是否生成理化报告" width="150px" :formatter="stockIsReport"/>
<el-table-column prop="wc_seqno" label="原料碳化钨顺序号" width="120px"/>
<el-table-column prop="old_mark" label="原牌号"/>
<el-table-column prop="standard_mark" label="标准牌号"/>
<el-table-column prop="product_mode" label="生产方式" :formatter="formatProductMode"/>
<el-table-column prop="is_auto_open" label="是否允许自动开单" width="120px" :formatter="isAutoOpen"/>
<el-table-column prop="waste_limit_down" label="软废添加比列下限" width="120px"/>

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

@@ -211,20 +211,25 @@
<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="标准牌号">
<el-input v-model="formData.standard_mark" 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>