diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierinfo/SupplierInfoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierinfo/SupplierInfoVo.java index fba3cf75..3ef50544 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierinfo/SupplierInfoVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierinfo/SupplierInfoVo.java @@ -73,6 +73,8 @@ public class SupplierInfoVo implements Vo { private String is_delete; // 记录是否被删除,0:未删除,1:已经删除 @ApiModelProperty("代码") private String code; // 代码 + @ApiModelProperty("唯一代码") + private String codeUnified; // 唯一代码 @ApiModelProperty("名称") private String name; // 名称 @ApiModelProperty("地址") diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java index ee33b31c..c72a7e9c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java @@ -62,6 +62,6 @@ public interface PurchaseRequisitionMapper extends BaseMapper selectByPc(@Param("pc")String pc); @Delete(" DELETE FROM hz_ztspglhzb") void deleteAll(); - @Select("select * from hz_ztspglhzb where codeUnified =#{codeUnified} AND wdhjz=0 ") + @Select("select * from hz_ztspglhzb where codeUnified =#{codeUnified} AND wdhjz!=0 ") List> suplierZtyz( @Param("codeUnified") String supplierCode); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java index b27eebca..e748c505 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java @@ -514,7 +514,8 @@ public class PurchaseRequisitionService extends MybatisBaseService list= baseMapper.selectByDateForCode(format); int size = list.size(); int r=size+1; - sd.setCode(format+r); + String purchaseDate=sd.getPurchaseDate(); + purchaseDate=purchaseDate.replace(".",""); + sd.setCode(purchaseDate); baseMapper.insert(sd); for(List l:listArray){ log.info("batchInsert-start:{}",l.size()); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoService.java index 498d2b50..5f0a6b1f 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoService.java @@ -113,7 +113,7 @@ public class SupplierBankInfoService extends MybatisBaseService