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-03 11:38:57 +08:00
parent ef3704cf38
commit 6cdbdfdf6b
9 changed files with 407 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,8 @@
unit_name,
producmaterialext.standard_weight,
unit_name as base_unit_id_name,
producmaterialext.product_series
producmaterialext.product_series,
producmaterialext.standard_weight_pft
FROM
md_me_materialbase mb
LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id

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

@@ -329,6 +329,38 @@ public class AutoformulaServiceImpl implements AutoformulaService {
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料
//如果该物料是钴粉
jo.put("is_09030102","100");
@@ -393,6 +425,38 @@ public class AutoformulaServiceImpl implements AutoformulaService {
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料
//如果该物料是钴粉
jo.put("is_09030102","100");
@@ -2667,6 +2731,38 @@ public class AutoformulaServiceImpl implements AutoformulaService {
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料
//如果该物料是钴粉
jo.put("is_09030102","100");

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

@@ -296,8 +296,104 @@ public class FormulaServiceImpl implements FormulaService {
.addParam("bucket_type",Formula.getString("bucket_type"))
.addParam("flag","4")
.process().getResultJSONArray(0);
JSONArray dtl_new = new JSONArray();
for(int i=0;i<dtl.size();i++){
JSONObject jo = dtl.getJSONObject(i);
String material_type_id = jo.getString("material_type_id");
//成型剂
if (StrUtil.isNotEmpty(jo.getString("formingtype_code"))) {
jo.put("is_"+jo.getString("formingtype_code"),"100");
}else if(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(material_type_id)){//软废
String jo_material_id = jo.getString("material_id");
JSONArray bomdlts = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo_material_id)
.addParam("flag","1")
.process().getResultJSONArray(0);
//各成型剂需配总量
HashMap<String,Double> bomdlts_map = new HashMap<String,Double>();
bomdlts_map.put("09030102",0.0);
bomdlts_map.put("CXJ001",0.0);
bomdlts_map.put("CXJ003",0.0);
bomdlts_map.put("CXJ004",0.0);
bomdlts_map.put("CXJ005",0.0);
bomdlts_map.put("CXJ006",0.0);
bomdlts_map.put("CXJ007",0.0);
bomdlts_map.put("CXJ008",0.0);
bomdlts_map.put("CXJ002",0.0);
for(int j=0;j<bomdlts.size();j++){
JSONObject bomdtl = bomdlts.getJSONObject(j);
String formingtype_code = bomdtl.getString("formingtype_code");
if( bomdtl.getString("class_code").equals("09030102")){
bomdlts_map.put("09030102",bomdlts_map.get("09030102")+bomdtl.getDouble("standard_rate"));
}else if(bomdlts_map.containsKey(formingtype_code)){
bomdlts_map.put(formingtype_code,bomdlts_map.get(formingtype_code)+bomdtl.getDouble("standard_rate"));
}
}
bomdlts_map.forEach((key,bomdlts2_now)->{
if(bomdlts2_now>0){
jo.put("is_"+key,bomdlts2_now+"");
}
});
}else if(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.THW.getClass_idStr().contains(material_type_id)){//碳化钨新料
//获取碳含量
JSONObject FactoryWarranty = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","3")
.process()
.uniqueResult(0);
if(FactoryWarranty==null){
jo.put("is_tan","0");
}else{
//含碳比
double value = FactoryWarranty.getDouble("value");
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料
//如果该物料是钴粉
jo.put("is_09030102","100");
}else if(MaterOptTypeEnum.TF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.TF.getClass_idStr().contains(material_type_id))){//C粉新料
//如果该物料是c粉
jo.put("is_tan","100");
}
dtl_new.add(jo);
}
JSONObject result = new JSONObject();
result.put("tableDtl",dtl);
result.put("tableDtl",dtl_new);
result.put("material",Formula);
return result;
}
@@ -376,6 +472,38 @@ public class FormulaServiceImpl implements FormulaService {
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料
//如果该物料是钴粉
jo.put("is_09030102","100");
@@ -449,6 +577,38 @@ public class FormulaServiceImpl implements FormulaService {
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料
//如果该物料是钴粉
jo.put("is_09030102","100");

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

@@ -69,6 +69,38 @@ public class InitformulaServiceImpl implements InitformulaService {
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id)){
//如果该物料是钴粉
jo.put("is_09030102","100");
@@ -922,6 +954,38 @@ public class InitformulaServiceImpl implements InitformulaService {
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料
//如果该物料是钴粉
jo.put("is_09030102","100");
@@ -995,6 +1059,38 @@ public class InitformulaServiceImpl implements InitformulaService {
//更新含碳比
jo.put("is_tan",value);
}
//获取碳化铬
JSONObject FactoryWarranty2 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00021")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty2==null){
jo.put("is_CJZB00021","0");
}else{
//含碳比
double value = FactoryWarranty2.getDouble("value");
//更新含碳比
jo.put("is_CJZB00021",value);
}
//获取碳化钒
JSONObject FactoryWarranty3 = WQL.getWO("QPF_AUTOFORMULA01")
.addParam("material_id",jo.getString("material_id"))
.addParam("dtlmaterial_id","CJZB00020")
.addParam("pcsn",jo.getString("pcsn"))
.addParam("flag","33")
.process()
.uniqueResult(0);
if(FactoryWarranty3==null){
jo.put("is_CJZB00020","0");
}else{
//含碳比
double value = FactoryWarranty3.getDouble("value");
//更新含碳比
jo.put("is_CJZB00020",value);
}
}else if(MaterOptTypeEnum.GF.getClass_idStr().contains(jo.getString("material_id")) ||(StrUtil.isNotEmpty(material_type_id) && MaterOptTypeEnum.GF.getClass_idStr().contains(material_type_id))){//钴粉新料
//如果该物料是钴粉
jo.put("is_09030102","100");

26
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
View File

@@ -17,6 +17,7 @@
输入.quality_scode TYPEAS s_string
输入.prior_level TYPEAS s_string
输入.material_id TYPEAS s_string
输入.dtlmaterial_id TYPEAS s_string
输入.material_code TYPEAS s_string
输入.is_need_manage TYPEAS s_string
输入.formingtype_id TYPEAS s_string
@@ -223,6 +224,31 @@
ENDQUERY
ENDIF
IF 输入.flag = "33"
QUERY
SELECT
FactoryWarrantyDtl.*
FROM
QL_TEST_FactoryWarrantyMst FactoryWarrantyMst
LEFT JOIN QL_TEST_FactoryWarrantyDtl FactoryWarrantyDtl ON FactoryWarrantyDtl.inspection_id = FactoryWarrantyMst.inspection_id
LEFT JOIN ql_test_inspectionitempoint inspectionitempoint ON inspectionitempoint.inspection_item_id = FactoryWarrantyDtl.inspection_item_id
WHERE
1 = 1
AND FactoryWarrantyMst.is_delete = '0'
AND FactoryWarrantyMst.bill_status = '99'
OPTION 输入.dtlmaterial_id <> ""
inspectionitempoint.inspection_item_code = 输入.dtlmaterial_id
ENDOPTION
OPTION 输入.material_id <> ""
FactoryWarrantyMst.material_id = 输入.material_id
ENDOPTION
OPTION 输入.pcsn <> ""
FactoryWarrantyMst.pcsn = 输入.pcsn
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "4"
QUERY
SELECT