2

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("地址")

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<PurchaseRequisitio
     List<ProductNum> 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<Map<String, String>> suplierZtyz( @Param("codeUnified") String supplierCode);
 }

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<PurchaseRequi
                 String[] split = value.split("\\[");
                 String v = split[0];//类别value
                 String key=split[1].replace("]","");//key
-                pr.setSupplierCode(key);
+                SupplierInfoVo supplierInfoVo = supplierInfoService.selectByCodeForIndex(key);
+                pr.setSupplierCode(supplierInfoVo.getCodeUnified());
                 pr.setSupplierName(v);
 
             }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java

@@ -313,7 +313,9 @@ public class PurchaseRequisitionTobaccoService extends MybatisBaseService<Purcha
 				List<PurchaseRequisitionTobacco> 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<PurchaseRequisitionStore> l:listArray){
 					log.info("batchInsert-start:{}",l.size());

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<SupplierBankInfo
 		SupplierBankInfo entity = new SupplierBankInfo();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.insert(entity);
-		baseMapper.insertSUpplierIndex(entity.getSid(),entity.getCodeUnified(),entity.getName());
+		baseMapper.insertSUpplierIndex(entity.getName(),entity.getCodeUnified(),entity.getSid());
 		baseMapper.deleteSupplierFiles(entity.getSid(),"1");
 		String[] businessLicenseFiles = dto.getBusinessLicenseFiles();
 		if(businessLicenseFiles!=null){