diff --git a/src/main/java/com/spring/modules/proofing/controller/ProofingInformationController.java b/src/main/java/com/spring/modules/proofing/controller/ProofingInformationController.java index dce8d639..6d34ca03 100644 --- a/src/main/java/com/spring/modules/proofing/controller/ProofingInformationController.java +++ b/src/main/java/com/spring/modules/proofing/controller/ProofingInformationController.java @@ -64,7 +64,7 @@ public class ProofingInformationController { @ResponseBody public R proofingInformationService(@RequestBody ProofingInformationEntity data) { String proofingNo = proofingInformationService.proofingInformationSave(data); - return R.ok().put("proofingNo",proofingNo); + return R.ok().put("proofingNo", proofingNo).put("proofingBatchNo", data.getProofingBatchNo()); } /** diff --git a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java index c59c69d5..f3918871 100644 --- a/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java +++ b/src/main/java/com/spring/modules/proofing/entity/ProofingInformationEntity.java @@ -28,6 +28,10 @@ public class ProofingInformationEntity extends QueryPage implements Serializable * 打样编码 **/ private String proofingNo; + /** + * 打样批次号 + **/ + private String proofingBatchNo; /** * 项目编码 **/ diff --git a/src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java b/src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java index 8da9536e..27598c07 100644 --- a/src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java +++ b/src/main/java/com/spring/modules/proofing/mapper/ProofingInformationMapper.java @@ -20,6 +20,8 @@ public interface ProofingInformationMapper extends BaseMapper searchDelegateAccess(ProofingDelegateAccess delegateAccess); List searchDelegateAccessByUser(@Param("params") ProofingDelegateAccessVo delegateAccess,@Param("roleId")String roleId); diff --git a/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java b/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java index 849117fa..f71d860a 100644 --- a/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/proofing/service/impl/ProofingInformationServiceImpl.java @@ -59,6 +59,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -136,11 +138,18 @@ public class ProofingInformationServiceImpl extends ServiceImpl AND a.proofing_no like #{query.proofingNo} + + AND a.proofing_batch_no like #{query.proofingBatchNo} + AND dbo.plm_get_customer_desc(a.site, a.customer_no) like #{query.customerDesc} @@ -145,6 +149,22 @@ WHERE site = #{site} + + +