Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物料接口调整修改。

Browse Source
master
Leon 3 years ago
parent bee1bda939
commit 628801c013
5 changed files with 75 additions and 102 deletions
Show Stats Download Patch File Download Diff File

10
common/src/main/java/com/foreverwin/mesnac/common/constant/CustomFieldConstant.java
Unescape Escape View File

@ -52,11 +52,11 @@ public class CustomFieldConstant {
//************************************************************************************** //**************************************************************************************
public static final String ITEM_ACCESSORY_TYPE = "ACCESSORY_TYPE";//辅料类型 public static final String ITEM_ACCESSORY_TYPE = "ACCESSORY_TYPE";//辅料类型
public static final String ITEM_WEIGHT = "MAT_WEIGHT";
public static final String ITEM_MAT_SPEC = "MAT_SPEC";//规格 public static final String ITEM_MAT_SPEC = "MAT_SPEC";//规格
public static final String ITEM_MODEL = "MODEL";//型号 public static final String ITEM_MODEL = "COMPONENT_TYPE";//组件类型
public static final String ITEM_TEXTURE = "TEXTURE";//材质 public static final String ITEM_TEXTTURE = "TEXTTURE";//材质
public static final String ITEM_DRAWING = "DRAWING";//图号 public static final String ITEM_DWG_NO = "DWG_NO";//图号
public static final String ITEM_DRAWING_REVISION = "DRAWING_REVISION";//图号版本 public static final String ITEM_PER_METER = "PER_METER";//每米重
public static final String ITEM_PER_SQUARE_METER = "PER_SQUARE_METER";//每平米重
} }

2
common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
Unescape Escape View File

@ -477,7 +477,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
labelPrintDto.setItemDescription(selectCurrent.getDescription()); labelPrintDto.setItemDescription(selectCurrent.getDescription());
labelPrintDto.setSfc(prodReadyTask.getSfc()); labelPrintDto.setSfc(prodReadyTask.getSfc());
Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, prodReadyTask.getSfc())); Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, prodReadyTask.getSfc()));
String drawingRevision = customFieldsService.getCustomFieldsValue(sfcServiceById.getItemBo(), CustomFieldConstant.ITEM_DRAWING_REVISION); String drawingRevision = customFieldsService.getCustomFieldsValue(sfcServiceById.getItemBo(), CustomFieldConstant.ITEM_DWG_NO);
labelPrintDto.setDrawingVersion(drawingRevision); labelPrintDto.setDrawingVersion(drawingRevision);
labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty())); labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty()));
String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_WORK_ORDER); String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_WORK_ORDER);

5
common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java
Unescape Escape View File

@ -120,8 +120,9 @@ public class StringUtil
static public boolean isBlank(String str) static public boolean isBlank(String str)
{ {
boolean isBlank = false; boolean isBlank = false;
if( str == null ) isBlank = true; if (str == null) isBlank = true;
else if( str.trim().equals( "" ) ) isBlank = true; else if (str.trim().equals("")) isBlank = true;
else if (str.equals("null")) isBlank = true;
return isBlank; return isBlank;
} }

102
integration/src/main/java/com/foreverwin/mesnac/integration/dto/ItemSyncRequest.java
Unescape Escape View File

