Explorar el Código

1.海运出口增加货描检索
2.发票抬头下拉选增加模糊搜索
3.进场记录-客户还箱逻辑修改

纪新园 hace 2 días
padre
commit
06eab17491

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/CorpsInvoiceHeaderController.java

@@ -75,7 +75,7 @@ public class CorpsInvoiceHeaderController extends BladeController {
 		lambdaQueryWrapper.eq(CorpsInvoiceHeader::getTenantId, AuthUtil.getTenantId())
 			.eq(CorpsInvoiceHeader::getIsDeleted, 0)
 			.eq(CorpsInvoiceHeader::getPid, corpsInvoiceHeader.getPid())
-			.eq(ObjectUtils.isNotNull(corpsInvoiceHeader.getInvoiceHeader()), CorpsInvoiceHeader::getInvoiceHeader, corpsInvoiceHeader.getInvoiceHeader());
+			.like(ObjectUtils.isNotNull(corpsInvoiceHeader.getInvoiceHeader()), CorpsInvoiceHeader::getInvoiceHeader, corpsInvoiceHeader.getInvoiceHeader());
 		IPage<CorpsInvoiceHeader> pages = corpsInvoiceHeaderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 2257
blade-service/blade-los/src/main/java/org/springblade/los/box/dynamics/service/impl/BoxDynamicsRecordServiceImpl.java


+ 2 - 0
blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -117,6 +117,7 @@ public class BillsController extends BladeController {
 				.like(Bills::getVesselEnName, bills.getVesselCnName()))
 			.like(ObjectUtils.isNotNull(bills.getVoyageNo()), Bills::getVoyageNo, bills.getVoyageNo())
 			.like(ObjectUtils.isNotNull(bills.getReceivingAndShipping()), Bills::getReceivingAndShipping, bills.getReceivingAndShipping())
+			.like(ObjectUtils.isNotNull(bills.getCommodityDescr()), Bills::getCommodityDescr, bills.getCommodityDescr())
 			.and(ObjectUtils.isNotNull(bills.getCorpCnName()), i -> i.like(Bills::getCorpCnName, bills.getCorpCnName()).or()
 				.like(Bills::getCorpEnName, bills.getCorpCnName()))
 			.and(ObjectUtils.isNotNull(bills.getCorpAttnName()), i -> i.like(Bills::getCorpAttnName, bills.getCorpAttnName()).or()
@@ -682,6 +683,7 @@ public class BillsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bills.getBookingNo()), Bills::getBookingNo, bills.getBookingNo())
 			.like(ObjectUtils.isNotNull(bills.getCreateUserName()), Bills::getCreateUserName, bills.getCreateUserName())
 			.like(ObjectUtils.isNotNull(bills.getExtendedData()), Bills::getExtendedData, bills.getExtendedData())
+			.like(ObjectUtils.isNotNull(bills.getCommodityDescr()), Bills::getCommodityDescr, bills.getCommodityDescr())
 			.and(ObjectUtils.isNotNull(bills.getVesselCnName()), i -> i.like(Bills::getVesselCnName, bills.getVesselCnName()).or()
 				.like(Bills::getVesselEnName, bills.getVesselCnName()))
 			.like(ObjectUtils.isNotNull(bills.getVoyageNo()), Bills::getVoyageNo, bills.getVoyageNo())

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio