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

修改首营和供应商采购bug

Browse Source
zhairh
zhengmingliang 3 years ago
parent 14561bdbba
commit 8ddaccbff1
6 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java
Unescape Escape View File

@ -89,9 +89,7 @@ public class SupCertSetController {
filterCertSetsRequest.setType(supCertSetEntity.getType());
filterCertSetsRequest.setName(supCertSetEntity.getName());
List<SupCertSetEntity> supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest);
if(supCertEntityList.size()>0){
return ResultVOUtils.error(999,"该证书名称已存在！");
}
boolean b = supCertSetService.updateCertSet(supCertSetEntity);
return ResultVOUtils.success("修改成功");

13
api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java
Unescape Escape View File

@ -107,12 +107,23 @@ public class SupCompanyController {
public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) {
if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE) {
//判断是不是存在草稿
List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
for(SupCertEntity obj:supCertEntityList){
if(obj.getAuditStatus()==0){
return ResultVOUtils.error(999,"证书中存在草稿不允许提交！");
}
}
//提交审核
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
filterCertSetsRequest.setNeed(1);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
//验证
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {

10
api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java
Unescape Escape View File

@ -118,7 +118,9 @@ public class SupProductController {
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1 || StrUtil.isNotEmpty(supCertSetEntity.getCplx()) && supCertSetEntity.getCplx().equals("全部")
|| StrUtil.isNotEmpty(supCertSetEntity.getHchzsb()) && supCertSetEntity.getHchzsb().equals("全部")
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
&& StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
@ -222,12 +224,14 @@ public class SupProductController {
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if ((supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1 || StrUtil.isNotEmpty(supCertSetEntity.getCplx()) && supCertSetEntity.getCplx().equals("全部")
|| StrUtil.isNotEmpty(supCertSetEntity.getHchzsb()) && supCertSetEntity.getHchzsb().equals("全部")
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
&& StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
|| (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb()))
|| supCertSetEntity.getFlbm()!=null && (supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
|| StrUtil.isNotEmpty(supCertSetEntity.getFlbm()) &&(supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {

1
api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
Unescape Escape View File

@ -32,6 +32,7 @@
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
AND basic_products.diType=1
</if>
<if test="productId != null">
AND productId = #{productId}

1
api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml
Unescape Escape View File

@ -32,6 +32,7 @@
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
AND basic_products.diType=1
</if>
<if test="productId != null">
AND productId = #{productId}

3
api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
Unescape Escape View File

@ -19,7 +19,7 @@
<if test="type != '' and type!=null">
and `type` = #{type}
</if>
<if test="auditStatus != null and auditStatus !=23 and auditStatus !=24">
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=24">
and auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
@ -29,6 +29,7 @@
and (auditStatus = 2 or auditStatus=3 or auditStatus=5 or auditStatus=6)
</if>
</where>
ORDER BY id DESC
</select>

Write Preview
Loading…
Cancel
Save