@ -1,9 +1,5 @@
package com.foreverwin.mesnac.integration.dto; package com.foreverwin.mesnac.integration.dto;
import com.sap.me.common.ItemType;
import com.sap.me.common.MaterialType;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@ -24,13 +20,12 @@ import javax.xml.bind.annotation.XmlType;
"UNIT_OF_MEASURE", "UNIT_OF_MEASURE",
"ASSY_DATA_TYPE", "ASSY_DATA_TYPE",
"INV_ASSY_DATA_TYPE", "INV_ASSY_DATA_TYPE",
"INGRED_TYPE", "ACCESSORY_TYPE",
"WEIGHT",
"MAT_SPEC", "MAT_SPEC",
"MODEL", "TEXTTURE",
"TEXTURE", "DWG_NO",
"DRAWING", "PER_METER",
"DRAWING_REVISION" "PER_SQUARE_METER"
}) })
public class ItemSyncRequest { public class ItemSyncRequest {
@ -72,27 +67,23 @@ public class ItemSyncRequest {
@XmlElement(name = "INV_ASSY_DATA_TYPE") @XmlElement(name = "INV_ASSY_DATA_TYPE")
private String INV_ASSY_DATA_TYPE; private String INV_ASSY_DATA_TYPE;
//辅料类型：0或者空则不是辅料，刀具-1，其他-9
@XmlElement(name = "INGRED_TYPE") //辅料类型：0或者空原材料，刀具1，主关件9，非主观件2
private String INGRED_TYPE; @XmlElement(name = "ACCESSORY_TYPE")
//重量 private String ACCESSORY_TYPE;
@XmlElement(name = "WEIGHT")
private String WEIGHT;
//规格 //规格
@XmlElement(name = "MAT_SPEC") @XmlElement(name = "MAT_SPEC")
private String MAT_SPEC; private String MAT_SPEC;
//型号
@XmlElement(name = "MODEL")
private String MODEL;
//材质 //材质
@XmlElement(name = "TEXTURE") @XmlElement(name = "TEXTTURE")
private String TEXTURE; private String TEXTTURE;
//图号 //图号
@XmlElement(name = "DRAWING") @XmlElement(name = "DWG_NO")
private String DRAWING; private String DWG_NO;
//图号版本 @XmlElement(name = "PER_METER")
@XmlElement(name = "DRAWING_REVISION") private String PER_METER;
private String DRAWING_REVISION; @XmlElement(name = "PER_SQUARE_METER")
private String PER_SQUARE_METER;
public String getTRANID() { public String getTRANID() {
return TRANID; return TRANID;
@ -198,20 +189,12 @@ public class ItemSyncRequest {
this.INV_ASSY_DATA_TYPE = INV_ASSY_DATA_TYPE; this.INV_ASSY_DATA_TYPE = INV_ASSY_DATA_TYPE;
} }
public String getINGRED_TYPE() { public String getACCESSORY_TYPE() {
return INGRED_TYPE; return ACCESSORY_TYPE;
}
public void setINGRED_TYPE(String INGRED_TYPE) {
this.INGRED_TYPE = INGRED_TYPE;
}
public String getWEIGHT() {
return WEIGHT;
} }
public void setWEIGHT(String WEIGHT) { public void setACCESSORY_TYPE(String ACCESSORY_TYPE) {
this.WEIGHT = WEIGHT; this.ACCESSORY_TYPE = ACCESSORY_TYPE;
} }
public String getMAT_SPEC() { public String getMAT_SPEC() {
@ -222,36 +205,36 @@ public class ItemSyncRequest {
this.MAT_SPEC = MAT_SPEC; this.MAT_SPEC = MAT_SPEC;
} }
public String getMODEL() { public String getTEXTTURE() {
return MODEL; return TEXTTURE;
} }
public void setMODEL(String MODEL) { public void setTEXTTURE(String TEXTTURE) {
this.MODEL = MODEL; this.TEXTTURE = TEXTTURE;
} }
public String getTEXTURE() { public String getDWG_NO() {
return TEXTURE; return DWG_NO;
} }
public void setTEXTURE(String TEXTURE) { public void setDWG_NO(String DWG_NO) {
this.TEXTURE = TEXTURE; this.DWG_NO = DWG_NO;
} }
public String getDRAWING() { public String getPER_METER() {
return DRAWING; return PER_METER;
} }
public void setDRAWING(String DRAWING) { public void setPER_METER(String PER_METER) {
this.DRAWING = DRAWING; this.PER_METER = PER_METER;
} }
public String getDRAWING_REVISION() { public String getPER_SQUARE_METER() {
return DRAWING_REVISION; return PER_SQUARE_METER;
} }
public void setDRAWING_REVISION(String DRAWING_REVISION) { public void setPER_SQUARE_METER(String PER_SQUARE_METER) {
this.DRAWING_REVISION = DRAWING_REVISION; this.PER_SQUARE_METER = PER_SQUARE_METER;
} }
@Override @Override
@ -270,13 +253,12 @@ public class ItemSyncRequest {
", UNIT_OF_MEASURE='" + UNIT_OF_MEASURE + '\'' + ", UNIT_OF_MEASURE='" + UNIT_OF_MEASURE + '\'' +
", ASSY_DATA_TYPE='" + ASSY_DATA_TYPE + '\'' + ", ASSY_DATA_TYPE='" + ASSY_DATA_TYPE + '\'' +
", INV_ASSY_DATA_TYPE='" + INV_ASSY_DATA_TYPE + '\'' + ", INV_ASSY_DATA_TYPE='" + INV_ASSY_DATA_TYPE + '\'' +
", INGRED_TYPE='" + INGRED_TYPE + '\'' + ", ACCESSORY_TYPE='" + ACCESSORY_TYPE + '\'' +
", WEIGHT='" + WEIGHT + '\'' +
", MAT_SPEC='" + MAT_SPEC + '\'' + ", MAT_SPEC='" + MAT_SPEC + '\'' +
", MODEL='" + MODEL + '\'' + ", TEXTTURE='" + TEXTTURE + '\'' +
", TEXTURE='" + TEXTURE + '\'' + ", DWG_NO='" + DWG_NO + '\'' +
", DRAWING='" + DRAWING + '\'' + ", PER_METER='" + PER_METER + '\'' +
", DRAWING_REVISION='" + DRAWING_REVISION + '\'' + ", PER_SOUARE_METER='" + PER_SQUARE_METER + '\'' +
'}'; '}';
} }
} }

58
integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java
Unescape Escape View File

@ -174,28 +174,18 @@ public class InterfaceServiceImpl implements InterfaceService {
CustomFields customFields = null; CustomFields customFields = null;
//辅料类型：ACCESSORY_TYPE //辅料类型：ACCESSORY_TYPE
String ingredType = itemSyncRequest.getINGRED_TYPE(); String accessoryType = itemSyncRequest.getACCESSORY_TYPE();
if (StringUtil.notBlank(ingredType)) { if (StringUtil.notBlank(accessoryType)) {
customFields = new CustomFields(); customFields = new CustomFields();
customFields.setHandle(itemBo); customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_ACCESSORY_TYPE); customFields.setAttribute(CustomFieldConstant.ITEM_ACCESSORY_TYPE);
customFields.setValue(ingredType); customFields.setValue(accessoryType);
customFieldsList.add(customFields);
}
//重量
String weight = itemSyncRequest.getWEIGHT();
if (StringUtil.notBlank(ingredType)) {
customFields = new CustomFields();
customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_WEIGHT);
customFields.setValue(weight);
customFieldsList.add(customFields); customFieldsList.add(customFields);
} }
//规格 //规格
String spec = itemSyncRequest.getMAT_SPEC(); String spec = itemSyncRequest.getMAT_SPEC();
if (StringUtil.notBlank(ingredType)) { if (StringUtil.notBlank(spec)) {
customFields = new CustomFields(); customFields = new CustomFields();
customFields.setHandle(itemBo); customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_MAT_SPEC); customFields.setAttribute(CustomFieldConstant.ITEM_MAT_SPEC);
@ -203,43 +193,43 @@ public class InterfaceServiceImpl implements InterfaceService {
customFieldsList.add(customFields); customFieldsList.add(customFields);
} }
//型号 //材质
String model = itemSyncRequest.getMODEL(); String texture = itemSyncRequest.getTEXTTURE();
if (StringUtil.notBlank(ingredType)) { if (StringUtil.notBlank(texture)) {
customFields = new CustomFields(); customFields = new CustomFields();
customFields.setHandle(itemBo); customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_MODEL); customFields.setAttribute(CustomFieldConstant.ITEM_TEXTTURE);
customFields.setValue(model); customFields.setValue(texture);
customFieldsList.add(customFields); customFieldsList.add(customFields);
} }
//材质 //图号
String texture = itemSyncRequest.getTEXTURE(); String drawing = itemSyncRequest.getDWG_NO();
if (StringUtil.notBlank(ingredType)) { if (StringUtil.notBlank(drawing)) {
customFields = new CustomFields(); customFields = new CustomFields();
customFields.setHandle(itemBo); customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_TEXTURE); customFields.setAttribute(CustomFieldConstant.ITEM_DWG_NO);
customFields.setValue(texture); customFields.setValue(drawing);
customFieldsList.add(customFields); customFieldsList.add(customFields);
} }
//图号 //每米重
String drawing = itemSyncRequest.getDRAWING(); String perMeter = itemSyncRequest.getPER_METER();
if (StringUtil.notBlank(ingredType)) { if (StringUtil.notBlank(perMeter)) {
customFields = new CustomFields(); customFields = new CustomFields();
customFields.setHandle(itemBo); customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_DRAWING); customFields.setAttribute(CustomFieldConstant.ITEM_PER_METER);
customFields.setValue(drawing); customFields.setValue(perMeter);
customFieldsList.add(customFields); customFieldsList.add(customFields);
} }
//图号版本 //每平米重
String drawingRevision = itemSyncRequest.getDRAWING_REVISION(); String perSquareMeter = itemSyncRequest.getPER_SQUARE_METER();
if (StringUtil.notBlank(ingredType)) { if (StringUtil.notBlank(perSquareMeter)) {
customFields = new CustomFields(); customFields = new CustomFields();
customFields.setHandle(itemBo); customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_DRAWING_REVISION); customFields.setAttribute(CustomFieldConstant.ITEM_PER_SQUARE_METER);
customFields.setValue(drawingRevision); customFields.setValue(perSquareMeter);
customFieldsList.add(customFields); customFieldsList.add(customFields);
} }

Write Preview
Loading…
Cancel
Save