UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内部码打印问题，启用使用单元数量问题

Browse Source
pro
anthonywj 2 years ago
parent 7f4f58c92e
commit 69ea52be42
4 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
Unescape Escape View File

@ -273,7 +273,7 @@ public class BasicOrderPrintController {
bizData.put("index", i);
bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode());
String udiCode = "#" + obj.getNameCode() + "#" + obj.getProduceDate() + "#" + obj.getExpireDate() +
"#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + obj.getWarehouseCode() + "#" + obj.getDeptCode();
"#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + "#";
udiCode = udiCode.replaceAll("#null", "#");
bizData.put("udiCode", udiCode);
bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc());

2
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -336,7 +336,7 @@ public class IoOrderReviewController extends BaseController {
checkCode = checkCode.replace("\u001D", "");
}
if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) {
if (checkOrderCodesBean.getStatus() == Constant.DB_CHECK_ED
if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED
&& IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) {
return Constant.CHECK_REPEAT;
}

6
src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
String udiCode = "#" + udiProductEntity.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
"#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
"#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + "#" ;
udiCode = udiCode.replaceAll("#null", "#");
innerOrderPrintEntity.setUdiCode(udiCode);
invInnerOrderPrintDao.insert(innerOrderPrintEntity);
@ -165,12 +165,10 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
if (innerOrderQRCodeTextPDFTemplateRequest.getOrderId() != null) {
filterStockprintRequest.setSOrderId(innerOrderQRCodeTextPDFTemplateRequest.getOrderId());
deleteStPrintTempRequest.setStockOrderFk(innerOrderQRCodeTextPDFTemplateRequest.getOrderId() + "");
} else {
deleteStPrintTempRequest.setPrintCodeIdFk(innerOrderQRCodeTextPDFTemplateRequest.getQueryId());
filterStockprintRequest.setId(innerOrderQRCodeTextPDFTemplateRequest.getQueryId());
}
innerOrderPdfTempService.delete(deleteStPrintTempRequest);
List<InnerOrderPrintResponse> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterStockprintRequest);
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
@ -285,7 +283,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
String udiCode = "#" + obj.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
"#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
"#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + "#" ;
udiCode = udiCode.replaceAll("#null", "#");
innerOrderPrintEntity.setUdiCode(udiCode);
invInnerOrderPrintDao.insert(innerOrderPrintEntity);

33
src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java
Unescape Escape View File

@ -20,24 +20,37 @@ public class UdiCalCountUtil {
// }
public int getActCount(UdiRelevanceResponse udiRelevanceResponse) {
int actCount;
if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) {
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
} else {
//启用使用单元
if (udiRelevanceResponse.getUseDy()) {
if (udiRelevanceResponse.getDiType() == 1) {
if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) {
udiRelevanceResponse.setZxxsbzbhsydysl(1);
}
return udiRelevanceResponse.getZxxsbzbhsydysl();
} else if (udiRelevanceResponse.getDiType() == 4) {
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
udiRelevanceResponse.setBhzxxsbzsl(1);
}
if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) {
udiRelevanceResponse.setZxxsbzbhsydysl(1);
}
actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
return udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
} else {
return udiRelevanceResponse.getBhzxxsbzsl();
}
} else {//不启用使用单元
if (udiRelevanceResponse.getDiType() == 1) {
return 1;
} else if (udiRelevanceResponse.getDiType() == 4) {
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
udiRelevanceResponse.setBhzxxsbzsl(1);
}
return udiRelevanceResponse.getBhzxxsbzsl();
} else {
return udiRelevanceResponse.getBhzxxsbzsl();
}
} else {
actCount = udiRelevanceResponse.getBhzxxsbzsl();
}
return actCount;
}
public int getActCount(IoCodeTempEntity codeTempEntity) {

Write Preview
Loading…
Cancel
Save