Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 2a8ea27b 由 LN
选项

ReturnMaterial点击数量显示对应状态的物料信息

1 个父辈 daf593ed
内嵌 并排
正在显示 2 个修改的文件 包含 22 行增加 和 19 行删除
src/main/java/com/neotel/smfcore/core/inList/service/po/InListItem.java
...@@ -104,15 +104,19 @@ public class InListItem extends BasePo implements Serializable { ...@@ -104,15 +104,19 @@ public class InListItem extends BasePo implements Serializable {
} }
public boolean isSuccess(){ public boolean isSuccess(){
return state==INITEM_STATUS.Success||state==INITEM_STATUS.PutIn||state==INITEM_STATUS.PutEnd; return state==INITEM_STATUS.Success||state==INITEM_STATUS.PutIn||state==INITEM_STATUS.PutEnd||state==INITEM_STATUS.Wait||state==INITEM_STATUS.Cancel;
} }
public boolean isXray() { public boolean isXray() {
return state == INITEM_STATUS.XRay || state == INITEM_STATUS.XRayFail||state==INITEM_STATUS.XRayEnd; return state == INITEM_STATUS.XRay || state==INITEM_STATUS.XRayEnd;
} }
public boolean isNg() {
return state == INITEM_STATUS.API001NG;
}
public boolean isFailure() { public boolean isFailure() {
return state == INITEM_STATUS.Fail; return state == INITEM_STATUS.Fail|| state==INITEM_STATUS.XRayFail;
} }
/** /**
* 入库详情 * 入库详情
......
src/main/java/com/neotel/smfcore/custom/micron1053/loading/LoadingController.java
...@@ -81,15 +81,17 @@ public class LoadingController { ...@@ -81,15 +81,17 @@ public class LoadingController {
for (InListItem item : for (InListItem item :
inList.getInListItems()) { inList.getInListItems()) {
String mtype = item.getMType(); String mtype = item.getMType();
MaterialLoadingDto dto = dtoMap.getOrDefault(mtype, new MaterialLoadingDto(mtype, 0,0, 0, 0)); MaterialLoadingDto dto = dtoMap.getOrDefault(mtype, new MaterialLoadingDto(mtype, 0, 0, 0, 0));
if (item.isSuccess()) { // if (item.isSuccess()) {
dto.setSuccessQty(dto.getSuccessQty() + 1); // } else
} else if(item.getState()==INITEM_STATUS.API001NG) { if (item.isNg()) {
dto.setNg(dto.getNg() + 1); dto.setNg(dto.getNg() + 1);
}else if (item.isFailure()) { } else if (item.isFailure()) {
dto.setFailure(dto.getFailure() + 1); dto.setFailure(dto.getFailure() + 1);
} else if (item.getToXray() != null && !item.getToXray()) { } else if (item.isXray()) {
dto.setXRay(dto.getXRay() + 1); dto.setXRay(dto.getXRay() + 1);
} else {
dto.setSuccessQty(dto.getSuccessQty() + 1);
} }
dtoMap.put(dto.getMaterialType(), dto); dtoMap.put(dto.getMaterialType(), dto);
} }
...@@ -114,7 +116,7 @@ public class LoadingController { ...@@ -114,7 +116,7 @@ public class LoadingController {
public ResultBean detial(@RequestParam Map<String,Object> params ) { public ResultBean detial(@RequestParam Map<String,Object> params ) {
//参数：mType 物料类型：pcb/shoebox/pizzaBox/reel/tray //参数：mType 物料类型：pcb/shoebox/pizzaBox/reel/tray
//参数：state 状态： success/xray/failure //参数：state 状态： success/xray/failure/ng
String mType = params.get("mType").toString(); String mType = params.get("mType").toString();
String state = params.get("state").toString(); String state = params.get("state").toString();
...@@ -123,7 +125,7 @@ public class LoadingController { ...@@ -123,7 +125,7 @@ public class LoadingController {
for (int i = 1; i <= 5; i++ for (int i = 1; i <= 5; i++
) { ) {
MaterialDtialDto dto = new MaterialDtialDto("barcode" + i, "pn" + i, new Date(), "proN" + i, MaterialDtialDto dto = new MaterialDtialDto("barcode" + i, "pn" + i, new Date(), "proN" + i,
233, 7, 8, "provider" + i, "batch" + i, "msl" + i, "posName" + i, ""); 233, 7, 8, "provider" + i, "batch" + i, "msl" + i, "posName" + i, "",state);
dtos.add(dto); dtos.add(dto);
} }
...@@ -139,24 +141,21 @@ public class LoadingController { ...@@ -139,24 +141,21 @@ public class LoadingController {
boolean is = false; boolean is = false;
if (item.isSuccess() && state.equalsIgnoreCase("success")) { if (item.isSuccess() && state.equalsIgnoreCase("success")) {
is = true; is = true;
} else if (item.getState() == INITEM_STATUS.API001NG && state.equalsIgnoreCase("ng")) { } else if (item.isNg() && state.equalsIgnoreCase("ng")) {
is = true; is = true;
} else if (item.isFailure() && state.equalsIgnoreCase("failure")) { } else if (item.isFailure() && state.equalsIgnoreCase("failure")) {
is = true; is = true;
} else if (item.getToXray() != null && !item.getToXray()) { } else if (item.isXray() && state.equalsIgnoreCase("xray")) {
is = true; is = true;
} }
/*else if (item.isXray() && state.equalsIgnoreCase("xray")) {
is = true;
}*/
try{ try{
if (is) { if (is) {
MaterialDtialDto dto= new MaterialDtialDto(item.getRi(), item.getPN(), new Date(), "", MaterialDtialDto dto= new MaterialDtialDto(item.getRi(), item.getPN(), new Date(), "",
0, 0, 0, "", "", "", item.getPosName(), item.getNgMsg()); 0, 0, 0, "", "", "", item.getPosName(), item.getNgMsg(),item.getState());
Barcode code = barcodeManager.findByBarcode(item.getRi()); Barcode code = barcodeManager.findByBarcode(item.getRi());
if (code != null) { if (code != null) {
dto = new MaterialDtialDto(code.getBarcode(), code.getPartNumber(), code.getExpireDate(), code.getProviderNumber(), dto = new MaterialDtialDto(code.getBarcode(), code.getPartNumber(), code.getExpireDate(), code.getProviderNumber(),
code.getAmount(), code.getPlateSize(), code.getHeight(), code.getProvider(), code.getBatch(), code.getMsl(), code.getPosName(), item.getNgMsg()); code.getAmount(), code.getPlateSize(), code.getHeight(), code.getProvider(), code.getBatch(), code.getMsl(), code.getPosName(), item.getNgMsg(),item.getState());
} else { } else {
try{ try{
...@@ -164,7 +163,7 @@ public class LoadingController { ...@@ -164,7 +163,7 @@ public class LoadingController {
code = codeResolve.resolveOneValideBarcode(item.getRi()); code = codeResolve.resolveOneValideBarcode(item.getRi());
if(code!=null){ if(code!=null){
dto = new MaterialDtialDto(code.getBarcode(), code.getPartNumber(), code.getExpireDate(), code.getProviderNumber(), dto = new MaterialDtialDto(code.getBarcode(), code.getPartNumber(), code.getExpireDate(), code.getProviderNumber(),
code.getAmount(), code.getPlateSize(), code.getHeight(), code.getProvider(), code.getBatch(), code.getMsl(), code.getPosName(), item.getNgMsg()); code.getAmount(), code.getPlateSize(), code.getHeight(), code.getProvider(), code.getBatch(), code.getMsl(), code.getPosName(), item.getNgMsg(),item.getState());
} }
}catch (Exception ex){ }catch (Exception ex){
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!