Browse Source

2024年10月22日17:42:16

纪新园 1 year ago
parent
commit
137602d497

+ 5 - 1
blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -421,7 +421,11 @@ public class PriceBankController extends BladeController {
 
 				}
 				BeanUtil.copyProperties(item, priceBankExcel);
-				priceBankExcel.setPriceBankId(item.getId() + "");
+				priceBankExcel.setPriceBankId(item.getItemId() + "");
+				if (goodsDesc != null && goodsDesc.getData() != null) {
+					priceBankExcel.setCode(goodsDesc.getData().getCode());
+					priceBankExcel.setEname(goodsDesc.getData().getEname());
+				}
 				list.add(priceBankExcel);
 			}
 		}

+ 10 - 0
blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/excel/PriceBankExcel.java

@@ -39,6 +39,16 @@ public class PriceBankExcel  implements Serializable {
 	@ExcelProperty(value = "商品名称")
 	private String cname;
 	/**
+	 * 商品名称
+	 */
+	@ExcelProperty(value = "商品英文名称")
+	private String ename;
+	/**
+	 * 商品名称
+	 */
+	@ExcelProperty(value = "商品编码")
+	private String code;
+	/**
 	 * 计价单位
 	 */
 	@ExcelProperty(value = "计价单位")

+ 3 - 0
blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceBankServiceImpl.java

@@ -154,6 +154,9 @@ public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank
 						baseMapper.updatePrice(Long.parseLong(item.getPriceBankId()));//更新历史价格
 					}
 				}
+				priceBank.setCname(item.getCname());//商品名
+				priceBank.setCode(item.getCode());//商品编码
+				priceBank.setEname(item.getEname());//商品编码
 				priceBank.setId(Long.parseLong(item.getPriceBankId()));
 				priceBank.setUpdateTime(new Date());
 				priceBank.setUpdateUser(SecureUtil.getUserId());