|
@@ -218,16 +218,15 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
|
|
|
log.info("9 loopGenerateCode all files -->"+System.currentTimeMillis());
|
|
|
|
|
|
//3-保存压缩文件并上传oss
|
|
|
- //压缩后得名字 正式码_SAP订单号_物料名称_文件内码数量
|
|
|
- String materialName = null;
|
|
|
+ //压缩后得名字 正式码_预订单号(或者SAP订单号_物料id)_文件内码数量
|
|
|
+ String zipName = null;
|
|
|
if(CodePackageOrderTypeEnum.SAP_ORDER.is(qrPackage.getOrderType())){
|
|
|
BaseMaterial baseMaterial = baseMaterialMapper.selectById(qrPackage.getMaterialId());
|
|
|
- materialName = baseMaterial==null?"":baseMaterial.getMaterialName();
|
|
|
+ zipName = "正式码_"+qrPackage.getSapOrderNo()+"_"+baseMaterial.getMaterialCode()+"_"+sum+".zip";
|
|
|
}else{
|
|
|
- QrPackageBookingOrder bookingOrder = qrPackageBookingOrderService.getBookingOrder(qrPackage.getBookingOrder());
|
|
|
- materialName = bookingOrder==null?"":bookingOrder.getMaterialName();
|
|
|
+ zipName = "正式码_"+qrPackage.getBookingOrder()+"_"+sum+".zip";
|
|
|
}
|
|
|
- String zipName = "正式码_"+qrPackage.getSapOrderNo()+"_"+materialName+"_"+sum+".zip";
|
|
|
+
|
|
|
//压缩密码
|
|
|
String pas = RandomCodeUtils.getStr(6);
|
|
|
log.info("生成密码:"+pas);
|